Show target and minimum SDK on one line

2025-05-31 16:36:50 +03:00 · 2025-05-31 16:36:50 +03:00 · cfd7b56a92
commit cfd7b56a92
parent 460337eaa6
31 changed files with 8 additions and 49 deletions
--- 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<TextView>(R.id.size)!!
        val signature = itemView.findViewById<TextView>(R.id.signature)!!
        val compatibility = itemView.findViewById<TextView>(R.id.compatibility)!!
-        val targetSdk = itemView.findViewById<TextView>(R.id.target_sdk)!!
-        val minSdk = itemView.findViewById<TextView>(R.id.min_sdk)!!
+        val sdkVer = itemView.findViewById<TextView>(R.id.sdk_ver)!!

        val statefulViews: Sequence<View>
            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 }
--- 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" />

        <TextView
-            android:id="@+id/target_sdk"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/min_sdk"
+            android:id="@+id/sdk_ver"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:singleLine="true"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -241,7 +241,6 @@
    <string name="label_unknown_sdk">غير معروف (%d)</string>
    <string name="error_shizuku_not_installed">Shizuku غير مثبت</string>
    <string name="error_shizuku_not_running_DESC">خدمة Shizuku لا تعمل. يُرجى التحقق من تطبيق Shizuku</string>
-    <string name="label_targets_sdk">يستهدف: أندرويد %s</string>
    <string name="label_open_video">فيديو</string>
    <string name="error_shizuku_service_unavailable">Shizuku لا يعمل</string>
    <string name="switch_to_default_installer">بدّل إلى الافتراضي</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -235,7 +235,6 @@
    <string name="insufficient_storage">Не хапае месца</string>
    <string name="insufficient_storage_DESC">На вашай прыладзе не хапае памяці для ўсталявання гэтай праграмы. Паспрабуйце вызваліць крыху месца</string>
    <string name="open_shizuku">Адкрыць Shizuku</string>
-    <string name="label_targets_sdk">Цэль: Android %s</string>
    <string name="switch_to_default_installer">Пераключыцца на стандартны</string>
    <string name="label_open_video">Відэа</string>
 </resources>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -222,7 +222,6 @@
    <string name="ignore_signature_summary">*Внимание* Игнорирайте проверката на подписа при инсталиране на APK за LSPosed потребители или напреднали потребители</string>
    <string name="insufficient_storage">Недостатъчно място</string>
    <string name="insufficient_storage_DESC">Няма достатъчно свободно място на устройството за инсталиране на това приложение. Опитайте да освободите малко място</string>
-    <string name="label_targets_sdk">Цели: Android %s</string>
    <string name="error_shizuku_not_installed">Shizuku Не е инсталиран</string>
    <string name="label_open_video">Видео</string>
    <string name="switch_to_default_installer">Превключване към подразбиране</string>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -231,6 +231,5 @@
    <string name="require_background_access_DESC">পটভূমি অনুমোদন প্রয়োজন পটভূমি সিঙ্কের জন্য</string>
    <string name="repository_not_found">এই ভাণ্ডারগুলো পাওয়া যায়নি</string>
    <string name="switch_to_default_installer">সহজাতে পরিবর্তন করো</string>
-    <string name="label_targets_sdk">লক্ষ্য: অ্যান্ড্রয়েড %s</string>
    <string name="label_unknown_sdk">অজানা (%d)</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -235,5 +235,4 @@
    <string name="error_shizuku_not_installed">Shizuku není nainstalováno</string>
    <string name="label_open_video">Video</string>
    <string name="open_shizuku">Otevřít Shizuku</string>
-    <string name="label_targets_sdk">Cíle: Android %s</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -227,7 +227,6 @@
    <string name="error_shizuku_not_granted_DESC">Shizuku-tilladelse er ikke givet. Tjek venligst i Shizuku-appen</string>
    <string name="error_shizuku_not_installed">Shizuku ikke installeret</string>
    <string name="error_shizuku_not_installed_DESC">Shizuku ser ikke ud til at være installeret</string>
-    <string name="label_targets_sdk">Mål: Android %s</string>
    <string name="open_shizuku">Åbn Shizuku</string>
    <string name="label_unknown_sdk">Ukendt (%d)</string>
    <string name="switch_to_default_installer">Skift til standard</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -232,5 +232,4 @@
    <string name="error_shizuku_not_running_DESC">Der Shizuku-Dienst läuft nicht. Bitte in der Shizuku-App prüfen</string>
    <string name="label_open_video">Video</string>
    <string name="label_unknown_sdk">Unbekannt (%d)</string>
-    <string name="label_targets_sdk">Gedacht für: Android %s</string>
 </resources>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -232,5 +232,4 @@
    <string name="error_shizuku_not_running_DESC">Η υπηρεσία Shizuku δεν λειτουργεί. Ελέγξτε την εφαρμογή Shizuku</string>
    <string name="error_shizuku_not_granted">Λείπει η άδεια Shizuku</string>
    <string name="insufficient_storage_DESC">Δεν υπάρχει αρκετός ελεύθερος χώρος στη συσκευή για την εγκατάσταση αυτής της εφαρμογής. Προσπαθήστε να ελευθερώσετε και να καθαρίσετε λίγο χώρο</string>
