Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Move notifications settings into own screen

Browse Source
This commit is contained in:
Torsten Grote
2021-01-22 15:39:46 -03:00
parent 670bf15d31
commit 484817db08
12 changed files with 497 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/main/res/drawable/ic_notifications.xml Normal file
View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/textColorPrimary"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
</vector>

1
briar-android/src/main/res/values/strings.xml
View File

@@ -552,7 +552,6 @@
<string name="cannot_load_ringtone">Cannot load ringtone</string>
<!-- Settings Feedback -->
<string name="feedback_settings_title">Feedback</string>
<string name="send_feedback">Send feedback</string>
<!-- Link Warning -->

88
briar-android/src/main/res/xml/settings.xml
View File

@@ -17,88 +17,23 @@
app:fragment="org.briarproject.briar.android.settings.SecurityFragment"
app:icon="@drawable/ic_settings_security" />
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/notification_settings_title">
<Preference
android:title="@string/notification_settings_title"
app:fragment="org.briarproject.briar.android.settings.NotificationsFragment"
app:icon="@drawable/ic_notifications" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_sign_in"
android:summary="@string/notify_sign_in_summary"
android:title="@string/notify_sign_in_title"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_private_messages"
android:persistent="false"
android:summary="@string/notify_private_messages_setting_summary"
android:title="@string/notify_private_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_group_messages"
android:persistent="false"
android:summary="@string/notify_group_messages_setting_summary"
android:title="@string/notify_group_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_forum_posts"
android:persistent="false"
android:summary="@string/notify_forum_posts_setting_summary"
android:title="@string/notify_forum_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_blog_posts"
android:persistent="false"
android:summary="@string/notify_blog_posts_setting_summary"
android:title="@string/notify_blog_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_vibration"
android:persistent="false"
android:title="@string/notify_vibration_setting"
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false" />
<Preference
android:key="pref_key_notify_sound"
android:title="@string/notify_sound_setting"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback" />
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/feedback_settings_title">
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="Testing">
android:title="Developer Options"
app:allowDividerAbove="true">
<Preference
android:key="pref_key_test_data"
android:title="Create Test Data"
app:iconSpaceReserved="false">
android:title="Create test data">
<intent
android:targetClass="org.briarproject.briar.android.test.TestDataActivity"
@@ -107,8 +42,7 @@
<Preference
android:key="pref_key_explode"
android:title="Crash"
app:iconSpaceReserved="false" />
android:title="Crash" />
</PreferenceCategory>

61
briar-android/src/main/res/xml/settings_notifications.xml Normal file
View File

@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_key_notify_sign_in"
android:summary="@string/notify_sign_in_summary"
android:title="@string/notify_sign_in_title"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:enabled="false"
android:key="notifyPrivateMessages"
android:persistent="false"
android:summary="@string/notify_private_messages_setting_summary"
android:title="@string/notify_private_messages_setting_title"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:enabled="false"
android:key="notifyGroupMessages"
android:persistent="false"
android:summary="@string/notify_group_messages_setting_summary"
android:title="@string/notify_group_messages_setting_title"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:enabled="false"
android:key="notifyForumPosts"
android:persistent="false"
android:summary="@string/notify_forum_posts_setting_summary"
android:title="@string/notify_forum_posts_setting_title"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:enabled="false"
android:key="notifyBlogPosts"
android:persistent="false"
android:summary="@string/notify_blog_posts_setting_summary"
android:title="@string/notify_blog_posts_setting_title"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:enabled="false"
android:key="notifyVibration"
android:persistent="false"
android:title="@string/notify_vibration_setting"
app:iconSpaceReserved="false" />
<Preference
android:key="notifySound"
android:title="@string/notify_sound_setting"
app:iconSpaceReserved="false" />
</PreferenceScreen>