Removed grid scale gestures and reverted back to * simple list as a default

* disgusting (:
2020-02-11 15:55:45 +01:00 · 2020-02-11 15:55:45 +01:00 · e9fc40d285
commit e9fc40d285
parent 740559e3bc
29 changed files with 36 additions and 222 deletions
--- a/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Config.kt
@ -56,7 +56,7 @@ object Config : PreferenceModel, DBConfig {
        const val SAFETY = "safety_notice"
        const val THEME_ORDINAL = "theme_ordinal"
        const val BOOT_ID = "boot_id"
-        const val LIST_SPAN_COUNT = "list_span_count"
+        const val LIST_SPAN_COUNT = "column_count"

        // system state
        const val MAGISKHIDE = "magiskhide"
@ -147,7 +147,8 @@ object Config : PreferenceModel, DBConfig {
    @JvmStatic
    var coreOnly by preference(Key.COREONLY, false)
    var showSystemApp by preference(Key.SHOW_SYSTEM_APP, false)
-    var listSpanCount by preference(Key.LIST_SPAN_COUNT, 2)
+    @JvmStatic
+    var listSpanCount by preference(Key.LIST_SPAN_COUNT, 1)

    var customChannelUrl by preference(Key.CUSTOM_CHANNEL, "")
    var locale by preference(Key.LOCALE, "")
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
@ -19,7 +19,6 @@ import com.topjohnwu.magisk.ui.ReselectionTarget
 import com.topjohnwu.magisk.ui.base.BaseUIFragment
 import com.topjohnwu.magisk.utils.EndlessRecyclerScrollListener
 import com.topjohnwu.magisk.utils.MotionRevealHelper
-import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel

 class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>(),
@ -66,9 +65,6 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
                if (newState != RecyclerView.SCROLL_STATE_IDLE) hideKeyboard()
            }
        })
-
-        PinchZoomTouchListener.attachTo(binding.moduleFilterInclude.moduleFilterList)
-        PinchZoomTouchListener.attachTo(binding.moduleList)
    }

    override fun onDestroyView() {
@ -76,8 +72,6 @@ class ModuleFragment : BaseUIFragment<ModuleViewModel, FragmentModuleMd2Binding>
            binding.moduleList.removeOnScrollListener(it)
            binding.moduleFilterInclude.moduleFilterList.removeOnScrollListener(it)
        }
-        PinchZoomTouchListener.clear(binding.moduleList)
-        PinchZoomTouchListener.clear(binding.moduleFilterInclude.moduleFilterList)
        super.onDestroyView()
    }

--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@ -1,11 +1,8 @@
 package com.topjohnwu.magisk.ui.settings

-import android.os.Bundle
-import android.view.View
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSettingsMd2Binding
 import com.topjohnwu.magisk.ui.base.BaseUIFragment
-import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel

 class SettingsFragment : BaseUIFragment<SettingsViewModel, FragmentSettingsMd2Binding>() {
@ -19,16 +16,6 @@ class SettingsFragment : BaseUIFragment<SettingsViewModel, FragmentSettingsMd2Bi
        activity.title = resources.getString(R.string.settings)
    }

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        PinchZoomTouchListener.attachTo(binding.settingsList)
-    }
-
-    override fun onDestroyView() {
-        PinchZoomTouchListener.clear(binding.settingsList)
-        super.onDestroyView()
-    }
-
    override fun onResume() {
        super.onResume()
        viewModel.items.forEach { it.refresh() }
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt
@ -126,11 +126,11 @@ object DownloadPath : SettingsItem.Input() {

 object GridSize : SettingsItem.Selector() {
    override var value by bindableValue(Config.listSpanCount - 1) {
-        Config.listSpanCount = max(1, min(3, it + 1))
+        Config.listSpanCount = max(1, min(2, it + 1))
    }

-    override val title = R.string.settings_grid_span_count_title.asTransitive()
-    override val description = R.string.settings_grid_span_count_summary.asTransitive()
+    override val title = R.string.settings_grid_column_count_title.asTransitive()
+    override val description = R.string.settings_grid_column_count_summary.asTransitive()
    override val entries = resources.getStringArray(R.array.span_count)
    override val entryValues = resources.getStringArray(R.array.value_array)
 }
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
@ -1,15 +1,12 @@
 package com.topjohnwu.magisk.ui.superuser

-import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import android.view.View
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.databinding.FragmentSuperuserMd2Binding
 import com.topjohnwu.magisk.model.navigation.Navigation
 import com.topjohnwu.magisk.ui.base.BaseUIFragment
-import com.topjohnwu.magisk.utils.PinchZoomTouchListener
 import org.koin.androidx.viewmodel.ext.android.viewModel

 class SuperuserFragment : BaseUIFragment<SuperuserViewModel, FragmentSuperuserMd2Binding>() {
@ -23,16 +20,6 @@ class SuperuserFragment : BaseUIFragment<SuperuserViewModel, FragmentSuperuserMd
        setHasOptionsMenu(true)
    }

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        PinchZoomTouchListener.attachTo(binding.superuserList)
-    }
-
-    override fun onDestroyView() {
-        PinchZoomTouchListener.clear(binding.superuserList)
-        super.onDestroyView()
-    }
-
    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
        inflater.inflate(R.menu.menu_superuser_md2, menu)
    }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
