From 970cdd99054ac6e6b983c7f5664c5b6c5524107d Mon Sep 17 00:00:00 2001
From: Tony Tam <engineer.tonytam@pm.me>
Date: Thu, 9 Jan 2020 13:28:53 -0800
Subject: Add summary to main settings/preferences screen (#3745)

---
 .../java/de/test/antennapod/ui/PreferencesTest.java    | 18 +++++++++---------
 app/src/main/res/xml/preferences.xml                   |  5 +++++
 core/src/main/res/values/strings.xml                   |  5 +++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
index a68afbc2e..7d3972378 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -164,7 +164,7 @@ public class PreferencesTest {
 
     @Test
     public void testHeadPhonesDisconnect() {
-        onView(withText(R.string.playback_pref)).perform(click());
+        clickPreference(R.string.playback_pref);
         final boolean pauseOnHeadsetDisconnect = UserPreferences.isPauseOnHeadsetDisconnect();
         onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click());
         Awaitility.await().atMost(1000, MILLISECONDS)
@@ -176,7 +176,7 @@ public class PreferencesTest {
 
     @Test
     public void testHeadPhonesReconnect() {
-        onView(withText(R.string.playback_pref)).perform(click());
+        clickPreference(R.string.playback_pref);
         if (!UserPreferences.isPauseOnHeadsetDisconnect()) {
             onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click());
             Awaitility.await().atMost(1000, MILLISECONDS)
@@ -193,7 +193,7 @@ public class PreferencesTest {
 
     @Test
     public void testBluetoothReconnect() {
-        onView(withText(R.string.playback_pref)).perform(click());
+        clickPreference(R.string.playback_pref);
         if (!UserPreferences.isPauseOnHeadsetDisconnect()) {
             onView(withText(R.string.pref_pauseOnHeadsetDisconnect_title)).perform(click());
             Awaitility.await().atMost(1000, MILLISECONDS)
@@ -222,7 +222,7 @@ public class PreferencesTest {
 
     @Test
     public void testAutoDelete() {
-        onView(withText(R.string.storage_pref)).perform(click());
+        clickPreference(R.string.storage_pref);
         final boolean autoDelete = UserPreferences.isAutoDelete();
         onView(withText(R.string.pref_auto_delete_title)).perform(click());
         Awaitility.await().atMost(1000, MILLISECONDS)
@@ -245,7 +245,7 @@ public class PreferencesTest {
 
     @Test
     public void testPauseForInterruptions() {
-        onView(withText(R.string.playback_pref)).perform(click());
+        clickPreference(R.string.playback_pref);
         final boolean pauseForFocusLoss = UserPreferences.shouldPauseForFocusLoss();
         clickPreference(R.string.pref_pausePlaybackForFocusLoss_title);
         Awaitility.await().atMost(1000, MILLISECONDS)
@@ -257,7 +257,7 @@ public class PreferencesTest {
 
     @Test
     public void testDisableUpdateInterval() {
-        onView(withText(R.string.network_pref)).perform(click());
+        clickPreference(R.string.network_pref);
         onView(withText(R.string.pref_autoUpdateIntervallOrTime_title)).perform(click());
         onView(withText(R.string.pref_autoUpdateIntervallOrTime_Disable)).perform(click());
         Awaitility.await().atMost(1000, MILLISECONDS)
@@ -385,7 +385,7 @@ public class PreferencesTest {
 
     @Test
     public void testEpisodeCleanupQueueOnly() {
-        onView(withText(R.string.network_pref)).perform(click());
+        clickPreference(R.string.network_pref);
         onView(withText(R.string.pref_automatic_download_title)).perform(click());
         onView(withText(R.string.pref_episode_cleanup_title)).perform(click());
         onView(isRoot()).perform(waitForView(withText(R.string.episode_cleanup_queue_removal), 1000));
@@ -396,7 +396,7 @@ public class PreferencesTest {
 
     @Test
     public void testEpisodeCleanupNeverAlg() {
-        onView(withText(R.string.network_pref)).perform(click());
+        clickPreference(R.string.network_pref);
         onView(withText(R.string.pref_automatic_download_title)).perform(click());
         onView(withText(R.string.pref_episode_cleanup_title)).perform(click());
         onView(withId(R.id.select_dialog_listview)).perform(swipeUp());
@@ -407,7 +407,7 @@ public class PreferencesTest {
 
     @Test
     public void testEpisodeCleanupClassic() {
-        onView(withText(R.string.network_pref)).perform(click());
+        clickPreference(R.string.network_pref);
         onView(withText(R.string.pref_automatic_download_title)).perform(click());
         onView(withText(R.string.pref_episode_cleanup_title)).perform(click());
         onView(isRoot()).perform(waitForView(withText(R.string.episode_cleanup_after_listening), 1000));
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 37707ead6..6e734f789 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -12,26 +12,31 @@
     <Preference
             android:key="prefScreenInterface"
             android:title="@string/user_interface_label"
+            android:summary="@string/user_interface_sum"
             android:icon="?attr/ic_cellphone_text" />
 
     <Preference
             android:key="prefScreenPlayback"
             android:title="@string/playback_pref"
+            android:summary="@string/playback_pref_sum"
             android:icon="?attr/av_play" />
 
     <Preference
             android:key="prefScreenNetwork"
             android:title="@string/network_pref"
+            android:summary="@string/network_pref_sum"
             android:icon="?attr/ic_swap" />
 
     <Preference
             android:key="prefScreenIntegrations"
             android:title="@string/integrations_label"
+            android:summary="@string/integrations_sum"
             android:icon="?attr/ic_unfav" />
 
     <Preference
             android:key="prefScreenStorage"
             android:title="@string/storage_pref"
+            android:summary="@string/storage_sum"
             android:icon="?attr/storage" />
 
     <Preference
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index e59eac331..7f4ec2442 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -332,9 +332,11 @@
 
     <!-- Preferences -->
     <string name="storage_pref">Storage</string>
+    <string name="storage_sum">Episode auto delete, Export, Import</string>
     <string name="project_pref">Project</string>
     <string name="queue_label">Queue</string>
     <string name="integrations_label">Integrations</string>
+    <string name="integrations_sum">External services</string>
     <string name="automation">Automation</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
@@ -366,7 +368,9 @@
     <string name="pref_favorite_keeps_episodes_sum">Keep episodes when they are marked Favorite</string>
     <string name="pref_favorite_keeps_episodes_title">Keep Favorite Episodes</string>
     <string name="playback_pref">Playback</string>
+    <string name="playback_pref_sum">Headphone controls, Skip intervals, Queue</string>
     <string name="network_pref">Network</string>
+    <string name="network_pref_sum">Update interval, Download controls, Mobile data</string>
     <string name="pref_autoUpdateIntervallOrTime_title">Update Interval or Time of Day</string>
     <string name="pref_autoUpdateIntervallOrTime_sum">Specify an interval or a specific time of day to refresh the feeds automatically</string>
     <string name="pref_autoUpdateIntervallOrTime_message">You can set an <i>interval</i> like \"every 2 hours\", set a specific <i>time of day</i> like \"7:00 AM\" or <i>disable</i> automatic updates altogether.\n\n<small>Please note: Update times are inexact. You may encounter a short delay.</small></string>
@@ -389,6 +393,7 @@
     <string name="pref_mobileUpdate_episode_download">Episode download</string>
     <string name="pref_mobileUpdate_streaming">Streaming</string>
     <string name="user_interface_label">User Interface</string>
+    <string name="user_interface_sum">Appearance, Subscription order, Lockscreen</string>
     <string name="pref_set_theme_title">Select Theme</string>
     <string name="pref_nav_drawer_items_title">Set Navigation Drawer items</string>
     <string name="pref_nav_drawer_items_sum">Change which items appear in the navigation drawer.</string>
-- 
cgit v1.2.3