-    <string name="label_targets_sdk">Στόχοι: Android %s</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -234,6 +234,5 @@
    <string name="open_shizuku">Abrir Shizuku</string>
    <string name="switch_to_default_installer">Cambiar a Predeterminado</string>
    <string name="label_open_video">Video</string>
-    <string name="label_targets_sdk">Objetivo: Android %s</string>
    <string name="label_unknown_sdk">Desconocido (%d)</string>
 </resources>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -224,7 +224,6 @@
    <string name="website">Veebileht</string>
    <string name="update_all">Uuenda kõik</string>
    <string name="label_open_video">Video</string>
-    <string name="label_targets_sdk">Eesmärgid: Android %s</string>
    <string name="label_unknown_sdk">Tundmatu (%d)</string>
    <string name="show_less">Näita vähem</string>
    <string name="prefs_personalization">Kohandamine</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -233,7 +233,6 @@
    <string name="error_shizuku_not_installed_DESC">Shizuku ne semble pas être installé</string>
    <string name="open_shizuku">Ouvrir Shizuku</string>
    <string name="label_open_video">Vidéo</string>
-    <string name="label_targets_sdk">Cible : Android %s</string>
    <string name="label_unknown_sdk">Inconnu (%d)</string>
    <string name="switch_to_default_installer">Rétablir par défaut</string>
 </resources>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -225,5 +225,4 @@
    <string name="insufficient_storage_DESC">इस एप्लिकेशन को इंस्टॉल करने के लिए डिवाइस पर पर्याप्त खाली जगह नहीं है। कुछ जगह खाली करने का प्रयास करें</string>
    <string name="switch_to_default_installer">डिफ़ॉल्ट पर स्विच करें</string>
    <string name="label_open_video">वीडियो</string>
-    <string name="label_targets_sdk">लक्ष्य: एंड्रॉइड %s</string>
 </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -225,7 +225,6 @@
    <string name="error_shizuku_not_installed_DESC">Úgy tűnik a Shizuku nincs telepítve</string>
    <string name="error_shizuku_not_installed">Shizuku nincs telepítve</string>
    <string name="error_shizuku_not_running_DESC">A Shizuku szolgáltatás nem fut. Kérem ellenőrizze a Shizuku appon belül</string>
-    <string name="label_targets_sdk">Célok: Android %s</string>
    <string name="insufficient_storage_DESC">Nincs elég szabad hely az eszközön az applikáció telepítéséhez. Próbáljon meg területet felszabadítani</string>
    <string name="error_shizuku_service_unavailable">A Shizuku nem fut</string>
    <string name="label_unknown_sdk">Ismeretlen (%d)</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -228,6 +228,5 @@
    <string name="error_shizuku_not_granted">Izin Shizuku Hilang</string>
    <string name="error_shizuku_not_installed">Shizuku Tidak Terinstal</string>
    <string name="label_open_video">video</string>
-    <string name="label_targets_sdk">Target: Android %s</string>
    <string name="label_unknown_sdk">Tidak diketahui (%d)</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -236,5 +236,4 @@
    <string name="open_shizuku">Apri Shizuku</string>
    <string name="switch_to_default_installer">Passa al predefinito</string>
    <string name="label_unknown_sdk">Sconosciuto (%d)</string>
-    <string name="label_targets_sdk">Punta: Android %s</string>
 </resources>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -229,7 +229,6 @@
    <string name="require_background_access_DESC">נדרשת גישת רקע כדי להפעיל את סנכרון הרקע כראוי</string>
    <string name="require_background_access">דרוש גישה ברקע</string>
    <string name="label_open_video">וידיאו</string>
-    <string name="label_targets_sdk">יעדים: אנדרואיד %s</string>
    <string name="error_shizuku_service_unavailable">Shizuku לא פועל</string>
    <string name="error_shizuku_not_running_DESC">שירות Shizuku אינו פועל. אנא בדוק באפליקציית Shizuku</string>
    <string name="error_shizuku_not_granted">חסר הרשאת שימוש ב- Shizuku</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -229,5 +229,4 @@
    <string name="ignore_signature">서명 무시</string>
    <string name="ignore_signature_summary">서명 검증을 무시하고 APK 파일을 설치합니다. LSPosed 사용자 및 고급 사용자용 기능입니다.</string>
    <string name="label_open_video">동영상</string>
-    <string name="label_targets_sdk">대상 버전: Android %s</string>
 </resources>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@ -234,6 +234,5 @@
    <string name="ignore_signature">Ignorēt parakstu</string>
    <string name="contains_nsfw">Satur darba vietai nepiemērotu saturu</string>
    <string name="label_open_video">Video</string>
