summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-24 00:17:37 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-30 10:34:30 +0000
commite90a5813f79f4a37292a855a049fdf07ddb49322 (patch)
tree2a77441153f095fb2be10fb9b72eb95b00feba1e /android/src
parente3d1cfbe54bee9361d8ddbd1e83dfef226254880 (diff)
downloadmullvadvpn-e90a5813f79f4a37292a855a049fdf07ddb49322.tar.xz
mullvadvpn-e90a5813f79f4a37292a855a049fdf07ddb49322.zip
Add App version settings entry
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/res/drawable/icon_extlink.xml10
-rw-r--r--android/src/main/res/layout/settings.xml40
-rw-r--r--android/src/main/res/values/strings.xml1
3 files changed, 51 insertions, 0 deletions
diff --git a/android/src/main/res/drawable/icon_extlink.xml b/android/src/main/res/drawable/icon_extlink.xml
new file mode 100644
index 0000000000..2411533520
--- /dev/null
+++ b/android/src/main/res/drawable/icon_extlink.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="16dp"
+ android:height="16dp"
+ android:viewportWidth="16"
+ android:viewportHeight="16">
+ <path
+ android:pathData="M12.5858,2L8.9908,2C8.451,2 8,1.5523 8,1C8,0.4439 8.4464,0 8.997,0L15.003,0C15.547,0 16,0.4464 16,0.997L16,7.003C16,7.547 15.5523,8 15,8C14.4439,8 14,7.5564 14,7.0092L14,3.4142L6.7071,10.7071C6.3166,11.0976 5.6834,11.0976 5.2929,10.7071C4.9024,10.3166 4.9024,9.6834 5.2929,9.2929L12.5858,2ZM8.4645,4L6.4645,6L2,6L2,14L10,14L10,9.5355L12,7.5355L12,14.9975C12,15.5512 11.5442,16 10.9975,16L1.0025,16C0.4488,16 0,15.5442 0,14.9975L0,5.0025C0,4.4488 0.4558,4 1.0025,4L8.4645,4Z"
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 0be7a8087e..1068da3c40 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -64,6 +64,46 @@
android:src="@drawable/icon_chevron"
/>
</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:paddingHorizontal="16dp"
+ android:background="@drawable/cell_button_background"
+ android:clickable="true"
+ android:gravity="center"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingHorizontal="8dp"
+ android:paddingVertical="17dp"
+ android:textColor="@color/white"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:text="@string/app_version"
+ />
+ <TextView android:id="@+id/app_version_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingHorizontal="8dp"
+ android:gravity="right"
+ android:textColor="@color/white60"
+ android:textSize="13sp"
+ android:textStyle="bold"
+ android:text=""
+ android:textAllCaps="true"
+ />
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:layout_weight="0"
+ android:alpha="0.6"
+ android:src="@drawable/icon_extlink"
+ />
+ </LinearLayout>
<LinearLayout android:id="@+id/report_a_problem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 711be12793..0ca628f401 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -16,6 +16,7 @@
<string name="settings_account">Account</string>
<string name="less_than_a_day_left">less than a day left</string>
<string name="out_of_time">Out of time</string>
+ <string name="app_version">App version</string>
<string name="report_a_problem">Report a problem</string>
<string name="quit">Quit</string>