Partially Lokify UI

2025-08-25 13:57:39 +00:00 · 2019-07-16 17:09:15 +10:00
parent 862288abfd
commit ab99874ede
15 changed files with 134 additions and 91 deletions
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -5,9 +5,9 @@
    <org.thoughtcrime.securesms.preferences.widgets.ProfilePreference
            android:key="preference_category_profile"/>

-    <Preference android:key="preference_category_sms_mms"
+    <!-- <Preference android:key="preference_category_sms_mms"
                android:title="@string/preferences__sms_mms"
-                android:icon="@drawable/ic_textsms_24dp"/>
+                android:icon="@drawable/ic_textsms_24dp"/> -->

    <Preference android:key="preference_category_notifications"
                android:title="@string/preferences__notifications"
@@ -17,21 +17,21 @@
                android:title="@string/preferences__privacy"
                android:icon="@drawable/ic_security_24dp"/>

-    <Preference android:key="preference_category_appearance"
+    <!-- <Preference android:key="preference_category_appearance"
                android:title="@string/preferences__appearance"
-                android:icon="@drawable/ic_brightness_6_24dp"/>
+                android:icon="@drawable/ic_brightness_6_24dp"/> -->

    <Preference android:key="preference_category_chats"
                android:title="@string/preferences__chats"
                android:icon="@drawable/ic_forum_24dp"/>

-    <Preference android:key="preference_category_devices"
+    <!-- <Preference android:key="preference_category_devices"
                android:title="@string/preferences__linked_devices"
                android:icon="@drawable/ic_laptop_24dp"/>

    <Preference android:key="preference_category_advanced"
                android:title="@string/preferences__advanced"
-                android:icon="@drawable/ic_advanced_24dp"/>
+                android:icon="@drawable/ic_advanced_24dp"/> -->

    <Preference android:key="preference_category_public_key"
                android:title="@string/activity_settings_share_public_key_button_title"
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -51,11 +51,12 @@
    <PreferenceCategory android:layout="@layout/preference_divider"/>

    <PreferenceCategory android:title="@string/preferences_app_protection__communication">
-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+
+        <!-- <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                android:defaultValue="false"
                android:key="pref_turn_only"
                android:title="@string/preferences_advanced__always_relay_calls"
-                android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/>
+                android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/> -->

        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                android:defaultValue="false"
@@ -75,13 +76,15 @@
            android:summary="@string/preferences__previews_are_supported_for"
            android:title="@string/preferences__send_link_previews"/>

-        <Preference android:key="preference_category_blocked"
-                    android:title="@string/preferences_app_protection__blocked_contacts" />
+        <!-- <Preference android:key="preference_category_blocked"
+                    android:title="@string/preferences_app_protection__blocked_contacts" /> -->
+
    </PreferenceCategory>

-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <!-- <PreferenceCategory android:layout="@layout/preference_divider"/>

    <PreferenceCategory android:title="@string/preferences_communication__category_sealed_sender">
+
        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
            android:defaultValue="false"
            android:key="pref_show_unidentifed_delivery_indicators"
@@ -103,12 +106,13 @@
    <PreferenceCategory android:layout="@layout/preference_divider"/>

    <PreferenceCategory android:title="@string/preferences_app_protection__registration_lock">
+
        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                android:defaultValue="false"
                android:key="pref_registration_lock"
                android:title="@string/preferences_app_protection__registration_lock_pin"
                android:summary="@string/preferences_app_protection__enable_a_registration_lock_pin_that_will_be_required"/>
-    </PreferenceCategory>

+    </PreferenceCategory> -->

 </PreferenceScreen>
--- a/res/xml/preferences_chats.xml
+++ b/res/xml/preferences_chats.xml
@@ -2,7 +2,7 @@

 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                  xmlns:tools="http://schemas.android.com/tools">
-    <PreferenceCategory android:key="media_download" android:title="@string/preferences_chats__media_auto_download">
+    <!-- <PreferenceCategory android:key="media_download" android:title="@string/preferences_chats__media_auto_download">
        <MultiSelectListPreference
                android:title="@string/preferences_chats__when_using_mobile_data"
                android:key="pref_media_download_mobile"
@@ -28,7 +28,7 @@
                android:entryValues="@array/pref_media_download_entries" />
    </PreferenceCategory>

-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:layout="@layout/preference_divider"/> -->

    <PreferenceCategory android:title="@string/preferences_chats__chats">
        <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
@@ -39,11 +39,11 @@
                android:defaultValue="16">
        </org.thoughtcrime.securesms.preferences.widgets.SignalListPreference>

-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+        <!-- <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                android:defaultValue="true"
                android:key="pref_show_invite_reminder"
                android:title="@string/preferences_chats__show_invitation_prompts"
-                android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" />
+                android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" /> -->

        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                android:defaultValue="false"
--- a/res/xml/preferences_notifications.xml
+++ b/res/xml/preferences_notifications.xml
@@ -2,12 +2,24 @@

 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

-    <PreferenceCategory android:title="@string/preferences_notifications__messages">
+    <!-- <PreferenceCategory android:title="@string/preferences_notifications__messages"> -->

-        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:key="pref_key_enable_notifications"
-                            android:title="@string/preferences__notifications"
-                            android:defaultValue="true" />
+    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+        android:key="pref_key_enable_notifications"
+        android:title="@string/preferences__notifications"
+        android:defaultValue="true" />
+
+    <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
+        android:key="pref_notification_priority"
+        android:title="@string/preferences_notifications__priority"
+        android:dependency="pref_key_enable_notifications"
+        android:defaultValue="1"
+        android:entries="@array/pref_notification_priority_entries"
+        android:entryValues="@array/pref_notification_priority_values"/>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
+    <PreferenceCategory android:title="@string/activity_notification_settings_style_section_title">

        <org.thoughtcrime.securesms.preferences.widgets.SignalPreference
                android:dependency="pref_key_enable_notifications"
@@ -52,6 +64,12 @@
                android:entries="@array/pref_repeat_alerts_entries"
                android:entryValues="@array/pref_repeat_alerts_values" />

+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
+    <PreferenceCategory android:title="@string/activity_notification_settings_content_section_title">
+
        <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
                android:key="pref_notification_privacy"
                android:title="@string/preferences_notifications__show"
@@ -60,15 +78,10 @@
                android:entries="@array/pref_notification_privacy_entries"
                android:entryValues="@array/pref_notification_privacy_values"/>

-        <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
-                android:key="pref_notification_priority"
-                android:title="@string/preferences_notifications__priority"
-                android:dependency="pref_key_enable_notifications"
-                android:defaultValue="1"
-                android:entries="@array/pref_notification_priority_entries"
-                android:entryValues="@array/pref_notification_priority_values"/>
    </PreferenceCategory>

+    <!-- </PreferenceCategory>
+
    <PreferenceCategory android:layout="@layout/preference_divider"/>

    <PreferenceCategory android:title="@string/preferences_notifications__calls">
@@ -100,6 +113,6 @@
            android:key="pref_enable_new_contacts_notifications"
            android:title="@string/preferences_events__contact_joined_signal"
            android:defaultValue="true" />
-    </PreferenceCategory>
+    </PreferenceCategory> -->

 </PreferenceScreen>