From ad452de1ae3d5bfae81cbbcca918ae34ebc3b64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C3=87erri?=
 <64997243+deniscerri@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:03:01 +0100
Subject: [PATCH] fixed language switching api smaller than 33

---
 app/build.gradle                                          | 2 +-
 app/src/main/AndroidManifest.xml                          | 8 ++++++++
 .../deniscerri/ytdlnis/ui/settings/SettingsFragment.kt    | 4 ++--
 app/src/main/res/layout/history_sort_sheet.xml            | 6 ++++++
 app/src/main/res/values/strings.xml                       | 2 +-
 app/src/main/res/values/styles.xml                        | 4 +++-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2eec33c0..61ed0475 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -120,7 +120,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appCompatVer"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.core:core:1.9.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6979ba3..5cb71889 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -97,6 +97,14 @@
 <!--            android:exported="false" />-->
         <receiver android:name=".receiver.CancelDownloadNotificationReceiver" />
 
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.deniscerri.ytdl.fileprovider"
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/settings/SettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/settings/SettingsFragment.kt
index a2627dde..9c0b0ebc 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/settings/SettingsFragment.kt
@@ -132,14 +132,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val preferences =
             requireContext().getSharedPreferences("root_preferences", Activity.MODE_PRIVATE)
         val editor = preferences.edit()
-        language!!.summary = Locale(preferences.getString("app_language", "")!!).getDisplayLanguage(Locale(preferences.getString("app_language", "")!!))
+        if(language!!.value == null) language!!.value = Locale.getDefault().language
+        language!!.summary = Locale(language!!.value).getDisplayLanguage(Locale(language!!.value))
         language!!.onPreferenceChangeListener =
             Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any ->
                 editor.putString("app_language", newValue.toString())
                 language!!.summary = Locale(newValue.toString()).getDisplayLanguage(Locale(newValue.toString()))
                 editor.apply()
                 AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(newValue.toString()))
-                (requireActivity() as SettingsActivity).setLocale(newValue.toString())
                 true
             }
 
diff --git a/app/src/main/res/layout/history_sort_sheet.xml b/app/src/main/res/layout/history_sort_sheet.xml
index 39b1e2c4..1ee44fb3 100644
--- a/app/src/main/res/layout/history_sort_sheet.xml
+++ b/app/src/main/res/layout/history_sort_sheet.xml
@@ -15,6 +15,12 @@
         android:layout_marginVertical="10dp"
         android:orientation="vertical">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:text="@string/sort_by"
+            android:paddingBottom="20dp"
+            android:layout_height="wrap_content"/>
+
         <LinearLayout
             android:id="@+id/date"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce2d061c..33af0c4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,7 +164,7 @@
     <string name="logs">Logs</string>
     <string name="commands">Commands</string>
     <string name="date_added">Date added</string>
-    <string name="update_ytdl_nightly">Download Nightly Version of yt-dlp</string>
+    <string name="update_ytdl_nightly">Nightly Version of yt-dlp</string>
     <string name="adjust_audio">Adjust Audio</string>
     <string name="file_name_template">Filename Template</string>
     <string name="language">Language</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6e88a960..88768f6d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,8 +5,11 @@
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:color">@android:color/transparent</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
+        <item name="dialogCornerRadius">28dp</item>
     </style>
 
+
     <style name="AppTheme" parent="AppDefaultTheme" />
 
     <style name="Toolbar" parent="Theme.Material3.DayNight.NoActionBar">
@@ -45,5 +48,4 @@
         <item name="android:layout_marginEnd">5dp</item>
         <item name="android:layout_marginStart">5dp</item>
     </style>
-
 </resources>