From e9fc40d28577f2d0b7bde6be3f33f8ebb550dede Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Tue, 11 Feb 2020 15:55:45 +0100 Subject: [PATCH] Removed grid scale gestures and reverted back to * simple list as a default * disgusting (: --- .../java/com/topjohnwu/magisk/core/Config.kt | 5 +- .../magisk/ui/module/ModuleFragment.kt | 6 -- .../magisk/ui/settings/SettingsFragment.kt | 13 ---- .../magisk/ui/settings/SettingsItems.kt | 6 +- .../magisk/ui/superuser/SuperuserFragment.kt | 13 ---- .../magisk/utils/DataBindingAdapters.kt | 12 +++- .../magisk/utils/PinchGestureCallback.kt | 24 ------- .../magisk/utils/PinchZoomTouchListener.kt | 66 ------------------- .../main/res/layout/fragment_module_md2.xml | 3 +- .../main/res/layout/fragment_settings_md2.xml | 5 +- .../res/layout/fragment_superuser_md2.xml | 5 +- app/src/main/res/values-ca/strings.xml | 5 -- app/src/main/res/values-de/strings.xml | 5 -- app/src/main/res/values-es/strings.xml | 5 -- app/src/main/res/values-fr/strings.xml | 5 -- app/src/main/res/values-it/strings.xml | 5 -- app/src/main/res/values-ka/strings.xml | 5 -- app/src/main/res/values-ko/strings.xml | 6 -- app/src/main/res/values-pl/strings.xml | 5 -- app/src/main/res/values-pt-rBR/strings.xml | 10 +-- app/src/main/res/values-ro/strings.xml | 5 -- app/src/main/res/values-ru/strings.xml | 5 -- app/src/main/res/values-sk/strings.xml | 5 -- app/src/main/res/values-tr/strings.xml | 5 -- app/src/main/res/values-uk/strings.xml | 5 -- app/src/main/res/values-zh-rCN/strings.xml | 5 -- app/src/main/res/values-zh-rTW/strings.xml | 5 -- app/src/main/res/values/arrays.xml | 5 +- app/src/main/res/values/strings.xml | 9 ++- 29 files changed, 36 insertions(+), 222 deletions(-) delete mode 100644 app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt delete mode 100644 app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt 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 376b0d4e1..2d1db941d 100644 --- 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, "") diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt index 13cfa35d0..578285343 100644 --- 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(), @@ -66,9 +65,6 @@ class ModuleFragment : BaseUIFragment 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 binding.moduleList.removeOnScrollListener(it) binding.moduleFilterInclude.moduleFilterList.removeOnScrollListener(it) } - PinchZoomTouchListener.clear(binding.moduleList) - PinchZoomTouchListener.clear(binding.moduleFilterInclude.moduleFilterList) super.onDestroyView() } diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt index a77395253..4deb8b703 100644 --- 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() { @@ -19,16 +16,6 @@ class SettingsFragment : BaseUIFragment() { @@ -23,16 +20,6 @@ class SuperuserFragment : BaseUIFragment lama.spanCount = count + is StaggeredGridLayoutManager -> lama.spanCount = count + } } \ No newline at end of file diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt b/app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt deleted file mode 100644 index f977546a3..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/utils/PinchGestureCallback.kt +++ /dev/null @@ -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() - -} \ No newline at end of file diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt b/app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt deleted file mode 100644 index 678be9096..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/utils/PinchZoomTouchListener.kt +++ /dev/null @@ -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) - - } - -} diff --git a/app/src/main/res/layout/fragment_module_md2.xml b/app/src/main/res/layout/fragment_module_md2.xml index f1bf1c084..50699338f 100644 --- 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 && 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" /> + + @@ -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" /> diff --git a/app/src/main/res/layout/fragment_superuser_md2.xml b/app/src/main/res/layout/fragment_superuser_md2.xml index c70277d3e..9567a0e23 100644 --- a/app/src/main/res/layout/fragment_superuser_md2.xml +++ b/app/src/main/res/layout/fragment_superuser_md2.xml @@ -5,6 +5,8 @@ + + @@ -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" /> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 3a83a41d7..122d2877b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -136,11 +136,6 @@ Sempre fosc Mode segur Només habilita les funcionalitats bàsiques. MagiskSU i MagiskHide seguiran activats, però cap mòdul es carregarà - Mida de la columna - Estableix la mida de la columna per totes les llistes de quadrícules elegibles. Pot canviar aquesta configuració fent gestos de pessic. - Una secció per línia (Pantalles petites) - Dos seccions per línia (Recomanat) - Tres seccions per línia (Tauleta/TV) Directori de baixades Els arxius es desaran a %1$s Netejar memòria cau del repositori diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d91fa31c2..63c52a693 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -125,11 +125,6 @@ Immer dunkel Sicherer Modus Nur die Kernfunktionen aktivieren. MagiskSU und MagiskHide werden weiterhin aktiviert, aber es werden keine Module geladen - Raster-Spaltengröße - 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. - Ein Element pro Zeile (Kleine Bildschirme) - Zwei Elemente pro Zeile (Empfohlen) - Drei Elemente pro Zeile (Tablet/TV) Download-Verzeichnis Dateien werden in %1$s gespeichert Repo-Cache leeren diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 54d9663ab..eed045758 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -136,11 +136,6 @@ Oscuro Modo Seguro Habilitar sólo funciones principales, no se cargarán todos los módulos. MagiskSU y MagiskHide seguirán habilitados - Tamaño de columna - 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. - Una sección por línea (Pantallas Pequeñas) - Dos secciones por línea (Recomendado) - Tres secciones por línea (Tablet/TV) Ruta de Descarga Los archivos se guardarán en %1$s Limpiar caché del repositorio diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f9ce1ee86..1d8c032a7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -135,11 +135,6 @@ Toujours sombre Mode sans échec Activer uniquement les fonctionnalités de base. MagiskSU et MagiskHide resteront activés, mais aucun module ne sera chargé. - Taille de la colonne de la grille - 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. - un élément par ligne (petits écrans) - deux éléments par ligne (recommandé) - trois éléments par ligne (tablette ou TV) Répertoire de téléchargement Les fichiers seront enregistrés au format %1$s Vider le cache des dépôts diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2260c58ab..06f411fe9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -136,11 +136,6 @@ Scuro Modalità sicura Abilita solo le funzioni principali. Nessun modulo verrà caricato. MagiskSU e MagiskHide rimarranno abilitati - Dimensione colonne - Imposta la dimensione delle colonne nelle liste a griglia. Può anche essere modificato eseguendo un pinch to zoom in una lista. - Un elemento per linea (Schermi piccoli) - Due elementi per linea (Raccomandato) - Tre elementi per linea (Tablet/TV) Percorso di download I file verranno salvati in %1$s Svuota cache repository diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index 925fe4788..2133b7b5b 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -136,11 +136,6 @@ მუქი თემა უსაფრთხო რეჟიმი მხოლოდ მთავარი ფუნქციების ჩართვა. MagiskSU და MagiskHide-ი იმუშავებენ, მაგრამ მოდულები არ ჩაიტვირთება - ბადის სვეტების ზომა - არეგულირებს სვეტების ზომას. თქვენ შეგიძლიათ ამის შეცვლა პარამეტრების გარეთ, ორი თითის საპირისპირო მიმართულებით გასმით. - თითო ფანჯარა სტრიქონზე (პატარა ეკრანებისთვის) - ორი ფანჯარა სტრიქონზე (რეკომენდირებული) - სამი ფნაჯარა სტრიონზე (Tablet/TV) გადმოწერის ლოკაცია ფაილები შეინახება %1$s-ში რეპოზიტორიების ქეშის წაშლა diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7398976d6..f4819bb85 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -101,12 +101,6 @@ 안전 모드 - 그리드 열 개수 - 가능한 그리드 열 개수를 설정합니다. 설정 메뉴 밖에서도 Pinch 제스처를 통해 변경할 수 있습니다. - 한 줄에 하나 (작은 화면) - 한 줄에 두 개 (추천) - 한 줄에 세 개 (태블릿/TV) - 다운로드 경로 파일이 %1$s에 저장됩니다. 저장소 캐시 비우기 diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4adeac914..2ecb8e417 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -146,11 +146,6 @@ Zawsze ciemny Tryb awaryjny (Safe Mode) Włącza tylko podstawowe funkcje. MagiskSU i MagiskHide będą nadal włączone, ale nie zostaną załadowane żadne moduły - Rozmiar kolumn siatki - Ustawia wielkość kolumny wszystkich pól wyboru. Możesz również zmienić to ustawienie wykonując gest uszczypnięcia. - Jeden element w wierszu (małe ekrany) - Dwa elementy w wierszu (zalecane) - Trzy elementy w wierszu (tablet/telewizor) Ścieżka pobierania Pliki pobrane przez Managera będą zapisywane do %1$s Wyczyść pamięć cache repozytorium diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index d3c078b45..32de2143b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -131,11 +131,11 @@ Sempre Escuro Modo de segurança Ative apenas os principais recursos. O MagiskSU e o MagiskHide ainda estarão ativados, mas nenhum módulo será carregado - Tamanho da coluna da grade - 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. - Um item por linha (telas pequenas)     - Dois itens por linha (recomendado) - Três itens por linha (Tablet/TV) + Caminho de Download Os arquivos serão salvos em %1$s Limpar cache de repositório diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index cf5e77771..d4ed968ca 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -136,11 +136,6 @@ Mereu mod întunecat Mod sigur Activează numai funcțiile de bază. MagiskSU și MagiskHide vor fi în continuare activate, însă niciun modul nu va fi încărcat - Dimensiune pentru coloana grilei - 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. - Un element per rând (Ecrane mici) - Două elemente per rând (Recomandat) - Trei elemente per rând (Tabletă/TV) Cale de descărcare Fișierele vor fi salvate în %1$s Golește cache-ul depozitelor diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9723c0cb4..747873a45 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -152,11 +152,6 @@ Всегда тёмный Безопасный режим Задействовать только основной функционал (MagiskSU и MagiskHide). Модули не будут активированы - Расположение элементов - Укажите число столбцов в сетке элементов. Возможно динамическое изменение жестом масштабирования - Один элемент (Небольшие экраны) - Два элемента (Рекомендуется) - Три элемента (Планшеты/TV) Папка для загрузок Файлы будут загружаться в %1$s Очистка кэша репозитория diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f1e58e8b4..a3ed0fa23 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -136,11 +136,6 @@ Vždy tmavý Núdzový režim Povolí iba hlavné funkcie. Stále budú povolené MagiskSU a MagiskHide, ale žiadne moduly nebudú zavedené - Veľkosť stĺpca mriežky - Nastaví veľkosť stĺpca pre všetky vhodné zoznamy mriežky. Tiež to môžete zmeniť pomocou stiahnutia prstami (pinch to zoom). - Jedna položka na riadok (Malé obrazovky) - Dve položky na riadok (Odporúčané) - Tri položky na riadok (Tablet/TV) Cesta na sťahovanie Súbory budú uložené do %1$s Vyčistiť cache repo diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ddb168255..0c9851139 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -135,11 +135,6 @@ Her zaman karanlık Güvenli Mod Sadece temel özellikleri etkinleştirin, tüm modüller yüklenmez. MagiskSU ve MagiskHide yine de etkinleştirilecektir - Izgara Sütunu Boyutu - 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. - Satır başına bir öğe (Küçük Ekranlar) - Satır başına iki öğe (Önerilen) - Satır başına üç öğe (Tablet/TV) İndirme yolu Dosyalar %1$s konumuna kaydedilecek Depo Önbelleğini Temizle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 17c6f1d65..c345f19d0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -146,11 +146,6 @@ Завжди темний Безпечний режим Увімкнути тільки можливості ядра. MagiskSU i Magisk Hide залишуться увімкненими, проте ніякі модулі не будуть завантажені - Розмір стовпців - Встановити розмір стовпців для всіх придатних списків сіткою. Ви можете змінювати це поза налаштуваннями, зробивши жест щипка - Один стовбець (малі екрани) - Два стовбці (рекомендовано) - Три стовбці (планшети/телевізори) Шлях завантаження Файли зберігатимуться в %1$s Очистити кеш diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b0d4f2efb..1ec624a3a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -136,11 +136,6 @@ 暗色模式 安全模式 仅启用核心功能，不加载任何模块。MagiskSU 和 MagiskHide 仍会持续运作 - 设置网格列数 - 设置网格列数以调整显示效果。您可以通过缩放手势直接调整 - 每行一项（小屏幕） - 每行两项（推荐） - 每行三项（平板/电视） 下载路径 文件将保存到 %1$s 清除仓库缓存 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1517863a2..427d0c529 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -135,11 +135,6 @@ 暗色模式 安全模式 保持 MagiskSU 及 MagiskHide 開啟並停止載入模組。 - 調整網格行數 - 透過設定網格行數來調整清單的顯示。您也可以透過縮放的手勢直接進行調整。 - 一個項目一行（小螢幕） - 兩個項目一行（建議） - 三個項目一行（平板/電視） 下載路徑 檔案將被儲存在：%1$s 清除線上模組庫快取 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 6b45c966f..c5228a019 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -87,9 +87,8 @@ - @string/settings_grid_span_count_1 - @string/settings_grid_span_count_2 - @string/settings_grid_span_count_3 + @string/settings_grid_column_count_1 + @string/settings_grid_column_count_2 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7db7df86c..2cdd60932 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -143,11 +143,10 @@ Always Dark Safe Mode Enable only core features. MagiskSU and MagiskHide will still be enabled, but no modules will be loaded - Grid Column Size - Sets column size for all eligible grid lists. You can set this outside settings by performing pinch gesture. - One item per line (Small Screens) - Two items per line (Recommended) - Three item per line (Tablet/TV) + List arrangement + Sets item width in a list. Restart app to apply changes. + Standard + Squished Download path Files will be saved to %1$s Clear Repo Cache