From eea20ced57e2d06b79cc04c4a24711866b084c4a Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Thu, 4 Nov 2021 03:06:54 +0100
Subject: [PATCH] Notifications settings reorganize and strings update (#1616)

---
 app/src/main/res/values/strings.xml              |  7 ++++---
 .../res/xml/scheme_preferences_notifications.xml | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13030366..1e88ee1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -611,13 +611,13 @@
 
 
     <!--Preferences-->
-    <string name="pref_view_header">App appearance &amp; behavior</string>
+    <string name="pref_view_header">App</string>
     <string name="pref_view_list">Default view</string>
     <string name="pref_view_grade_average_mode">Calculated average options</string>
     <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
     <string name="pref_view_present">Show presence</string>
     <string name="pref_view_app_theme">Theme</string>
-    <string name="pref_view_expand_grade">Expand grades</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
@@ -627,6 +627,7 @@
     <string name="pref_view_app_language">Language</string>
 
     <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</string>
     <string name="pref_notify_switch">Show notifications</string>
     <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
     <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
@@ -689,7 +690,7 @@
     <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
     <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
     <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals, licenses</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
     <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
 
 
diff --git a/app/src/main/res/xml/scheme_preferences_notifications.xml b/app/src/main/res/xml/scheme_preferences_notifications.xml
index 78e91cf0..442581bf 100644
--- a/app/src/main/res/xml/scheme_preferences_notifications.xml
+++ b/app/src/main/res/xml/scheme_preferences_notifications.xml
@@ -22,18 +22,22 @@
             app:singleLineTitle="false"
             app:summary="@string/pref_notify_upcoming_lessons_persistent_summary"
             app:title="@string/pref_notify_upcoming_lessons_persistent_switch" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notification_piggyback"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_notifications_piggyback"
-            app:singleLineTitle="false"
-            app:title="@string/pref_notify_notifications_piggyback" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notification_debug"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notification_debug"
             app:singleLineTitle="false"
             app:title="@string/pref_notify_debug_switch" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_notify_header_other">
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_notification_piggyback"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_piggyback"
+            app:singleLineTitle="false"
+            app:title="@string/pref_notify_notifications_piggyback" />
         <Preference
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notifications_system_settings"