@ -23,9 +23,7 @@ import androidx.databinding.InverseBindingAdapter
 import androidx.databinding.InverseBindingListener
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.*
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
@ -485,4 +483,12 @@ fun View.setPopupMenu(popupMenu: Int, listener: OnPopupMenuItemClickListener) {
    setOnClickListener {
        (tag as PopupMenu).show()
    }
+}
+
+@BindingAdapter("spanCount")
+fun RecyclerView.setSpanCount(count: Int) {
+    when (val lama = layoutManager) {
+        is GridLayoutManager -> lama.spanCount = count
+        is StaggeredGridLayoutManager -> lama.spanCount = count
+    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt
@ -1,24 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.view.ScaleGestureDetector
-
-abstract class PinchGestureCallback : ScaleGestureDetector.SimpleOnScaleGestureListener() {
-
-    private var startFactor: Float = 1f
-
-    override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean {
-        startFactor = detector?.scaleFactor ?: 1f
-        return super.onScaleBegin(detector)
-    }
-
-    override fun onScaleEnd(detector: ScaleGestureDetector?) {
-        val endFactor = detector?.scaleFactor ?: 1f
-
-        if (endFactor > startFactor) onZoom()
-        else if (endFactor < startFactor) onPinch()
-    }
-
-    abstract fun onPinch()
-    abstract fun onZoom()
-
-}
--- a/app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt
@ -1,66 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.ScaleGestureDetector
-import android.view.View
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import androidx.transition.TransitionManager
-import com.topjohnwu.magisk.core.Config
-import kotlin.math.max
-import kotlin.math.min
-
-class PinchZoomTouchListener private constructor(
-    private val view: RecyclerView,
-    private val max: Int = 3,
-    private val min: Int = 1
-) : View.OnTouchListener {
-
-    private val layoutManager
-        get() = view.layoutManager
-
-    private val pinchListener = object : PinchGestureCallback() {
-        override fun onPinch() = updateSpanCount(Config.listSpanCount + 1)
-        override fun onZoom() = updateSpanCount(Config.listSpanCount - 1)
-    }
-
-    private val gestureDetector by lazy { ScaleGestureDetector(view.context, pinchListener) }
-
-    init {
-        updateSpanCount(Config.listSpanCount, false)
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        gestureDetector.onTouchEvent(event)
-        return false
-    }
-
-    private fun updateSpanCount(count: Int, animate: Boolean = true) {
-        if (animate) {
-            TransitionManager.beginDelayedTransition(view)
-        }
-
-        val boundCount = max(min, min(max, count))
-
-        when (val l = layoutManager) {
-            is StaggeredGridLayoutManager -> l.spanCount = boundCount
-            is GridLayoutManager -> l.spanCount = boundCount
-            else -> Unit
-        }
-
-        Config.listSpanCount = boundCount
-    }
-
-    companion object {
-
-        @SuppressLint("ClickableViewAccessibility")
-        fun attachTo(view: RecyclerView) = view.setOnTouchListener(PinchZoomTouchListener(view))
-
-        fun clear(view: View) = view.setOnTouchListener(null)
-
-    }
-
-}
--- a/app/src/main/res/layout/fragment_module_md2.xml
+++ b/app/src/main/res/layout/fragment_module_md2.xml
@ -25,6 +25,7 @@
            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"
@ -34,7 +35,7 @@
            android:paddingEnd="0dp"
            android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
            app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
-            app:spanCount="2"
+            app:spanCount="1"
            tools:listitem="@layout/item_module_md2" />

        <com.google.android.material.floatingactionbutton.FloatingActionButton
--- a/app/src/main/res/layout/fragment_settings_md2.xml
+++ b/app/src/main/res/layout/fragment_settings_md2.xml
@ -5,6 +5,8 @@

    <data>

+        <import type="com.topjohnwu.magisk.core.Config" />
+
        <variable
            name="viewModel"
            type="com.topjohnwu.magisk.ui.settings.SettingsViewModel" />
@ -17,6 +19,7 @@
        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"
@ -28,7 +31,7 @@
        android:paddingEnd="@dimen/l_50"
        android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l1}"
        app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
-        app:spanCount="2"
+        app:spanCount="1"
        tools:layout_marginTop="24dp"
        tools:listitem="@layout/item_settings_toggle"
        tools:paddingTop="@dimen/l1" />
--- a/app/src/main/res/layout/fragment_superuser_md2.xml
+++ b/app/src/main/res/layout/fragment_superuser_md2.xml
@ -5,6 +5,8 @@

    <data>

+        <import type="com.topjohnwu.magisk.core.Config" />
+
        <variable
            name="viewModel"
            type="com.topjohnwu.magisk.ui.superuser.SuperuserViewModel" />
@ -24,6 +26,7 @@
            itemBinding="@{viewModel.itemBinding}"
            items="@{viewModel.items}"
            nestedScrollingEnabled="@{false}"
+            spanCount="@{Config.listSpanCount}"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
@ -32,7 +35,7 @@
            android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
            android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/l2}"
            app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