-    <string name="label_targets_sdk">Mērķa OS: Android %s</string>
    <string name="label_unknown_sdk">Nezināms (%d)</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -231,6 +231,5 @@
    <string name="switch_to_default_installer">Overschakelen naar standaard</string>
    <string name="label_open_video">Video</string>
    <string name="error_shizuku_not_installed_DESC">Het lijkt erop dat Shizuku niet is geïnstalleerd</string>
-    <string name="label_targets_sdk">Doel: Android %s</string>
    <string name="label_unknown_sdk">Onbekend (%d)</string>
 </resources>
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@ -231,6 +231,5 @@
    <string name="error_shizuku_not_installed">Shizuku ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ</string>
    <string name="open_shizuku">Shizuku ਖੋਲ੍ਹੋ</string>
    <string name="switch_to_default_installer">ਡਿਫ਼ਾਲਟ \'ਤੇ ਸਵਿਚ ਕਰੋ</string>
-    <string name="label_targets_sdk">ਟਾਰਗੈੱਟ: ਐਂਡਰੌਇਡ %s</string>
    <string name="label_unknown_sdk">ਅਗਿਆਤ (%d)</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -238,5 +238,4 @@
    <string name="label_unknown_sdk">Nieznany (%d)</string>
    <string name="error_shizuku_not_installed">Shizuku nie jest zainstalowane</string>
    <string name="label_open_video">Wideo</string>
-    <string name="label_targets_sdk">Cele: Android %s</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -231,6 +231,5 @@
    <string name="error_shizuku_not_granted">Permissão Shizuku não concedida</string>
    <string name="switch_to_default_installer">Utilizar predefinição</string>
    <string name="label_open_video">Vídeo</string>
-    <string name="label_targets_sdk">Alvo: Android %s</string>
    <string name="label_unknown_sdk">Desconhecido (%d)</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -238,6 +238,5 @@
    <string name="open_shizuku">Открыть Shizuku</string>
    <string name="switch_to_default_installer">Использовать установщик по умолчанию</string>
    <string name="label_unknown_sdk">Неизвестно (%d)</string>
-    <string name="label_targets_sdk">Целевая ОС: Android %s</string>
    <string name="label_open_video">Видео</string>
 </resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -230,7 +230,6 @@
    <string name="error_shizuku_not_installed">Shizuku није инсталиран</string>
    <string name="error_shizuku_not_installed_DESC">Изгледа да Shizuku није инсталиран</string>
    <string name="label_open_video">Видео снимак</string>
-    <string name="label_targets_sdk">Циља: Android %s</string>
    <string name="label_unknown_sdk">Непознато (%d)</string>
    <string name="error_shizuku_not_running_DESC">Услуга Shizuku није покренута. Проверите у апликацији Shizuku</string>
    <string name="open_shizuku">Отвори Shizuku</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -238,5 +238,4 @@
    <string name="switch_to_default_installer">Перемкнутися на типовий режим</string>
    <string name="label_unknown_sdk">Невідомий (%d)</string>
    <string name="label_open_video">Відео</string>
-    <string name="label_targets_sdk">Цілі: Android %s</string>
 </resources>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -227,6 +227,5 @@
    <string name="insufficient_storage">Không đủ không gian</string>
    <string name="open_shizuku">Mở Shizuku</string>
    <string name="switch_to_default_installer">Chuyển sang mặc định</string>
-    <string name="label_targets_sdk">Mục tiêu: Android %s</string>
    <string name="label_unknown_sdk">Không rõ (%d)</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -226,7 +226,6 @@
    <string name="error_shizuku_not_granted">缺少 Shizuku 权限</string>
    <string name="error_shizuku_not_granted_DESC">Shizuku 服务权限未授予。请在 Shizuku 应用中检查</string>
    <string name="open_shizuku">打开 Shizuku</string>
-    <string name="label_targets_sdk">目标：Android %s</string>
    <string name="label_unknown_sdk">未知 (%d)</string>
    <string name="error_shizuku_not_installed">Shizuku 未安装</string>
    <string name="error_shizuku_not_installed_DESC">Shizuku 似乎未安装</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -228,6 +228,5 @@
    <string name="open_shizuku">開啟 Shizuku</string>
    <string name="switch_to_default_installer">切換到預設</string>
    <string name="label_open_video">影片</string>
-    <string name="label_targets_sdk">目標：Android %s</string>
    <string name="label_unknown_sdk">未知 (%d)</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -236,7 +236,6 @@
    <string name="update_all">Update all</string>
    <string name="contains_nsfw">Contains not safe for work content</string>
    <string name="label_open_video">Video</string>
-    <string name="label_targets_sdk">Targets: Android %s</string>
    <string name="label_unknown_sdk">Unknown (%d)</string>
-    <string name="label_minimum_sdk">Minimum: Android %s</string>
+    <string name="label_sdk_version">Targets: Android %1$s | Minimum: Android %2$s</string>
 </resources>