From dab44b68436601f415edb095da605811e985eb00 Mon Sep 17 00:00:00 2001
From: seeto <65185819+peakvalleytech@users.noreply.github.com>
Date: Sat, 2 Oct 2021 08:13:23 -0700
Subject: Rename folder to tag (#5381)

---
 app/src/main/res/menu/nav_feed_context.xml |  2 +-
 app/src/main/res/xml/feed_settings.xml     | 95 +++++++++++++++---------------
 2 files changed, 48 insertions(+), 49 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/menu/nav_feed_context.xml b/app/src/main/res/menu/nav_feed_context.xml
index e2b990023..ac3b24d0d 100644
--- a/app/src/main/res/menu/nav_feed_context.xml
+++ b/app/src/main/res/menu/nav_feed_context.xml
@@ -7,7 +7,7 @@
         android:title="@string/remove_all_new_flags_label" />
 
     <item
-        android:id="@+id/add_to_folder"
+        android:id="@+id/edit_tags"
         android:menuCategory="container"
         android:title="@string/add_to_folder" />
 
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 457ff6e5b..5b81ddd54 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -1,72 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="feedSettingsScreen">
 
     <SwitchPreferenceCompat
-            android:key="keepUpdated"
-            android:icon="@drawable/ic_refresh"
-            android:title="@string/keep_updated"
-            android:summary="@string/keep_updated_summary"/>
+        android:icon="@drawable/ic_refresh"
+        android:key="keepUpdated"
+        android:summary="@string/keep_updated_summary"
+        android:title="@string/keep_updated" />
 
     <SwitchPreferenceCompat
-            android:key="episodeNotification"
-            android:defaultValue="false"
-            android:dependency="keepUpdated"
-            android:icon="@drawable/ic_notifications"
-            android:title="@string/episode_notification"
-            android:summary="@string/episode_notification_summary"/>
+        android:defaultValue="false"
+        android:dependency="keepUpdated"
+        android:icon="@drawable/ic_notifications"
+        android:key="episodeNotification"
+        android:summary="@string/episode_notification_summary"
+        android:title="@string/episode_notification" />
 
     <Preference
-            android:key="authentication"
-            android:icon="@drawable/ic_key"
-            android:title="@string/authentication_label"
-            android:summary="@string/authentication_descr"/>
+        android:icon="@drawable/ic_key"
+        android:key="authentication"
+        android:summary="@string/authentication_descr"
+        android:title="@string/authentication_label" />
 
     <Preference
-            android:key="tags"
-            android:icon="@drawable/ic_folder"
-            android:title="@string/feed_folders_label"
-            android:summary="@string/feed_folders_summary"/>
+        android:icon="@drawable/ic_tag"
+        android:key="tags"
+        android:summary="@string/feed_tags_summary"
+        android:title="@string/feed_tags_label" />
 
     <ListPreference
-            android:key="feedPlaybackSpeed"
-            android:icon="@drawable/ic_playback_speed"
-            android:title="@string/playback_speed"
-            android:summary="@string/pref_feed_playback_speed_sum"/>
+        android:icon="@drawable/ic_playback_speed"
+        android:key="feedPlaybackSpeed"
+        android:summary="@string/pref_feed_playback_speed_sum"
+        android:title="@string/playback_speed" />
 
     <Preference
-            android:key="feedAutoSkip"
-            android:icon="@drawable/ic_skip_24dp"
-            android:summary="@string/pref_feed_skip_sum"
-            android:title="@string/pref_feed_skip" />
+        android:icon="@drawable/ic_skip_24dp"
+        android:key="feedAutoSkip"
+        android:summary="@string/pref_feed_skip_sum"
+        android:title="@string/pref_feed_skip" />
 
     <ListPreference
-            android:entries="@array/spnAutoDeleteItems"
-            android:entryValues="@array/spnAutoDeleteValues"
-            android:icon="@drawable/ic_delete"
-            android:title="@string/auto_delete_label"
-            android:summary="@string/feed_auto_download_global"
-            android:key="autoDelete"/>
+        android:entries="@array/spnAutoDeleteItems"
+        android:entryValues="@array/spnAutoDeleteValues"
+        android:icon="@drawable/ic_delete"
+        android:key="autoDelete"
+        android:summary="@string/feed_auto_download_global"
+        android:title="@string/auto_delete_label" />
 
     <ListPreference
-            android:entries="@array/spnVolumeReductionItems"
-            android:entryValues="@array/spnVolumeReductionValues"
-            android:icon="@drawable/ic_volume_adaption"
-            android:summary="@string/feed_volume_reduction_summary"
-            android:title="@string/feed_volume_reduction"
-            android:defaultValue="off"
-            android:key="volumeReduction"/>
+        android:defaultValue="off"
+        android:entries="@array/spnVolumeReductionItems"
+        android:entryValues="@array/spnVolumeReductionValues"
+        android:icon="@drawable/ic_volume_adaption"
+        android:key="volumeReduction"
+        android:summary="@string/feed_volume_reduction_summary"
+        android:title="@string/feed_volume_reduction" />
 
     <PreferenceCategory
-            android:title="@string/auto_download_settings_label"
-            android:key="autoDownloadCategory">
+        android:key="autoDownloadCategory"
+        android:title="@string/auto_download_settings_label">
         <SwitchPreferenceCompat
-                android:key="autoDownload"
-                android:title="@string/auto_download_label"/>
+            android:key="autoDownload"
+            android:title="@string/auto_download_label" />
         <Preference
-                android:key="episodeFilter"
-                android:title="@string/episode_filters_label"
-                android:summary="@string/episode_filters_description"/>
+            android:key="episodeFilter"
+            android:summary="@string/episode_filters_description"
+            android:title="@string/episode_filters_label" />
     </PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3