-            app:spanCount="2"
+            app:spanCount="1"
            tools:layout_marginTop="24dp"
            tools:listitem="@layout/item_policy_md2"
            tools:paddingTop="@dimen/l1" />
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">Sempre fosc</string>
    <string name="settings_safe_mode_title">Mode segur</string>
    <string name="settings_core_only_summary">Només habilita les funcionalitats bàsiques. MagiskSU i MagiskHide seguiran activats, però cap mòdul es carregarà</string>
-    <string name="settings_grid_span_count_title">Mida de la columna</string>
-    <string name="settings_grid_span_count_summary">Estableix la mida de la columna per totes les llistes de quadrícules elegibles. Pot canviar aquesta configuració fent gestos de pessic.</string>
-    <string name="settings_grid_span_count_1">Una secció per línia (Pantalles petites)</string>
-    <string name="settings_grid_span_count_2">Dos seccions per línia (Recomanat)</string>
-    <string name="settings_grid_span_count_3">Tres seccions per línia (Tauleta/TV)</string>
    <string name="settings_download_path_title">Directori de baixades</string>
    <string name="settings_download_path_message">Els arxius es desaran a %1$s</string>
    <string name="settings_clear_cache_title">Netejar memòria cau del repositori</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -125,11 +125,6 @@
    <string name="settings_dark_mode_dark">Immer dunkel</string>
    <string name="settings_safe_mode_title">Sicherer Modus</string>
    <string name="settings_core_only_summary" deprecated="true">Nur die Kernfunktionen aktivieren. MagiskSU und MagiskHide werden weiterhin aktiviert, aber es werden keine Module geladen</string>
-    <string name="settings_grid_span_count_title">Raster-Spaltengröße</string>
-    <string name="settings_grid_span_count_summary">Legt die Spaltengröße für alle in Frage kommenden Rasterlisten fest. Sie können diese außerhalb der Einstellungen durch eine Pinch-Geste einstellen.</string>
-    <string name="settings_grid_span_count_1">Ein Element pro Zeile (Kleine Bildschirme)</string>
-    <string name="settings_grid_span_count_2">Zwei Elemente pro Zeile (Empfohlen)</string>
-    <string name="settings_grid_span_count_3">Drei Elemente pro Zeile (Tablet/TV)</string>
    <string name="settings_download_path_title">Download-Verzeichnis</string>
    <string name="settings_download_path_message">Dateien werden in %1$s gespeichert</string>
    <string name="settings_clear_cache_title">Repo-Cache leeren</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">Oscuro</string>
    <string name="settings_safe_mode_title">Modo Seguro</string>
    <string name="settings_core_only_summary">Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU y MagiskHide seguirán habilitados</string>
