oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Clean

This commit is contained in:
Niels Andriesse 2020-03-05 14:24:10 +11:00
parent 44fd72dfac
commit a20ccd659a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/activity_settings.xml
View File

@ -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>

1
res/values/dimens.xml
View File

@ -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>

3
src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
View File

@ -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?) {