From 2a5e46855c19fa2696cf72e1a5b7badf3e2a588b Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 19 Dec 2020 20:09:42 +0400
Subject: [PATCH] Fixed crash after updating to 2.1.0

---
 .../com/vanced/manager/ui/core/ThemedMaterialButton.kt    | 2 +-
 .../com/vanced/manager/ui/core/ThemedMaterialCheckbox.kt  | 2 +-
 .../vanced/manager/ui/core/ThemedMaterialRadioButton.kt   | 2 +-
 .../manager/ui/core/ThemedOutlinedMaterialButton.kt       | 2 +-
 .../java/com/vanced/manager/ui/core/ThemedSwitchCompat.kt | 2 +-
 .../java/com/vanced/manager/ui/core/ThemedTextView.kt     | 2 +-
 .../vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt | 8 ++++----
 .../com/vanced/manager/ui/fragments/SettingsFragment.kt   | 4 ++--
 app/src/main/java/com/vanced/manager/utils/Extensions.kt  | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialButton.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialButton.kt
index cb42adbb..ffd0227b 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialButton.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialButton.kt
@@ -18,7 +18,7 @@ class ThemedMaterialButton @JvmOverloads constructor(
 ) : MaterialButton(context, attributeSet, defStyleAttr) {
 
     init {
-        setBgColor(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        setBgColor(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 setBgColor(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialCheckbox.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialCheckbox.kt
index 4f419cf5..be062fca 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialCheckbox.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialCheckbox.kt
@@ -15,7 +15,7 @@ class ThemedMaterialCheckbox @JvmOverloads constructor(
     attributeSet: AttributeSet? = null,
 ) : MaterialCheckBox(context, attributeSet, R.attr.checkboxStyle) {
     init {
-        buttonTintList = ColorStateList.valueOf(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        buttonTintList = ColorStateList.valueOf(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 buttonTintList = ColorStateList.valueOf(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialRadioButton.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialRadioButton.kt
index fec702cb..af1667ac 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialRadioButton.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedMaterialRadioButton.kt
@@ -15,7 +15,7 @@ class ThemedMaterialRadioButton @JvmOverloads constructor(
     attributeSet: AttributeSet? = null,
 ) : MaterialRadioButton(context, attributeSet, R.attr.radioButtonStyle) {
     init {
-        buttonTintList = ColorStateList.valueOf(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        buttonTintList = ColorStateList.valueOf(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 buttonTintList = ColorStateList.valueOf(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedOutlinedMaterialButton.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedOutlinedMaterialButton.kt
index 17c346a9..c66fa180 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedOutlinedMaterialButton.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedOutlinedMaterialButton.kt
@@ -17,7 +17,7 @@ class ThemedOutlinedMaterialButton @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : MaterialButton(context, attributeSet, defStyleAttr) {
     init {
-        applyAccent(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        applyAccent(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 applyAccent(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedSwitchCompat.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedSwitchCompat.kt
index 1e15464d..b5a93111 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedSwitchCompat.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedSwitchCompat.kt
@@ -21,7 +21,7 @@ class ThemedSwitchCompat @JvmOverloads constructor(
     private val states = arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked))
 
     init {
-        setSwitchColors(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        setSwitchColors(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 setSwitchColors(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedTextView.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedTextView.kt
index ddc3f287..f28bac5d 100644
--- a/app/src/main/java/com/vanced/manager/ui/core/ThemedTextView.kt
+++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedTextView.kt
@@ -14,7 +14,7 @@ class ThemedTextView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : AppCompatTextView(context, attributeSet, defStyleAttr) {
     init {
-        setTextColor(context.getDefaultPrefs().getInt("manager_accent", defAccentColor))
+        setTextColor(context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor))
         context.lifecycleOwner()?.let { owner ->
             accentColor.observe(owner) { color ->
                 setTextColor(color.toInt())
diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
index 2fd389d7..72c33b4b 100644
--- a/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
+++ b/app/src/main/java/com/vanced/manager/ui/dialogs/ManagerAccentColorDialog.kt
@@ -43,12 +43,12 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
 
     override fun onCancel(dialog: DialogInterface) {
         super.onCancel(dialog)
-        mutableAccentColor.value = prefs.getInt("manager_accent", defAccentColor)
+        mutableAccentColor.value = prefs.getInt("manager_accent_color", defAccentColor)
     }
 
     private fun bindData() {
         with(binding) {
-            val accent = prefs.getInt("manager_accent", defAccentColor)
+            val accent = prefs.getInt("manager_accent_color", defAccentColor)
             hexEdittext.apply {
                 setText(accent.toHex(), TextView.BufferType.EDITABLE)
                 addTextChangedListener(object : TextWatcher {
@@ -95,7 +95,7 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
                 try {
                     val colorFromEditText = Color.parseColor(hexEdittext.text.toString())
                     mutableAccentColor.value = colorFromEditText
-                    prefs.edit { putInt("manager_accent", colorFromEditText) }
+                    prefs.edit { putInt("manager_accent_color", colorFromEditText) }
                 } catch (e: IllegalArgumentException) {
                     Log.d("VMTheme", getString(R.string.failed_accent))
                     Toast.makeText(requireActivity(), getString(R.string.failed_accent), Toast.LENGTH_SHORT).show()
@@ -105,7 +105,7 @@ class ManagerAccentColorDialog : BindingDialogFragment<DialogManagerAccentColorB
                 dismiss()
             }
             accentReset.setOnClickListener {
-                prefs.edit { putInt("manager_accent", defAccentColor) }
+                prefs.edit { putInt("manager_accent_color", defAccentColor) }
                 mutableAccentColor.value = defAccentColor
                 dismiss()
             }
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index f0cda948..2034ea1a 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -104,11 +104,11 @@ class SettingsFragment : BindingFragment<FragmentSettingsBinding>() {
     }
 
     private fun FragmentSettingsBinding.bindManagerAccentColor() {
-        managerAccentColor.setSummary(prefs.getInt("manager_accent", defAccentColor).toHex())
+        managerAccentColor.setSummary(prefs.getInt("manager_accent_color", defAccentColor).toHex())
         managerAccentColor.apply {
             setOnClickListener { showDialog(ManagerAccentColorDialog()) }
             accentColor.observe(viewLifecycleOwner) {
-                managerAccentColor.setSummary(prefs.getInt("manager_accent", defAccentColor).toHex())
+                managerAccentColor.setSummary(prefs.getInt("manager_accent_color", defAccentColor).toHex())
             }
         }
     }
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 a363ee9e..80c68da2 100644
--- a/app/src/main/java/com/vanced/manager/utils/Extensions.kt
+++ b/app/src/main/java/com/vanced/manager/utils/Extensions.kt
@@ -70,14 +70,14 @@ object Extensions {
     //Material team decided to keep their LinearProgressIndicator final
     //At least extension methods exist
     fun LinearProgressIndicator.applyAccent() {
-        with(accentColor.value ?: context.getDefaultPrefs().getInt("manager_accent", defAccentColor)) {
+        with(accentColor.value ?: context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor)) {
             setIndicatorColor(this)
             trackColor = ColorUtils.setAlphaComponent(this, 70)
         }
     }
 
     fun MaterialAlertDialogBuilder.applyAccent() {
-        with(accentColor.value ?: context.getDefaultPrefs().getInt("manager_accent", defAccentColor)) {
+        with(accentColor.value ?: context.getDefaultPrefs().getInt("manager_accent_color", defAccentColor)) {
             show().apply {
                 getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(this@with)
                 getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(this@with)