fixed some strings not being translated
This commit is contained in:
parent
7e63ef1a6a
commit
89611742ed
|
@ -12,6 +12,7 @@ import com.vanced.manager.core.ui.ext.showDialog
|
||||||
import com.vanced.manager.databinding.DialogBottomRadioButtonBinding
|
import com.vanced.manager.databinding.DialogBottomRadioButtonBinding
|
||||||
import com.vanced.manager.ui.core.ThemedMaterialRadioButton
|
import com.vanced.manager.ui.core.ThemedMaterialRadioButton
|
||||||
import com.vanced.manager.utils.defPrefs
|
import com.vanced.manager.utils.defPrefs
|
||||||
|
import com.vanced.manager.utils.formatVersion
|
||||||
import com.vanced.manager.utils.getCheckedButtonTag
|
import com.vanced.manager.utils.getCheckedButtonTag
|
||||||
|
|
||||||
class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRadioButtonBinding>() {
|
class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRadioButtonBinding>() {
|
||||||
|
@ -75,7 +76,7 @@ class AppVersionSelectorDialog : BindingBottomSheetDialogFragment<DialogBottomRa
|
||||||
private fun loadBoxes() =
|
private fun loadBoxes() =
|
||||||
arguments?.getStringArrayList(TAG_VERSIONS)?.map { version ->
|
arguments?.getStringArrayList(TAG_VERSIONS)?.map { version ->
|
||||||
ThemedMaterialRadioButton(requireActivity()).apply {
|
ThemedMaterialRadioButton(requireActivity()).apply {
|
||||||
text = version
|
text = version.formatVersion(requireActivity())
|
||||||
tag = version
|
tag = version
|
||||||
textSize = 18f
|
textSize = 18f
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ class MusicPreferencesDialog : BindingBottomSheetDialogFragment<DialogMusicPrefe
|
||||||
with(binding) {
|
with(binding) {
|
||||||
val musicVersionsConv = musicVersions.value?.value?.convertToAppVersions()
|
val musicVersionsConv = musicVersions.value?.value?.convertToAppVersions()
|
||||||
musicInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.music))
|
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 {
|
openVersionSelector.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
showDialog(
|
showDialog(
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.vanced.manager.ui.dialogs
|
package com.vanced.manager.ui.dialogs
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
@ -45,7 +46,7 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment<DialogVancedPre
|
||||||
val vancedVersionsConv = vancedVersions.value?.value?.convertToAppVersions()
|
val vancedVersionsConv = vancedVersions.value?.value?.convertToAppVersions()
|
||||||
vancedInstallTitle.text = getString(R.string.app_installation_preferences, getString(R.string.vanced))
|
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()))
|
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)
|
vancedLang.text = getString(R.string.chosen_lang, showLang)
|
||||||
openThemeSelector.setOnClickListener {
|
openThemeSelector.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
|
|
|
@ -32,8 +32,12 @@ fun DialogFragment.show(activity: FragmentActivity) {
|
||||||
|
|
||||||
fun List<String>.convertToAppVersions(): List<String> = listOf("latest") + reversed()
|
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 {
|
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
|
fun String.getLatestAppVersion(versions: List<String>): String = if (this == "latest") versions.reversed()[0] else this
|
||||||
|
|
|
@ -90,8 +90,11 @@
|
||||||
|
|
||||||
<!-- Install Page -->
|
<!-- Install Page -->
|
||||||
<string name="choose_preferred_language">Choose your preferred language(s) for Vanced</string>
|
<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="light_plus_other">Light + %1$s</string>
|
||||||
<string name="select_at_least_one_lang">Select at least one language!</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 -->
|
<!-- About Page -->
|
||||||
<string name="manager_dev">Manager Devs</string>
|
<string name="manager_dev">Manager Devs</string>
|
||||||
|
|
Loading…
Reference in New Issue