From efef42a6f615b115c8b680bbb78ef93376efd206 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Tue, 25 Feb 2020 14:04:15 +1100
Subject: [PATCH 1/2] Added version string at the bottom of settings.

---
 res/layout/activity_settings.xml                 | 16 +++++++++++++++-
 res/values/dimens.xml                            |  1 +
 res/values/strings.xml                           |  3 ++-
 .../loki/redesign/activities/SettingsActivity.kt |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index ab8e81d6c9..8ec7ade823 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -257,9 +257,23 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:layout_marginBottom="@dimen/large_spacing"
+                android:layout_marginBottom="@dimen/small_spacing"
                 android:background="@color/separator" />
 
+            <TextView
+                android:id="@+id/versionText"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_version_height"
+                android:gravity="center"
+                android:text="@string/version_s"
+                android:textColor="@color/gray65"
+                android:textSize="@dimen/very_small_font_size" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginBottom="@dimen/small_spacing" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a4ec3dff18..c6f05a7a6f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,6 +29,7 @@
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
     <dimen name="fake_chat_view_height">234dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
+    <dimen name="setting_version_height">24dp</dimen>
     <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aca6b1c236..673831ef51 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Session</string>
-    <string name="install_url" translatable="false">https://signal.org/install</string>
+    <string name="install_url" translatable="false">https://getsession.org/</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="delete">Delete</string>
     <string name="please_wait">Please wait...</string>
     <string name="save">Save</string>
     <string name="note_to_self">Note to Self</string>
+    <string name="version_s">Version: %s</string>
 
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">New message</string>
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
index c3298506e5..51770bb559 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
@@ -17,6 +17,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.LinearLayout
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_settings.*
+import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.all
@@ -94,6 +95,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         linkedDevicesButton.setOnClickListener { showLinkedDevices() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
+
+        versionText.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
     }
 
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

From a20ccd659a032b3b20d443be639f450bf953dd7d Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 5 Mar 2020 14:24:10 +1100
Subject: [PATCH 2/2] Clean

---
 res/layout/activity_settings.xml                      | 11 ++++++-----
 res/values/dimens.xml                                 |  1 -
 .../loki/redesign/activities/SettingsActivity.kt      |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 8ec7ade823..3c2490af60 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -257,22 +257,23 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:layout_marginBottom="@dimen/small_spacing"
+                android:layout_marginBottom="@dimen/medium_spacing"
                 android:background="@color/separator" />
 
             <TextView
-                android:id="@+id/versionText"
+                android:id="@+id/versionTextView"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/setting_version_height"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="@string/version_s"
-                android:textColor="@color/gray65"
+                android:textColor="@color/text"
+                android:alpha="0.6"
                 android:textSize="@dimen/very_small_font_size" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1px"
-                android:layout_marginBottom="@dimen/small_spacing" />
+                android:layout_marginBottom="@dimen/medium_spacing" />
 
         </LinearLayout>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c6f05a7a6f..a4ec3dff18 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,7 +29,6 @@
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
     <dimen name="fake_chat_view_height">234dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
-    <dimen name="setting_version_height">24dp</dimen>
     <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
 
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
index 51770bb559..c82e4e9e3d 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
@@ -95,8 +95,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         linkedDevicesButton.setOnClickListener { showLinkedDevices() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
-
-        versionText.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
+        versionTextView.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
     }
 
     public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {