Merge 4411b584fa into 7fe40ea9f1

Hide duplicate divider
2023-12-08 09:46:46 +00:00 · 2023-11-30 00:47:57 +10:30
2 changed files with 2 additions and 0 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@ -114,6 +114,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
            appearanceButton.setOnClickListener { showAppearanceSettings() }
            inviteFriendButton.setOnClickListener { sendInvitation() }
            helpButton.setOnClickListener { showHelp() }
+            passwordDivider.isGone = prefs.getHidePassword()
            passwordButton.isGone = prefs.getHidePassword()
            passwordButton.setOnClickListener { showPassword() }
            clearAllDataButton.setOnClickListener { clearAllData() }
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@ -398,6 +398,7 @@
                </RelativeLayout>

                <View
+                    android:id="@+id/passwordDivider"
                    android:layout_marginHorizontal="@dimen/very_large_spacing"
                    android:layout_width="match_parent"
                    android:layout_height="1dp"
Author	SHA1	Message	Date
Andrew	15248aab5f	Merge `4411b584fa` into `7fe40ea9f1`	2023-12-08 09:46:46 +00:00
andrew	4411b584fa	Hide duplicate divider	2023-11-30 00:47:57 +10:30