From 0f823c1ed126ab5e4232a6b0ded8adaf1e15dacf Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Tue, 23 Jun 2020 19:18:17 +0400
Subject: [PATCH] fixed variant selector

---
 .../com/vanced/manager/core/fragments/Home.kt |  9 +++++++
 .../manager/ui/fragments/SettingsFragment.kt  | 24 -------------------
 app/src/main/res/layout/fragment_home.xml     |  6 ++---
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
index 5cc4bf12..00887394 100644
--- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
+++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
@@ -31,6 +31,15 @@ open class Home : BaseFragment(), View.OnClickListener, AdapterView.OnItemSelect
         val vanceduninstallbtn = view.findViewById<ImageView>(R.id.vanced_uninstallbtn)
         val spinner: Spinner = view.findViewById(R.id.home_variant_selector)
 
+        activity?.let {
+            ArrayAdapter.createFromResource(it,
+                R.array.vanced_variant,
+                android.R.layout.simple_spinner_item).also { arrayAdapter ->
+                arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                spinner.adapter = arrayAdapter
+            }
+        }
+
         vancedinstallbtn.setOnClickListener(this)
         microginstallbtn.setOnClickListener(this)
         signaturebtn.setOnClickListener(this)
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 1e0d519c..e3cb3f13 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
@@ -42,25 +42,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
             true
         }
 
-        /*
-        val installMode: DropDownPreference? = findPreference("vanced_variant")
-        installMode?.summary = preferenceScreen.sharedPreferences.getString("vanced_variant",
-            "nonroot"
-        )?.capitalize(Locale.ROOT)
-        installMode?.setOnPreferenceChangeListener{ _, _ ->
-            when (installMode.value) {
-                "nonroot" -> {
-                    if (!Shell.rootAccess()) {
-                        installMode.value = "nonroot"
-                    }
-                }
-            }
-            restartMain()
-            true
-        }
-
-         */
-
         val chosenPrefs: Preference? = findPreference("vanced_chosen_modes")
         chosenPrefs?.setOnPreferenceClickListener {
             val fm = childFragmentManager.beginTransaction()
@@ -76,9 +57,4 @@ class SettingsFragment : PreferenceFragmentCompat() {
         super .onCreateOptionsMenu(menu, inflater)
     }
 
-    private fun restartMain() {
-        startActivity(Intent(activity, MainActivity::class.java))
-        activity?.finish()
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index fc6c5c2b..72d06733 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:bind="http://schemas.android.com/apk/res-auto">
 
@@ -42,8 +43,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/stdp"
                 android:layout_marginTop="@dimen/eightdp"
-                android:layout_marginEnd="@dimen/stdp"
-                android:entries="@array/vanced_variant" />
+                android:layout_marginEnd="@dimen/stdp" />
 
             <include
                 layout="@layout/include_vanced"