-    <string name="settings_grid_span_count_title">Tamaño de columna</string>
-    <string name="settings_grid_span_count_summary">Establece el tamaño de columna para todas las listas de cuadrículas elegibles. Puede establecer esta configuración externa realizando un gesto de pellizco.</string>
-    <string name="settings_grid_span_count_1">Una sección por línea (Pantallas Pequeñas)</string>
-    <string name="settings_grid_span_count_2">Dos secciones por línea (Recomendado)</string>
-    <string name="settings_grid_span_count_3">Tres secciones por línea (Tablet/TV)</string>
    <string name="settings_download_path_title">Ruta de Descarga</string>
    <string name="settings_download_path_message">Los archivos se guardarán en %1$s</string>
    <string name="settings_clear_cache_title">Limpiar caché del repositorio</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -135,11 +135,6 @@
    <string name="settings_dark_mode_dark">Toujours sombre</string>
    <string name="settings_safe_mode_title">Mode sans échec</string>
    <string name="settings_core_only_summary" deprecated="true">Activer uniquement les fonctionnalités de base. MagiskSU et MagiskHide resteront activés, mais aucun module ne sera chargé.</string>
-    <string name="settings_grid_span_count_title">Taille de la colonne de la grille</string>
-    <string name="settings_grid_span_count_summary">Définit la taille des colonnes pour toutes les listes en grille éligibles. Vous pouvez outrepasser ces paramètres en effectuant un geste de pincement.</string>
-    <string name="settings_grid_span_count_1">un élément par ligne (petits écrans)</string>
-    <string name="settings_grid_span_count_2">deux éléments par ligne (recommandé)</string>
-    <string name="settings_grid_span_count_3">trois éléments par ligne (tablette ou TV)</string>
    <string name="settings_download_path_title">Répertoire de téléchargement</string>
    <string name="settings_download_path_message">Les fichiers seront enregistrés au format %1$s</string>
    <string name="settings_clear_cache_title">Vider le cache des dépôts</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">Scuro</string>
    <string name="settings_safe_mode_title">Modalità sicura</string>
    <string name="settings_core_only_summary" deprecated="true">Abilita solo le funzioni principali. Nessun modulo verrà caricato. MagiskSU e MagiskHide rimarranno abilitati</string>
-    <string name="settings_grid_span_count_title">Dimensione colonne</string>
-    <string name="settings_grid_span_count_summary">Imposta la dimensione delle colonne nelle liste a griglia. Può anche essere modificato eseguendo un pinch to zoom in una lista.</string>
-    <string name="settings_grid_span_count_1">Un elemento per linea (Schermi piccoli)</string>
-    <string name="settings_grid_span_count_2">Due elementi per linea (Raccomandato)</string>
-    <string name="settings_grid_span_count_3">Tre elementi per linea (Tablet/TV)</string>
    <string name="settings_download_path_title">Percorso di download</string>
    <string name="settings_download_path_message">I file verranno salvati in %1$s</string>
    <string name="settings_clear_cache_title">Svuota cache repository</string>
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">მუქი თემა</string>
    <string name="settings_safe_mode_title">უსაფრთხო რეჟიმი</string>
    <string name="settings_core_only_summary" deprecated="true">მხოლოდ მთავარი ფუნქციების ჩართვა. MagiskSU და MagiskHide-ი იმუშავებენ, მაგრამ მოდულები არ ჩაიტვირთება</string>
-    <string name="settings_grid_span_count_title">ბადის სვეტების ზომა</string>
-    <string name="settings_grid_span_count_summary">არეგულირებს სვეტების ზომას. თქვენ შეგიძლიათ ამის შეცვლა პარამეტრების გარეთ, ორი თითის საპირისპირო მიმართულებით გასმით.</string>
-    <string name="settings_grid_span_count_1">თითო ფანჯარა სტრიქონზე (პატარა ეკრანებისთვის)</string>
-    <string name="settings_grid_span_count_2">ორი ფანჯარა სტრიქონზე (რეკომენდირებული)</string>
-    <string name="settings_grid_span_count_3">სამი ფნაჯარა სტრიონზე (Tablet/TV)</string>
    <string name="settings_download_path_title">გადმოწერის ლოკაცია</string>
    <string name="settings_download_path_message">ფაილები შეინახება %1$s-ში</string>
    <string name="settings_clear_cache_title">რეპოზიტორიების ქეშის წაშლა</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -101,12 +101,6 @@

    <string name="settings_safe_mode_title">안전 모드</string>

