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 @@ + android:layout_marginBottom="@dimen/medium_spacing" /> 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 @@ 10dp 234dp 56dp - 24dp 8dp 4dp 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?) {