mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-30 13:35:18 +00:00
Added version string at the bottom of settings.
This commit is contained in:
parent
ef2ceff0c1
commit
efef42a6f6
@ -257,9 +257,23 @@
|
|||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1px"
|
android:layout_height="1px"
|
||||||
android:layout_marginBottom="@dimen/large_spacing"
|
android:layout_marginBottom="@dimen/small_spacing"
|
||||||
android:background="@color/separator" />
|
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>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
<dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
|
<dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
|
||||||
<dimen name="fake_chat_view_height">234dp</dimen>
|
<dimen name="fake_chat_view_height">234dp</dimen>
|
||||||
<dimen name="setting_button_height">56dp</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_corner_radius">8dp</dimen>
|
||||||
<dimen name="dialog_button_corner_radius">4dp</dimen>
|
<dimen name="dialog_button_corner_radius">4dp</dimen>
|
||||||
|
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Session</string>
|
<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="yes">Yes</string>
|
||||||
<string name="no">No</string>
|
<string name="no">No</string>
|
||||||
<string name="delete">Delete</string>
|
<string name="delete">Delete</string>
|
||||||
<string name="please_wait">Please wait...</string>
|
<string name="please_wait">Please wait...</string>
|
||||||
<string name="save">Save</string>
|
<string name="save">Save</string>
|
||||||
<string name="note_to_self">Note to Self</string>
|
<string name="note_to_self">Note to Self</string>
|
||||||
|
<string name="version_s">Version: %s</string>
|
||||||
|
|
||||||
<!-- AbstractNotificationBuilder -->
|
<!-- AbstractNotificationBuilder -->
|
||||||
<string name="AbstractNotificationBuilder_new_message">New message</string>
|
<string name="AbstractNotificationBuilder_new_message">New message</string>
|
||||||
|
@ -17,6 +17,7 @@ import android.view.inputmethod.InputMethodManager
|
|||||||
import android.widget.LinearLayout
|
import android.widget.LinearLayout
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import kotlinx.android.synthetic.main.activity_settings.*
|
import kotlinx.android.synthetic.main.activity_settings.*
|
||||||
|
import network.loki.messenger.BuildConfig
|
||||||
import network.loki.messenger.R
|
import network.loki.messenger.R
|
||||||
import nl.komponents.kovenant.Promise
|
import nl.komponents.kovenant.Promise
|
||||||
import nl.komponents.kovenant.all
|
import nl.komponents.kovenant.all
|
||||||
@ -94,6 +95,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
|
|||||||
linkedDevicesButton.setOnClickListener { showLinkedDevices() }
|
linkedDevicesButton.setOnClickListener { showLinkedDevices() }
|
||||||
seedButton.setOnClickListener { showSeed() }
|
seedButton.setOnClickListener { showSeed() }
|
||||||
clearAllDataButton.setOnClickListener { clearAllData() }
|
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?) {
|
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||||
|
Loading…
Reference in New Issue
Block a user