-    <string name="settings_grid_span_count_title">그리드 열 개수</string>
-    <string name="settings_grid_span_count_summary">가능한 그리드 열 개수를 설정합니다. 설정 메뉴 밖에서도 Pinch 제스처를 통해 변경할 수 있습니다.</string>
-    <string name="settings_grid_span_count_1">한 줄에 하나 (작은 화면)</string>
-    <string name="settings_grid_span_count_2">한 줄에 두 개 (추천)</string>
-    <string name="settings_grid_span_count_3">한 줄에 세 개 (태블릿/TV)</string>
-
    <string name="settings_download_path_title">다운로드 경로</string>
    <string name="settings_download_path_message">파일이 %1$s에 저장됩니다.</string>
    <string name="settings_clear_cache_title">저장소 캐시 비우기</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -146,11 +146,6 @@
    <string name="settings_dark_mode_dark">Zawsze ciemny</string>
    <string name="settings_safe_mode_title">Tryb awaryjny (Safe Mode)</string>
    <string name="settings_core_only_summary" deprecated="true">Włącza tylko podstawowe funkcje. MagiskSU i MagiskHide będą nadal włączone, ale nie zostaną załadowane żadne moduły</string>
-    <string name="settings_grid_span_count_title">Rozmiar kolumn siatki</string>
-    <string name="settings_grid_span_count_summary">Ustawia wielkość kolumny wszystkich pól wyboru. Możesz również zmienić to ustawienie wykonując gest uszczypnięcia.</string>
-    <string name="settings_grid_span_count_1">Jeden element w wierszu (małe ekrany)</string>
-    <string name="settings_grid_span_count_2">Dwa elementy w wierszu (zalecane)</string>
-    <string name="settings_grid_span_count_3">Trzy elementy w wierszu (tablet/telewizor)</string>
    <string name="settings_download_path_title">Ścieżka pobierania</string>
    <string name="settings_download_path_message">Pliki pobrane przez Managera będą zapisywane do %1$s</string>
    <string name="settings_clear_cache_title">Wyczyść pamięć cache repozytorium</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -131,11 +131,11 @@
    <string name="settings_dark_mode_dark">Sempre Escuro</string>
    <string name="settings_safe_mode_title">Modo de segurança</string>
    <string name="settings_core_only_summary" obsoleto="true">Ative apenas os principais recursos. O MagiskSU e o MagiskHide ainda estarão ativados, mas nenhum módulo será carregado</string>
-    <string name="settings_grid_span_count_title">Tamanho da coluna da grade</string>
-    <string name="settings_grid_span_count_summary">Define o tamanho da coluna para todas as listas de grade qualificadas. Você pode definir essas configurações realizando o gesto de pinça com os dedos.</string>
-    <string name="settings_grid_span_count_1">Um item por linha (telas pequenas)</string>    
-    <string name="settings_grid_span_count_2">Dois itens por linha (recomendado)</string>
-    <string name="settings_grid_span_count_3">Três itens por linha (Tablet/TV)</string>
+    <![CDATA[
+        
+
+
+    ]]>
    <string name="settings_download_path_title">Caminho de Download</string>
    <string name="settings_download_path_message">Os arquivos serão salvos em  %1$s</string>
    <string name="settings_clear_cache_title">Limpar cache de repositório</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">Mereu mod întunecat</string>
    <string name="settings_safe_mode_title">Mod sigur</string>
    <string name="settings_core_only_summary" deprecated="true">Activează numai funcțiile de bază. MagiskSU și MagiskHide vor fi în continuare activate, însă niciun modul nu va fi încărcat</string>
-    <string name="settings_grid_span_count_title">Dimensiune pentru coloana grilei</string>
-    <string name="settings_grid_span_count_summary">Setează dimensiunea coloanei pentru toate listele de grile eligibile. Poți seta acest lucru în afara Setărilor executând un gest de apropiere/îndepărtare cu degetele.</string>
-    <string name="settings_grid_span_count_1">Un element per rând (Ecrane mici)</string>
-    <string name="settings_grid_span_count_2">Două elemente per rând (Recomandat)</string>
-    <string name="settings_grid_span_count_3">Trei elemente per rând (Tabletă/TV)</string>
    <string name="settings_download_path_title">Cale de descărcare</string>
    <string name="settings_download_path_message">Fișierele vor fi salvate în %1$s</string>
    <string name="settings_clear_cache_title">Golește cache-ul depozitelor</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -152,11 +152,6 @@
    <string name="settings_dark_mode_dark">Всегда тёмный</string>
    <string name="settings_safe_mode_title">Безопасный режим</string>
    <string name="settings_core_only_summary" deprecated="true">Задействовать только основной функционал (MagiskSU и MagiskHide). Модули не будут активированы</string>
-    <string name="settings_grid_span_count_title">Расположение элементов</string>
-    <string name="settings_grid_span_count_summary">Укажите число столбцов в сетке элементов. Возможно динамическое изменение жестом масштабирования</string>
-    <string name="settings_grid_span_count_1">Один элемент (Небольшие экраны)</string>
-    <string name="settings_grid_span_count_2">Два элемента (Рекомендуется)</string>
-    <string name="settings_grid_span_count_3">Три элемента (Планшеты/TV)</string>
    <string name="settings_download_path_title">Папка для загрузок</string>
    <string name="settings_download_path_message">Файлы будут загружаться в %1$s</string>
    <string name="settings_clear_cache_title">Очистка кэша репозитория</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">Vždy tmavý</string>
    <string name="settings_safe_mode_title">Núdzový režim</string>
    <string name="settings_core_only_summary" deprecated="true">Povolí iba hlavné funkcie. Stále budú povolené MagiskSU a MagiskHide, ale žiadne moduly nebudú zavedené</string>
-    <string name="settings_grid_span_count_title">Veľkosť stĺpca mriežky</string>
-    <string name="settings_grid_span_count_summary">Nastaví veľkosť stĺpca pre všetky vhodné zoznamy mriežky. Tiež to môžete zmeniť pomocou stiahnutia prstami (pinch to zoom).</string>
-    <string name="settings_grid_span_count_1">Jedna položka na riadok (Malé obrazovky)</string>
-    <string name="settings_grid_span_count_2">Dve položky na riadok (Odporúčané)</string>
-    <string name="settings_grid_span_count_3">Tri položky na riadok (Tablet/TV)</string>
    <string name="settings_download_path_title">Cesta na sťahovanie</string>
    <string name="settings_download_path_message">Súbory budú uložené do %1$s</string>
    <string name="settings_clear_cache_title">Vyčistiť cache repo</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -135,11 +135,6 @@
    <string name="settings_dark_mode_dark">Her zaman karanlık</string>
    <string name="settings_safe_mode_title">Güvenli Mod</string>
    <string name="settings_core_only_summary" deprecated="true">Sadece temel özellikleri etkinleştirin, tüm modüller yüklenmez. MagiskSU ve MagiskHide yine de etkinleştirilecektir</string>
-    <string name="settings_grid_span_count_title">Izgara Sütunu Boyutu</string>
-    <string name="settings_grid_span_count_summary">Tüm uygun ızgara listeleri için sütun boyutunu ayarlar. Bu ayarların dışında sıkıştırma hareketi gerçekleştirerek bu ayarları yapabilirsiniz.</string>
-    <string name="settings_grid_span_count_1">Satır başına bir öğe (Küçük Ekranlar)</string>
-    <string name="settings_grid_span_count_2">Satır başına iki öğe (Önerilen)</string>
-    <string name="settings_grid_span_count_3">Satır başına üç öğe (Tablet/TV)</string>
    <string name="settings_download_path_title">İndirme yolu</string>
    <string name="settings_download_path_message">Dosyalar %1$s konumuna kaydedilecek</string>
    <string name="settings_clear_cache_title">Depo Önbelleğini Temizle</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -146,11 +146,6 @@
    <string name="settings_dark_mode_dark">Завжди темний</string>
    <string name="settings_safe_mode_title">Безпечний режим</string>
    <string name="settings_core_only_summary" deprecated="true">Увімкнути тільки можливості ядра. MagiskSU i Magisk Hide залишуться увімкненими, проте ніякі модулі не будуть завантажені</string>
-    <string name="settings_grid_span_count_title">Розмір стовпців</string>
-    <string name="settings_grid_span_count_summary">Встановити розмір стовпців для всіх придатних списків сіткою. Ви можете змінювати це поза налаштуваннями, зробивши жест щипка</string>
-    <string name="settings_grid_span_count_1">Один стовбець (малі екрани)</string>
-    <string name="settings_grid_span_count_2">Два стовбці (рекомендовано)</string>
-    <string name="settings_grid_span_count_3">Три стовбці (планшети/телевізори)</string>
    <string name="settings_download_path_title">Шлях завантаження</string>
    <string name="settings_download_path_message">Файли зберігатимуться в %1$s</string>
    <string name="settings_clear_cache_title">Очистити кеш</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -136,11 +136,6 @@
    <string name="settings_dark_mode_dark">暗色模式</string>
    <string name="settings_safe_mode_title">安全模式</string>
    <string name="settings_core_only_summary" deprecated="true">仅启用核心功能，不加载任何模块。MagiskSU 和 MagiskHide 仍会持续运作</string>
-    <string name="settings_grid_span_count_title">设置网格列数</string>
-    <string name="settings_grid_span_count_summary">设置网格列数以调整显示效果。您可以通过缩放手势直接调整</string>
-    <string name="settings_grid_span_count_1">每行一项（小屏幕）</string>
-    <string name="settings_grid_span_count_2">每行两项（推荐）</string>
-    <string name="settings_grid_span_count_3">每行三项（平板/电视）</string>
    <string name="settings_download_path_title">下载路径</string>
    <string name="settings_download_path_message">文件将保存到 %1$s</string>
    <string name="settings_clear_cache_title">清除仓库缓存</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -135,11 +135,6 @@
    <string name="settings_dark_mode_dark">暗色模式</string>
    <string name="settings_safe_mode_title">安全模式</string>
    <string name="settings_core_only_summary" deprecated="true">保持 MagiskSU 及 MagiskHide 開啟並停止載入模組。</string>
-    <string name="settings_grid_span_count_title">調整網格行數</string>
-    <string name="settings_grid_span_count_summary">透過設定網格行數來調整清單的顯示。您也可以透過縮放的手勢直接進行調整。</string>
-    <string name="settings_grid_span_count_1">一個項目一行（小螢幕）</string>
-    <string name="settings_grid_span_count_2">兩個項目一行（建議）</string>
-    <string name="settings_grid_span_count_3">三個項目一行（平板/電視）</string>
    <string name="settings_download_path_title">下載路徑</string>
    <string name="settings_download_path_message">檔案將被儲存在：%1$s</string>
    <string name="settings_clear_cache_title">清除線上模組庫快取</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@ -87,9 +87,8 @@
    </string-array>

    <string-array name="span_count">
-        <item>@string/settings_grid_span_count_1</item>
-        <item>@string/settings_grid_span_count_2</item>
-        <item>@string/settings_grid_span_count_3</item>
+        <item>@string/settings_grid_column_count_1</item>
+        <item>@string/settings_grid_column_count_2</item>
    </string-array>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -143,11 +143,10 @@
    <string name="settings_dark_mode_dark">Always Dark</string>
    <string name="settings_safe_mode_title">Safe Mode</string>
    <string name="settings_core_only_summary" deprecated="true">Enable only core features. MagiskSU and MagiskHide will still be enabled, but no modules will be loaded</string>
-    <string name="settings_grid_span_count_title">Grid Column Size</string>
-    <string name="settings_grid_span_count_summary">Sets column size for all eligible grid lists. You can set this outside settings by performing pinch gesture.</string>
-    <string name="settings_grid_span_count_1">One item per line (Small Screens)</string>
-    <string name="settings_grid_span_count_2">Two items per line (Recommended)</string>
-    <string name="settings_grid_span_count_3">Three item per line (Tablet/TV)</string>
+    <string name="settings_grid_column_count_title">List arrangement</string>
+    <string name="settings_grid_column_count_summary">Sets item width in a list. Restart app to apply changes.</string>
+    <string name="settings_grid_column_count_1">Standard</string>
+    <string name="settings_grid_column_count_2">Squished</string>
    <string name="settings_download_path_title">Download path</string>
    <string name="settings_download_path_message">Files will be saved to %1$s</string>
    <string name="settings_clear_cache_title">Clear Repo Cache</string>