From 66685350cb9d30b31a87339db77371e997f060c0 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sat, 20 Mar 2021 17:22:36 -0600
Subject: [PATCH] Update blacklist strings

Update the strings related to the blacklist functionality, also adding german translations.
---
 .../auxio/database/PlaybackStateDatabase.kt   |  2 +-
 .../auxio/settings/SettingsListFragment.kt    |  2 +-
 .../settings/blacklist/BlacklistDialog.kt     |  4 ++--
 .../main/res/layout/fragment_blacklist.xml    |  2 +-
 app/src/main/res/values-de/strings.xml        | 12 +++++++++++
 app/src/main/res/values/strings.xml           | 20 +++++++++----------
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt b/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
index 21d48b446..c59c1bf1a 100644
--- a/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
@@ -226,8 +226,8 @@ class PlaybackStateDatabase(context: Context) :
     }
 
     companion object {
-        const val DB_VERSION = 3
         const val DB_NAME = "auxio_state_database.db"
+        const val DB_VERSION = 3
 
         const val TABLE_NAME_STATE = "playback_state_table"
         const val TABLE_NAME_QUEUE = "queue_table"
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index c33c9982c..7d208ac77 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -128,7 +128,7 @@ class SettingsListFragment : PreferenceFragmentCompat() {
                 SettingsManager.Keys.KEY_SAVE_STATE -> {
                     onPreferenceClickListener = Preference.OnPreferenceClickListener {
                         playbackModel.savePlaybackState(requireContext()) {
-                            getString(R.string.debug_state_saved).createToast(requireContext())
+                            getString(R.string.label_state_saved).createToast(requireContext())
                         }
                         true
                     }
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
index d874d2759..70a0f6889 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt
@@ -99,7 +99,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
             folderChooser(
                 requireContext(),
                 initialDirectory = File(Environment.getExternalStorageDirectory().absolutePath),
-                emptyTextRes = R.string.error_no_dirs
+                emptyTextRes = R.string.label_no_dirs
             )
 
             // Once again remove the ugly dividers from the dialog, but now with an even
@@ -123,7 +123,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
             // to be excluded, as that would lead to the user being stuck at the "No Music Found"
             // screen.
             if (path == Environment.getExternalStorageDirectory().absolutePath) {
-                getString(R.string.error_folder_would_brick_app).createToast(requireContext())
+                getString(R.string.error_brick_dir).createToast(requireContext())
 
                 return
             }
diff --git a/app/src/main/res/layout/fragment_blacklist.xml b/app/src/main/res/layout/fragment_blacklist.xml
index 3864c614f..991e7ac13 100644
--- a/app/src/main/res/layout/fragment_blacklist.xml
+++ b/app/src/main/res/layout/fragment_blacklist.xml
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter_semibold"
                 android:padding="@dimen/padding_medium"
-                android:text="@string/label_empty_blacklist"
+                android:text="@string/label_no_dirs"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d01a00028..99bb35a97 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,6 +40,12 @@
     <string name="label_go_artist">Zum Künstler gehen</string>
     <string name="label_go_album">Zum Album gehen</string>
 
+    <string name="label_state_saved">Wiedergabezustand abgespeichert</string>
+
+    <string name="label_add">Hinzufügen</string>
+    <string name="label_save">Abspeichern</string>
+    <string name="label_no_dirs">Keine Ordner</string>
+
     <string name="label_about">Über</string>
     <string name="label_version">Version</string>
     <string name="label_code">Auf GitHub ansehen</string>
@@ -86,14 +92,19 @@
     <string name="setting_behavior_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
     <string name="setting_behavior_rewind_prev">Zurückspulen, bevor zurück springen</string>
     <string name="setting_behavior_rewind_prev_desc">Zurückspulen, bevor zum vorheriger Lied springen</string>
+
+    <string name="setting_content">Content</string>
     <string name="setting_content_save">Wiedergabezustand abspeichern</string>
     <string name="setting_content_save_desc">Der aktuell Wiedergabezustand jetzt abspeichern</string>
+    <string name="setting_content_blacklist">Ausgeschlossene Ordner</string>
+    <string name="setting_content_blacklist_desc">Die Inhalte der ausgeschlossene Ordner sind versteckt von deinen Musikbibliothek</string>
 
     <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">Keine Musik gefunden</string>
     <string name="error_load_failed">Laden die Musik fehlgeschlagen</string>
     <string name="error_no_perms">Auxio braucht Berechtigung, zu lesen deine Musikbibliothek</string>
     <string name="error_no_browser">Link könnte nicht geöffnet werden</string>
+    <string name="error_brick_dir">Das Stammverzeichnis kann nicht ausgeschlossen sein</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Durchsuche deine Musikbibliothek…</string>
@@ -157,4 +168,5 @@
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Alben</item>
     </plurals>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4cae33af..e2435e7d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="MissingTranslation">
+<resources>
     <!-- Info namespace | App labels -->
     <string name="info_app_desc">A simple, rational music player for android.</string>
     <string name="info_channel_name">Music Playback</string>
@@ -42,7 +41,11 @@
     <string name="label_go_artist">Go to artist</string>
     <string name="label_go_album">Go to album</string>
 
-    <string name="debug_state_saved">State saved</string>
+    <string name="label_state_saved">State saved</string>
+
+    <string name="label_add">Add</string>
+    <string name="label_save">Save</string>
+    <string name="label_no_dirs">No Folders</string>
 
     <string name="label_about">About</string>
     <string name="label_version">Version</string>
@@ -51,10 +54,6 @@
     <string name="label_licenses">Licenses</string>
     <string name="label_author">Developed by OxygenCobalt</string>
 
-    <string name="label_add">Add</string>
-    <string name="label_save">Save</string>
-    <string name="label_empty_blacklist">No excluded folders</string>
-
     <!-- Settings namespace | Settings-related labels -->
     <string name="setting_title">Settings</string>
 
@@ -96,18 +95,17 @@
     <string name="setting_behavior_rewind_prev_desc">Rewind before skipping to the previous song</string>
 
     <string name="setting_content">Content</string>
-    <string name="setting_content_blacklist">Excluded Folders</string>
-    <string name="setting_content_blacklist_desc">The content of excluded folders is hidden from your library</string>
     <string name="setting_content_save">Save playback state</string>
     <string name="setting_content_save_desc">Save the current playback state now</string>
+    <string name="setting_content_blacklist">Excluded Folders</string>
+    <string name="setting_content_blacklist_desc">The content of excluded folders is hidden from your library</string>
 
     <!-- Error Namespace | Error Labels -->
     <string name="error_no_music">No music found</string>
     <string name="error_load_failed">Music loading failed</string>
     <string name="error_no_perms">Auxio needs permission to read your music library</string>
     <string name="error_no_browser">Could not open link</string>
-    <string name="error_no_dirs">No subfolders</string>
-    <string name="error_folder_would_brick_app">The root folder can\'t be excluded</string>
+    <string name="error_brick_dir">The root folder cannot be excluded</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Search your library…</string>