Commit 038f384a authored by Thomas Markiewicz's avatar Thomas Markiewicz
Browse files

Updated links to apps in play store and added MY ACCOUNT action item to the toolbar

parent 181829c1
Pipeline #11856 canceled with stage
......@@ -5,7 +5,7 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="7">
<list size="10">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
......@@ -13,23 +13,29 @@
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="6">
<list size="9">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
......@@ -4,7 +4,7 @@
"id": "one.librem.chat",
"title": "Librem Chat",
"image": "chat.png",
"url": "http://play.google.com/store/apps/details?id=one.librem.chat",
"url": "https://play.google.com/store/apps/details?id=one.librem.chat",
"description": "Text, voice and video chat",
"isAvailable": true
},
......@@ -12,7 +12,7 @@
"id": "one.librem.social",
"title": "Librem Social",
"image": "social.png",
"url": "http://play.google.com/store/apps/details?id=one.librem.social",
"url": "https://play.google.com/store/apps/details?id=one.librem.social",
"description": "Social network client",
"isAvailable": true
},
......@@ -20,17 +20,17 @@
"id": "one.librem.mail",
"title": "Librem Mail",
"image": "mail.png",
"url": "http://play.google.com/store/apps/details?id=one.librem.mail",
"url": "https://play.google.com/store/apps/details?id=one.librem.mail",
"description": "Encrypted mail",
"isAvailable": true
},
{
"id": "one.librem.vpn",
"id": "one.librem.tunnel",
"title": "Librem Tunnel",
"image": "tunnel.png",
"url": "http://play.google.com/store/apps/details?id=one.librem.vpn",
"description": "COMING SOON: encrypt your online traffic",
"isAvailable": false
"url": "https://play.google.com/store/apps/details?id=one.librem.tunnel",
"description": "Encrypt your online traffic",
"isAvailable": true
}
]
}
\ No newline at end of file
......@@ -6,6 +6,9 @@ import android.widget.ArrayAdapter
import android.widget.ListView
import android.content.Intent
import android.net.Uri
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
class MainActivity : AppCompatActivity() {
......@@ -46,4 +49,18 @@ class MainActivity : AppCompatActivity() {
super.onResume()
adapter.notifyDataSetInvalidated()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.activity_main, menu)
return super.onCreateOptionsMenu(menu)
}
override fun onOptionsItemSelected(item: MenuItem?): Boolean {
val openURL = Intent(android.content.Intent.ACTION_VIEW)
openURL.data = Uri.parse("https://librem.one/accounts/profile")
startActivity(openURL)
return super.onOptionsItemSelected(item)
}
}
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/my_account"
android:title="@string/my_account"
app:showAsAction="ifRoom|withText" />
</menu>
\ No newline at end of file
......@@ -3,4 +3,5 @@
<string name="thumbnail">thumbnail</string>
<string name="run">run</string>
<string name="install">install</string>
<string name="my_account">MY ACCOUNT</string>
</resources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment