From 0f7caa66fb17069d0b331189122b5bbded63320f Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 4 Jul 2020 03:28:10 -0700
Subject: [PATCH] Remove usage of grid layouts

---
 .../main/java/com/topjohnwu/magisk/core/Config.kt   | 12 ++----------
 .../magisk/model/events/dialog/DarkThemeDialog.kt   |  2 +-
 .../com/topjohnwu/magisk/ui/base/BaseUIActivity.kt  |  2 +-
 .../topjohnwu/magisk/ui/settings/SettingsItems.kt   | 13 -------------
 .../magisk/ui/settings/SettingsViewModel.kt         |  2 +-
 app/src/main/res/layout/fragment_module_md2.xml     |  1 -
 app/src/main/res/layout/fragment_settings_md2.xml   |  3 +--
 app/src/main/res/layout/include_module_filter.xml   |  3 +--
 8 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Config.kt b/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
index 32378f3e6..a847e665f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
@@ -47,16 +47,13 @@ object Config : PreferenceModel, DBConfig {
         const val UPDATE_CHANNEL = "update_channel"
         const val CUSTOM_CHANNEL = "custom_channel"
         const val LOCALE = "locale"
-        const val DARK_THEME = "dark_theme"
-        const val DARK_THEME_EXTENDED = "dark_theme_extended"
+        const val DARK_THEME = "dark_theme_extended"
         const val REPO_ORDER = "repo_order"
         const val SHOW_SYSTEM_APP = "show_system"
         const val DOWNLOAD_PATH = "download_path"
-        const val REDESIGN = "redesign"
         const val SAFETY = "safety_notice"
         const val THEME_ORDINAL = "theme_ordinal"
         const val BOOT_ID = "boot_id"
-        const val LIST_SPAN_COUNT = "column_count"
 
         // system state
         const val MAGISKHIDE = "magiskhide"
@@ -120,17 +117,12 @@ object Config : PreferenceModel, DBConfig {
     var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
 
     var safetyNotice by preference(Key.SAFETY, true)
-    var darkThemeExtended by preference(
-        Key.DARK_THEME_EXTENDED,
-        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-    )
+    var darkTheme by preference(Key.DARK_THEME, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
     var themeOrdinal by preference(Key.THEME_ORDINAL, Theme.Piplup.ordinal)
     var suReAuth by preference(Key.SU_REAUTH, false)
     var checkUpdate by preference(Key.CHECK_UPDATES, true)
     var magiskHide by preference(Key.MAGISKHIDE, true)
     var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
-    @JvmStatic
-    var listSpanCount by preference(Key.LIST_SPAN_COUNT, 1)
 
     var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
     var locale by preference(Key.LOCALE, "")
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt
index 4244fdac2..4d864faea 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/dialog/DarkThemeDialog.kt
@@ -42,7 +42,7 @@ class DarkThemeDialog : DialogEvent(), ActivityExecutor {
     }
 
     private fun selectTheme(mode: Int) {
-        Config.darkThemeExtended = mode
+        Config.darkTheme = mode
         activity?.get()?.recreate()
     }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
index ae357e48c..c11267f8d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/BaseUIActivity.kt
@@ -47,7 +47,7 @@ abstract class BaseUIActivity<ViewModel : BaseViewModel, Binding : ViewDataBindi
     open val snackbarView get() = binding.root
 
     init {
-        val theme = Config.darkThemeExtended
+        val theme = Config.darkTheme
         AppCompatDelegate.setDefaultNightMode(theme)
     }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
index 43536debe..2c17172b4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
@@ -21,8 +21,6 @@ import com.topjohnwu.magisk.model.entity.recycler.SettingsItem
 import com.topjohnwu.magisk.utils.asTransitive
 import com.topjohnwu.superuser.Shell
 import java.io.File
-import kotlin.math.max
-import kotlin.math.min
 
 // --- Customization
 
@@ -123,17 +121,6 @@ object DownloadPath : SettingsItem.Input() {
         .inflate(LayoutInflater.from(context)).also { it.data = this }.root
 }
 
-object GridSize : SettingsItem.Selector() {
-    override var value by bindableValue(Config.listSpanCount - 1) {
-        Config.listSpanCount = max(1, min(2, it + 1))
-    }
-
-    override val title = R.string.settings_grid_column_count_title.asTransitive()
-    override val description = R.string.settings_grid_column_count_summary.asTransitive()
-    override val entryRes = R.array.span_count
-    override val entryValRes = R.array.value_array
-}
-
 object UpdateChannel : SettingsItem.Selector() {
     override var value by bindableValue(Config.updateChannel) { Config.updateChannel = it }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
index 6b2f0ec4f..77f14b062 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
@@ -40,7 +40,7 @@ class SettingsViewModel(
         // Customization
         val list = mutableListOf(
             Customization,
-            Theme, Language, GridSize
+            Theme, Language
         )
         if (Build.VERSION.SDK_INT < 21) {
             // Pre 5.0 does not support getting colors from attributes,
diff --git a/app/src/main/res/layout/fragment_module_md2.xml b/app/src/main/res/layout/fragment_module_md2.xml
index bc76c7837..fd1cf753b 100644
--- a/app/src/main/res/layout/fragment_module_md2.xml
+++ b/app/src/main/res/layout/fragment_module_md2.xml
@@ -36,7 +36,6 @@
             gone="@{viewModel.loading &amp;&amp; viewModel.items.empty}"
             itemBinding="@{viewModel.itemBinding}"
             items="@{viewModel.items}"
-            spanCount="@{Config.listSpanCount}"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
diff --git a/app/src/main/res/layout/fragment_settings_md2.xml b/app/src/main/res/layout/fragment_settings_md2.xml
index 8ea12a644..eed6f4beb 100644
--- a/app/src/main/res/layout/fragment_settings_md2.xml
+++ b/app/src/main/res/layout/fragment_settings_md2.xml
@@ -19,7 +19,6 @@
         dividerVertical="@{@drawable/divider_l_50}"
         itemBinding="@{viewModel.itemBinding}"
         items="@{viewModel.items}"
-        spanCount="@{Config.listSpanCount}"
         android:id="@+id/settings_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -30,7 +29,7 @@
         android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size}"
         android:paddingEnd="@dimen/l_50"
         android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l1}"
-        app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:spanCount="1"
         tools:layout_marginTop="24dp"
         tools:listitem="@layout/item_settings_toggle"
diff --git a/app/src/main/res/layout/include_module_filter.xml b/app/src/main/res/layout/include_module_filter.xml
index 5b9233f4c..f7d1da826 100644
--- a/app/src/main/res/layout/include_module_filter.xml
+++ b/app/src/main/res/layout/include_module_filter.xml
@@ -28,7 +28,6 @@
             dividerVertical="@{@drawable/divider_l1}"
             itemBinding="@{viewModel.itemSearchBinding}"
             items="@{viewModel.itemsSearch}"
-            spanCount="@{Config.listSpanCount}"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/l1"
@@ -41,7 +40,7 @@
             app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
             app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
             app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
-            app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@+id/module_filter_title_search"
             app:layout_constraintTop_toTopOf="parent"