From cfd7b56a9210802ffd72f835fdda9e6bcb51be0b Mon Sep 17 00:00:00 2001 From: Cato the Cat Date: Sat, 31 May 2025 16:36:50 +0300 Subject: [PATCH] Show target and minimum SDK on one line --- .../droidify/ui/appDetail/AppDetailAdapter.kt | 16 ++++++---------- app/src/main/res/layout/release_item.xml | 10 +--------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pa/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 3 +-- 31 files changed, 8 insertions(+), 49 deletions(-) diff --git a/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt b/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt index 14df2c49..ef31a053 100644 --- a/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt +++ b/app/src/main/kotlin/com/looker/droidify/ui/appDetail/AppDetailAdapter.kt @@ -557,8 +557,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) : val size = itemView.findViewById(R.id.size)!! val signature = itemView.findViewById(R.id.signature)!! val compatibility = itemView.findViewById(R.id.compatibility)!! - val targetSdk = itemView.findViewById(R.id.target_sdk)!! - val minSdk = itemView.findViewById(R.id.min_sdk)!! + val sdkVer = itemView.findViewById(R.id.sdk_ver)!! val statefulViews: Sequence get() = sequenceOf( @@ -570,7 +569,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) : size, signature, compatibility, - targetSdk, + sdkVer, ) } @@ -1713,25 +1712,22 @@ class AppDetailAdapter(private val callbacks: Callbacks) : ) } } - with(holder.targetSdk) { - val sdkVersion = sdkName.getOrDefault( + with(holder.sdkVer) { + val targetSdkVersion = sdkName.getOrDefault( item.release.targetSdkVersion, context.getString( stringRes.label_unknown_sdk, item.release.targetSdkVersion, ), ) - text = context.getString(stringRes.label_targets_sdk, sdkVersion) - } - with(holder.minSdk) { - val sdkVersion = sdkName.getOrDefault( + val minSdkVersion = sdkName.getOrDefault( item.release.minSdkVersion, context.getString( stringRes.label_unknown_sdk, item.release.minSdkVersion, ), ) - text = context.getString(stringRes.label_minimum_sdk, sdkVersion) + text = context.getString(stringRes.label_sdk_version, targetSdkVersion, minSdkVersion) } val enabled = status == Status.Idle holder.statefulViews.forEach { it.isEnabled = enabled } diff --git a/app/src/main/res/layout/release_item.xml b/app/src/main/res/layout/release_item.xml index b92a7bf6..79180b28 100644 --- a/app/src/main/res/layout/release_item.xml +++ b/app/src/main/res/layout/release_item.xml @@ -97,15 +97,7 @@ android:textSize="14sp" /> - - غير معروف (%d) Shizuku غير مثبت خدمة Shizuku لا تعمل. يُرجى التحقق من تطبيق Shizuku - يستهدف: أندرويد %s فيديو Shizuku لا يعمل بدّل إلى الافتراضي diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 12cd981a..4f48e768 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -235,7 +235,6 @@ Не хапае месца На вашай прыладзе не хапае памяці для ўсталявання гэтай праграмы. Паспрабуйце вызваліць крыху месца Адкрыць Shizuku - Цэль: Android %s Пераключыцца на стандартны Відэа diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3a7c4fe8..2563e496 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -222,7 +222,6 @@ *Внимание* Игнорирайте проверката на подписа при инсталиране на APK за LSPosed потребители или напреднали потребители Недостатъчно място Няма достатъчно свободно място на устройството за инсталиране на това приложение. Опитайте да освободите малко място - Цели: Android %s Shizuku Не е инсталиран Видео Превключване към подразбиране diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 585f4d5f..e66795b0 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -231,6 +231,5 @@ পটভূমি অনুমোদন প্রয়োজন পটভূমি সিঙ্কের জন্য এই ভাণ্ডারগুলো পাওয়া যায়নি সহজাতে পরিবর্তন করো - লক্ষ্য: অ্যান্ড্রয়েড %s অজানা (%d) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d2c75636..07a1d446 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -235,5 +235,4 @@ Shizuku není nainstalováno Video Otevřít Shizuku - Cíle: Android %s diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ffaa1cbd..ed487b7a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -227,7 +227,6 @@ Shizuku-tilladelse er ikke givet. Tjek venligst i Shizuku-appen Shizuku ikke installeret Shizuku ser ikke ud til at være installeret - Mål: Android %s Åbn Shizuku Ukendt (%d) Skift til standard diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5124d78f..88ab8dcb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -232,5 +232,4 @@ Der Shizuku-Dienst läuft nicht. Bitte in der Shizuku-App prüfen Video Unbekannt (%d) - Gedacht für: Android %s diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b203ac36..94f7af70 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -232,5 +232,4 @@ Η υπηρεσία Shizuku δεν λειτουργεί. Ελέγξτε την εφαρμογή Shizuku Λείπει η άδεια Shizuku Δεν υπάρχει αρκετός ελεύθερος χώρος στη συσκευή για την εγκατάσταση αυτής της εφαρμογής. Προσπαθήστε να ελευθερώσετε και να καθαρίσετε λίγο χώρο - Στόχοι: Android %s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 45bc551b..cc8b34b0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -234,6 +234,5 @@ Abrir Shizuku Cambiar a Predeterminado Video - Objetivo: Android %s Desconocido (%d) diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 94b84a5a..a8592564 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -224,7 +224,6 @@ Veebileht Uuenda kõik Video - Eesmärgid: Android %s Tundmatu (%d) Näita vähem Kohandamine diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4d43254e..d8a0e214 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -233,7 +233,6 @@ Shizuku ne semble pas être installé Ouvrir Shizuku Vidéo - Cible : Android %s Inconnu (%d) Rétablir par défaut diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 75fb35cc..7e4833cd 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -225,5 +225,4 @@ इस एप्लिकेशन को इंस्टॉल करने के लिए डिवाइस पर पर्याप्त खाली जगह नहीं है। कुछ जगह खाली करने का प्रयास करें डिफ़ॉल्ट पर स्विच करें वीडियो - लक्ष्य: एंड्रॉइड %s diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c7b4c3a0..21656f1d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -225,7 +225,6 @@ Úgy tűnik a Shizuku nincs telepítve Shizuku nincs telepítve A Shizuku szolgáltatás nem fut. Kérem ellenőrizze a Shizuku appon belül - Célok: Android %s Nincs elég szabad hely az eszközön az applikáció telepítéséhez. Próbáljon meg területet felszabadítani A Shizuku nem fut Ismeretlen (%d) diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 4046ad27..77750209 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -228,6 +228,5 @@ Izin Shizuku Hilang Shizuku Tidak Terinstal video - Target: Android %s Tidak diketahui (%d) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c58975f7..53f3c2cb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -236,5 +236,4 @@ Apri Shizuku Passa al predefinito Sconosciuto (%d) - Punta: Android %s diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index bbbd9abd..2985aee9 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -229,7 +229,6 @@ נדרשת גישת רקע כדי להפעיל את סנכרון הרקע כראוי דרוש גישה ברקע וידיאו - יעדים: אנדרואיד %s Shizuku לא פועל שירות Shizuku אינו פועל. אנא בדוק באפליקציית Shizuku חסר הרשאת שימוש ב- Shizuku diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 03ba78ec..8886a40c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -229,5 +229,4 @@ 서명 무시 서명 검증을 무시하고 APK 파일을 설치합니다. LSPosed 사용자 및 고급 사용자용 기능입니다. 동영상 - 대상 버전: Android %s diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 327d52e5..8f5ea714 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -234,6 +234,5 @@ Ignorēt parakstu Satur darba vietai nepiemērotu saturu Video - Mērķa OS: Android %s Nezināms (%d) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 95815cac..2dc8298c 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -231,6 +231,5 @@ Overschakelen naar standaard Video Het lijkt erop dat Shizuku niet is geïnstalleerd - Doel: Android %s Onbekend (%d) diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index c8d34370..1f89c597 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -231,6 +231,5 @@ Shizuku ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ Shizuku ਖੋਲ੍ਹੋ ਡਿਫ਼ਾਲਟ \'ਤੇ ਸਵਿਚ ਕਰੋ - ਟਾਰਗੈੱਟ: ਐਂਡਰੌਇਡ %s ਅਗਿਆਤ (%d) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 21f7ea6c..1bcf40d3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -238,5 +238,4 @@ Nieznany (%d) Shizuku nie jest zainstalowane Wideo - Cele: Android %s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a6f7803e..609b0d7f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -231,6 +231,5 @@ Permissão Shizuku não concedida Utilizar predefinição Vídeo - Alvo: Android %s Desconhecido (%d) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4fe735a8..604ad328 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -238,6 +238,5 @@ Открыть Shizuku Использовать установщик по умолчанию Неизвестно (%d) - Целевая ОС: Android %s Видео diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d0a43a8f..f494add5 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -230,7 +230,6 @@ Shizuku није инсталиран Изгледа да Shizuku није инсталиран Видео снимак - Циља: Android %s Непознато (%d) Услуга Shizuku није покренута. Проверите у апликацији Shizuku Отвори Shizuku diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1e6d329d..8e63411c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -238,5 +238,4 @@ Перемкнутися на типовий режим Невідомий (%d) Відео - Цілі: Android %s diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 851c6985..dd92b116 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -227,6 +227,5 @@ Không đủ không gian Mở Shizuku Chuyển sang mặc định - Mục tiêu: Android %s Không rõ (%d) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8bb190c8..2316645f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -226,7 +226,6 @@ 缺少 Shizuku 权限 Shizuku 服务权限未授予。请在 Shizuku 应用中检查 打开 Shizuku - 目标：Android %s 未知 (%d) Shizuku 未安装 Shizuku 似乎未安装 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 48a7b975..29d4e962 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -228,6 +228,5 @@ 開啟 Shizuku 切換到預設 影片 - 目標：Android %s 未知 (%d) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2a8596ee..312b8162 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,7 +236,6 @@ Update all Contains not safe for work content Video - Targets: Android %s Unknown (%d) - Minimum: Android %s + Targets: Android %1$s | Minimum: Android %2$s