From 89611742ed62881e7cc632a08aee270c3cefcc59 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Mon, 1 Feb 2021 19:54:03 +0400
Subject: [PATCH] fixed some strings not being translated

---
 .../vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt   | 3 ++-
 .../com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt | 2 +-
 .../vanced/manager/ui/dialogs/VancedPreferencesDialog.kt    | 3 ++-
 app/src/main/java/com/vanced/manager/utils/Extensions.kt    | 6 +++++-
 app/src/main/res/values/strings.xml                         | 3 +++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
index 90dc1b45..11f64c4f 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/AppVersionSelectorDialog.kt
@@ -12,6 +12,7 @@ import com.vanced.manager.core.ui.ext.showDialog
 import com.vanced.manager.databinding.DialogBottomRadioButtonBinding
 import com.vanced.manager.ui.core.ThemedMaterialRadioButton
 import com.vanced.manager.utils.defPrefs
+import com.vanced.manager.utils.formatVersion
 import com.vanced.manager.utils.getCheckedButtonTag
 
 class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRadioButtonBinding>() {
@@ -75,7 +76,7 @@ class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRa
     private fun loadBoxes() =
         arguments?.getStringArrayList(TAG_VERSIONS)?.map { version ->
             ThemedMaterialRadioButton(requireActivity()).apply {
-                text = version
+                text = version.formatVersion(requireActivity())
                 tag = version
                 textSize = 18f
             }
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
index 8771c3b5..981c58c4 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/MusicPreferencesDialog.kt
@@ -36,7 +36,7 @@ class MusicPreferencesDialog : BindingBottomSheetDialogFragment<DialogMusicPrefe
         with(binding) {
             val musicVersionsConv = musicVersions.value?.value?.convertToAppVersions()
             musicInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.music))
-            musicVersion.text = getString(R.string.chosen_version, prefs.getString("music_version", "latest"))
+            musicVersion.text = getString(R.string.chosen_version, prefs.getString("music_version", "latest")?.formatVersion(requireActivity()))
             openVersionSelector.setOnClickListener {
                 dismiss()
                 showDialog(
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
index 3c53c3c1..30404ede 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt
@@ -1,5 +1,6 @@
 package com.vanced.manager.ui.dialogs
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -45,7 +46,7 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment<DialogVancedPre
             val vancedVersionsConv = vancedVersions.value?.value?.convertToAppVersions()
             vancedInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.vanced))
             vancedTheme.text = getString(R.string.chosen_theme, installPrefs.getString("theme", "dark")?.convertToAppTheme(requireActivity()))
-            vancedVersion.text = getString(R.string.chosen_version, defPrefs.getString("vanced_version", "latest"))
+            vancedVersion.text = getString(R.string.chosen_version, defPrefs.getString("vanced_version", "latest")?.formatVersion(requireActivity()))
             vancedLang.text = getString(R.string.chosen_lang, showLang)
             openThemeSelector.setOnClickListener {
                 dismiss()
diff --git a/app/src/main/java/com/vanced/manager/utils/Extensions.kt b/app/src/main/java/com/vanced/manager/utils/Extensions.kt
index f3dbafc4..d2a230b7 100644
--- a/app/src/main/java/com/vanced/manager/utils/Extensions.kt
+++ b/app/src/main/java/com/vanced/manager/utils/Extensions.kt
@@ -32,8 +32,12 @@ fun DialogFragment.show(activity: FragmentActivity) {
 
 fun List<String>.convertToAppVersions(): List<String> = listOf("latest") + reversed()
 
+fun String.formatVersion(context: Context): String = if (this == "latest") context.getString(R.string.install_latest) else this
+
 fun String.convertToAppTheme(context: Context): String {
-    return context.getString(R.string.light_plus_other, this.capitalize(Locale.ROOT))
+    return with(context) {
+        getString(R.string.light_plus_other, if (this@convertToAppTheme == "dark") getString(R.string.vanced_dark) else getString(R.string.vanced_black))
+    }
 }
 
 fun String.getLatestAppVersion(versions: List<String>): String = if (this == "latest") versions.reversed()[0] else this
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 30ba3bff..6258a325 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,8 +90,11 @@
 
     <!-- Install Page -->
     <string name="choose_preferred_language">Choose your preferred language(s) for Vanced</string>
+    <string name="install_latest">Latest</string>
     <string name="light_plus_other">Light + %1$s</string>
     <string name="select_at_least_one_lang">Select at least one language!</string>
+    <string name="vanced_black">Black</string>
+    <string name="vanced_dark">Dark</string>
 
     <!-- About Page -->
     <string name="manager_dev">Manager Devs</string>