From c79342523be289a34d0bfd1a143e3c3abf3ecd88 Mon Sep 17 00:00:00 2001
From: nomadics9 <binaskar9@gmail.com>
Date: Sat, 20 Jul 2024 23:12:12 +0300
Subject: [PATCH] refactor: strings & naming standard for icon

---
 .../dev/jdtech/jellyfin/PlayerActivity.kt     |  2 +-
 .../src/main/res/layout/exo_main_controls.xml |  2 +-
 .../jdtech/jellyfin/utils/DownloaderImpl.kt   |  2 +-
 .../{ic_quality.xml => ic_monitor_play.xml}   |  0
 core/src/main/res/values/string_arrays.xml    | 22 +++++++++----------
 core/src/main/res/values/strings.xml          |  9 ++++++++
 .../res/xml/fragment_settings_downloads.xml   |  6 ++---
 7 files changed, 26 insertions(+), 17 deletions(-)
 rename core/src/main/res/drawable/{ic_quality.xml => ic_monitor_play.xml} (100%)

diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index 122bd8bf..a7c51e02 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
@@ -366,7 +366,7 @@ class PlayerActivity : BasePlayerActivity() {
             qualities[1] = "${qualities[1]} (${closestQuality})"
         }
         MaterialAlertDialogBuilder(this)
-            .setTitle("Select Video Quality")
+            .setTitle(CoreR.string.select_quality)
             .setSingleChoiceItems(qualities.toTypedArray(), selectedIndex) { dialog, which ->
                 selectedIndex = which
                 val selectedQualityValue = qualityValues[which]
diff --git a/app/phone/src/main/res/layout/exo_main_controls.xml b/app/phone/src/main/res/layout/exo_main_controls.xml
index b136be35..940f0f97 100644
--- a/app/phone/src/main/res/layout/exo_main_controls.xml
+++ b/app/phone/src/main/res/layout/exo_main_controls.xml
@@ -81,7 +81,7 @@
                 android:background="@drawable/transparent_circle_background"
                 android:contentDescription="Quality"
                 android:padding="16dp"
-                android:src="@drawable/ic_quality"
+                android:src="@drawable/ic_monitor_play"
                 android:layout_gravity="end"
                 app:tint="@android:color/white"
                 />
diff --git a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt b/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt
index 93453796..1586f020 100644
--- a/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt
+++ b/core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt
@@ -86,7 +86,7 @@ class DownloaderImpl(
                     if (intro != null) {
                         database.insertIntro(intro.toIntroDto(item.id))
                     }
-                    if (appPreferences.downloadQuality != "Original") {
+                    if (appPreferences.downloadQuality != VideoQuality.Original.toString()) {
                         downloadEmbeddedMediaStreams(item, source, storageIndex)
                         val transcodingUrl =
                             getTranscodedUrl(item.id, appPreferences.downloadQuality!!)
diff --git a/core/src/main/res/drawable/ic_quality.xml b/core/src/main/res/drawable/ic_monitor_play.xml
similarity index 100%
rename from core/src/main/res/drawable/ic_quality.xml
rename to core/src/main/res/drawable/ic_monitor_play.xml
diff --git a/core/src/main/res/values/string_arrays.xml b/core/src/main/res/values/string_arrays.xml
index b5dd2095..472228cf 100644
--- a/core/src/main/res/values/string_arrays.xml
+++ b/core/src/main/res/values/string_arrays.xml
@@ -26,12 +26,12 @@
         <item>opensles</item>
     </string-array>
     <string-array name="quality_entries">
-        <item>Auto</item>
-        <item>Original</item>
-        <item>1080p - 8Mbps</item>
-        <item>720p - 3Mbps</item>
-        <item>480p - 1.5Mbps</item>
-        <item>360p - 800Kbps</item>
+        <item>@string/quality_auto</item>
+        <item>@string/quality_original</item>
+        <item>@string/quality_1080p</item>
+        <item>@string/quality_720p</item>
+        <item>@string/quality_480p</item>
+        <item>@string/quality_360p</item>
     </string-array>
     <string-array name="quality_values">
         <item>Auto</item>
@@ -42,11 +42,11 @@
         <item>360p</item>
     </string-array>
     <string-array name="download_quality_entries">
-        <item>Original</item>
-        <item>1080p - 8Mbps</item>
-        <item>720p - 3Mbps</item>
-        <item>480p - 1.5Mbps</item>
-        <item>360p - 800Kbps</item>
+        <item>@string/quality_original</item>
+        <item>@string/quality_1080p</item>
+        <item>@string/quality_720p</item>
+        <item>@string/quality_480p</item>
+        <item>@string/quality_360p</item>
     </string-array>
     <string-array name="download_quality_values">
         <item>Original</item>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b00c4f89..7716be38 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -192,4 +192,13 @@
     <string name="unmark_as_played">Unmark as played</string>
     <string name="add_to_favorites">Add to favorites</string>
     <string name="remove_from_favorites">Remove from favorites</string>
+    <string name="quality_default">Default to selected download quality</string>
+    <string name="download_quality">Download Quality</string>
+    <string name="select_quality">Select Video Quality</string>
+    <string name="quality_auto">Auto</string>
+    <string name="quality_original">Original</string>
+    <string name="quality_1080p">1080p - 8Mbps</string>
+    <string name="quality_720p">720p - 3Mbps</string>
+    <string name="quality_480p">480p - 1.5Mbps</string>
+    <string name="quality_360p">360p - 0.8Mbps</string>
 </resources>
diff --git a/core/src/main/res/xml/fragment_settings_downloads.xml b/core/src/main/res/xml/fragment_settings_downloads.xml
index c88d3b81..f0d0aa53 100644
--- a/core/src/main/res/xml/fragment_settings_downloads.xml
+++ b/core/src/main/res/xml/fragment_settings_downloads.xml
@@ -12,13 +12,13 @@
 <!-- TODO: Strings -->
     <ListPreference
         android:key="pref_downloads_quality"
-        android:title="Download Quality"
-        android:defaultValue="Original"
+        android:title="@string/download_quality"
+        android:defaultValue="@string/quality_original"
         android:entries="@array/download_quality_entries"
         android:entryValues="@array/download_quality_values"
         android:summary="%s" />
     <SwitchPreferenceCompat
         android:defaultValue="false"
         app:key="pref_downloads_quality_default"
-        app:summary="Default to picked Download Quality" />
+        app:summary="@string/quality_default" />
 </PreferenceScreen>
\ No newline at end of file