mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-25 20:07:32 +00:00
Implement detailed settings screen redesign
This commit is contained in:
Niels Andriesse
@@ -1,68 +1,73 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceCategory android:title="@string/preferences_app_protection__app_access">
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:key="pref_android_screen_lock"
|
||||
android:defaultValue="false"
|
||||
android:title="@string/preferences_app_protection__screen_lock"
|
||||
android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint"/>
|
||||
android:key="pref_android_screen_lock"
|
||||
android:defaultValue="false"
|
||||
android:title="@string/preferences_app_protection__screen_lock"
|
||||
android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint" />
|
||||
|
||||
<Preference android:title="@string/preferences_app_protection__screen_lock_inactivity_timeout"
|
||||
android:key="pref_android_screen_lock_timeout"
|
||||
android:dependency="pref_android_screen_lock"/>
|
||||
<Preference
|
||||
android:title="@string/preferences_app_protection__screen_lock_inactivity_timeout"
|
||||
android:key="pref_android_screen_lock_timeout"
|
||||
android:dependency="pref_android_screen_lock" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:key="pref_enable_passphrase_temporary"
|
||||
android:defaultValue="true"
|
||||
android:title="@string/preferences__enable_passphrase"
|
||||
android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
|
||||
android:key="pref_enable_passphrase_temporary"
|
||||
android:defaultValue="true"
|
||||
android:title="@string/preferences__enable_passphrase"
|
||||
android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase" />
|
||||
|
||||
<Preference android:key="pref_change_passphrase"
|
||||
android:title="@string/preferences__change_passphrase"
|
||||
android:summary="@string/preferences__change_your_passphrase"
|
||||
android:dependency="pref_enable_passphrase_temporary"/>
|
||||
<Preference
|
||||
android:key="pref_change_passphrase"
|
||||
android:title="@string/preferences__change_passphrase"
|
||||
android:summary="@string/preferences__change_your_passphrase"
|
||||
android:dependency="pref_enable_passphrase_temporary" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_timeout_passphrase"
|
||||
android:title="@string/preferences__inactivity_timeout_passphrase"
|
||||
android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
|
||||
android:dependency="pref_enable_passphrase_temporary"/>
|
||||
android:defaultValue="false"
|
||||
android:key="pref_timeout_passphrase"
|
||||
android:title="@string/preferences__inactivity_timeout_passphrase"
|
||||
android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
|
||||
android:dependency="pref_enable_passphrase_temporary" />
|
||||
|
||||
<Preference android:title="@string/preferences__inactivity_timeout_interval"
|
||||
android:key="pref_timeout_interval"
|
||||
android:dependency="pref_timeout_passphrase"/>
|
||||
<Preference
|
||||
android:title="@string/preferences__inactivity_timeout_interval"
|
||||
android:key="pref_timeout_interval"
|
||||
android:dependency="pref_timeout_passphrase" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_screen_security"
|
||||
android:title="@string/preferences__screen_security"
|
||||
android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
|
||||
android:defaultValue="false"
|
||||
android:key="pref_screen_security"
|
||||
android:title="@string/preferences__screen_security"
|
||||
android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:key="pref_incognito_keyboard"
|
||||
android:title="@string/preferences__incognito_keyboard"
|
||||
android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
<PreferenceCategory android:title="@string/preferences_app_protection__communication">
|
||||
|
||||
<!-- <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: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"/> -->
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_read_receipts"
|
||||
android:title="@string/preferences__read_receipts"
|
||||
android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"/>
|
||||
android:defaultValue="false"
|
||||
android:key="pref_read_receipts"
|
||||
android:title="@string/preferences__read_receipts"
|
||||
android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"/>
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
@@ -108,10 +113,10 @@
|
||||
<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"/>
|
||||
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> -->
|
||||
|
||||
|
||||
@@ -1,100 +1,109 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<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">
|
||||
<MultiSelectListPreference
|
||||
android:title="@string/preferences_chats__when_using_mobile_data"
|
||||
android:key="pref_media_download_mobile"
|
||||
android:defaultValue="@array/pref_media_download_mobile_data_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
|
||||
<MultiSelectListPreference
|
||||
android:title="@string/preferences_chats__when_using_wifi"
|
||||
android:key="pref_media_download_wifi"
|
||||
android:defaultValue="@array/pref_media_download_wifi_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
android:title="@string/preferences_chats__when_using_mobile_data"
|
||||
android:key="pref_media_download_mobile"
|
||||
android:defaultValue="@array/pref_media_download_mobile_data_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
|
||||
<MultiSelectListPreference
|
||||
android:title="@string/preferences_chats__when_roaming"
|
||||
android:key="pref_media_download_roaming"
|
||||
android:defaultValue="@array/pref_media_download_roaming_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
android:title="@string/preferences_chats__when_using_wifi"
|
||||
android:key="pref_media_download_wifi"
|
||||
android:defaultValue="@array/pref_media_download_wifi_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
|
||||
<MultiSelectListPreference
|
||||
android:title="@string/preferences_chats__when_roaming"
|
||||
android:key="pref_media_download_roaming"
|
||||
android:defaultValue="@array/pref_media_download_roaming_default"
|
||||
android:persistent="true"
|
||||
android:entries="@array/pref_media_download_values"
|
||||
android:entryValues="@array/pref_media_download_entries" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/> -->
|
||||
|
||||
<PreferenceCategory android:title="@string/preferences_chats__chats">
|
||||
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
|
||||
android:key="pref_message_body_text_size"
|
||||
android:title="@string/preferences_chats__message_text_size"
|
||||
android:entries="@array/pref_message_font_size_entries"
|
||||
android:entryValues="@array/pref_message_font_size_values"
|
||||
android:defaultValue="16">
|
||||
</org.thoughtcrime.securesms.preferences.widgets.SignalListPreference>
|
||||
|
||||
<!-- <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
|
||||
android:key="pref_message_body_text_size"
|
||||
android:title="@string/preferences_chats__message_text_size"
|
||||
android:entries="@array/pref_message_font_size_entries"
|
||||
android:entryValues="@array/pref_message_font_size_values"
|
||||
android:defaultValue="16" /> -->
|
||||
|
||||
<!-- <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: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" /> -->
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_system_emoji"
|
||||
android:title="@string/preferences_advanced__use_system_emoji"
|
||||
android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
|
||||
android:defaultValue="false"
|
||||
android:key="pref_system_emoji"
|
||||
android:title="@string/preferences_advanced__use_system_emoji"
|
||||
android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_enter_sends"
|
||||
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
|
||||
android:title="@string/preferences__pref_enter_sends_title"/>
|
||||
android:defaultValue="false"
|
||||
android:key="pref_enter_sends"
|
||||
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
|
||||
android:title="@string/preferences__pref_enter_sends_title" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
|
||||
<PreferenceCategory android:key="message_trimming" android:title="@string/preferences_chats__message_trimming">
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_trim_threads"
|
||||
android:summary="@string/preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length"
|
||||
android:title="@string/preferences__delete_old_messages" />
|
||||
|
||||
<EditTextPreference android:defaultValue="500"
|
||||
android:key="pref_trim_length"
|
||||
android:title="@string/preferences__conversation_length_limit"
|
||||
android:inputType="number"
|
||||
android:dependency="pref_trim_threads" />
|
||||
<EditTextPreference
|
||||
android:defaultValue="500"
|
||||
android:key="pref_trim_length"
|
||||
android:title="@string/preferences__conversation_length_limit"
|
||||
android:inputType="number"
|
||||
android:dependency="pref_trim_threads" />
|
||||
|
||||
<Preference
|
||||
android:key="pref_trim_now"
|
||||
android:title="@string/preferences__trim_all_conversations_now"
|
||||
android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
|
||||
android:dependency="pref_trim_threads" />
|
||||
|
||||
<Preference android:key="pref_trim_now"
|
||||
android:title="@string/preferences__trim_all_conversations_now"
|
||||
android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
|
||||
android:dependency="pref_trim_threads" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
<PreferenceCategory android:layout="@layout/preference_divider" />
|
||||
|
||||
<PreferenceCategory android:key="backup_category" android:title="@string/preferences_chats__backups">
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="pref_backup_enabled"
|
||||
android:title="@string/preferences_chats__chat_backups"
|
||||
android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
|
||||
android:defaultValue="false"
|
||||
android:key="pref_backup_enabled"
|
||||
android:title="@string/preferences_chats__chat_backups"
|
||||
android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
|
||||
|
||||
<org.thoughtcrime.securesms.preferences.widgets.ProgressPreference
|
||||
android:key="pref_backup_create"
|
||||
android:title="@string/preferences_chats__create_backup"
|
||||
android:persistent="false"
|
||||
android:dependency="pref_backup_enabled"
|
||||
tools:summary="Last backup: 3 days ago"/>
|
||||
android:key="pref_backup_create"
|
||||
android:title="@string/preferences_chats__create_backup"
|
||||
android:persistent="false"
|
||||
android:dependency="pref_backup_enabled"
|
||||
tools:summary="Last backup: 3 days ago" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
@@ -2,37 +2,39 @@
|
||||
|
||||
<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"/>
|
||||
<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>
|
||||
|
||||
<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"
|
||||
android:key="pref_key_ringtone"
|
||||
android:title="@string/preferences__sound"
|
||||
android:persistent="false"
|
||||
android:defaultValue="content://settings/system/notification_sound" />
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:key="pref_key_ringtone"
|
||||
android:title="@string/preferences__sound"
|
||||
android:persistent="false"
|
||||
android:defaultValue="content://settings/system/notification_sound" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:key="pref_key_vibrate"
|
||||
android:defaultValue="true"
|
||||
android:title="@string/preferences__vibrate"/>
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:key="pref_key_vibrate"
|
||||
android:defaultValue="true"
|
||||
android:title="@string/preferences__vibrate" />
|
||||
|
||||
<org.thoughtcrime.securesms.preferences.widgets.LEDColorListPreference
|
||||
android:key="pref_led_color"
|
||||
@@ -51,32 +53,32 @@
|
||||
android:entryValues="@array/pref_led_blink_pattern_values" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:key="pref_key_inthread_notifications"
|
||||
android:title="@string/preferences_notifications__in_chat_sounds"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:defaultValue="true" />
|
||||
android:key="pref_key_inthread_notifications"
|
||||
android:title="@string/preferences_notifications__in_chat_sounds"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:defaultValue="true" />
|
||||
|
||||
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
|
||||
android:key="pref_repeat_alerts"
|
||||
android:defaultValue="0"
|
||||
android:title="@string/preferences__repeat_alerts"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:entries="@array/pref_repeat_alerts_entries"
|
||||
android:entryValues="@array/pref_repeat_alerts_values" />
|
||||
android:key="pref_repeat_alerts"
|
||||
android:defaultValue="0"
|
||||
android:title="@string/preferences__repeat_alerts"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:entries="@array/pref_repeat_alerts_entries"
|
||||
android:entryValues="@array/pref_repeat_alerts_values" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:layout="@layout/preference_divider"/>
|
||||
<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"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:defaultValue="all"
|
||||
android:entries="@array/pref_notification_privacy_entries"
|
||||
android:entryValues="@array/pref_notification_privacy_values"/>
|
||||
android:key="pref_notification_privacy"
|
||||
android:title="@string/preferences_notifications__show"
|
||||
android:dependency="pref_key_enable_notifications"
|
||||
android:defaultValue="all"
|
||||
android:entries="@array/pref_notification_privacy_entries"
|
||||
android:entryValues="@array/pref_notification_privacy_values" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user