From ea68b97ff798426d97fa4ac8990aa8c7c49d3723 Mon Sep 17 00:00:00 2001 From: Imran Remtulla Date: Sat, 4 Feb 2023 19:30:41 -0500 Subject: [PATCH] Mark updated feature more clear --- assets/translations/de.json | 2 +- assets/translations/en.json | 2 +- assets/translations/hu.json | 2 +- assets/translations/it.json | 2 +- assets/translations/ja.json | 2 +- lib/pages/app.dart | 12 ++++-------- lib/pages/apps.dart | 4 ++-- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/assets/translations/de.json b/assets/translations/de.json index 9d72135..69ce123 100644 --- a/assets/translations/de.json +++ b/assets/translations/de.json @@ -74,7 +74,6 @@ "changeX": "Ändern {}", "installUpdateApps": "Apps installieren/aktualisieren", "installUpdateSelectedApps": "Ausgewählte Apps installieren/aktualisieren", - "onlyWorksWithNonEVDApps": "Funktioniert nur bei Apps, deren Installationsstatus nicht automatisch erkannt werden kann (ungewöhnlich).", "markXSelectedAppsAsUpdated": "Markiere {} ausgewählte Apps als aktuell?", "no": "Nein", "yes": "Ja", @@ -213,6 +212,7 @@ "filterAPKsByRegEx": "Filter APKs by Regular Expression", "removeFromObtainium": "Remove from Obtainium", "uninstallFromDevice": "Uninstall from Device", + "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.", "removeAppQuestion": { "one": "App entfernen?", "other": "App entfernen?" diff --git a/assets/translations/en.json b/assets/translations/en.json index 6fcc87a..95a41ef 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -74,7 +74,6 @@ "changeX": "Change {}", "installUpdateApps": "Install/Update Apps", "installUpdateSelectedApps": "Install/Update Selected Apps", - "onlyWorksWithNonEVDApps": "Only works for Apps whose install status cannot be automatically detected (uncommon).", "markXSelectedAppsAsUpdated": "Mark {} Selected Apps as Updated?", "no": "No", "yes": "Yes", @@ -213,6 +212,7 @@ "filterAPKsByRegEx": "Filter APKs by Regular Expression", "removeFromObtainium": "Remove from Obtainium", "uninstallFromDevice": "Uninstall from Device", + "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.", "removeAppQuestion": { "one": "Remove App?", "other": "Remove Apps?" diff --git a/assets/translations/hu.json b/assets/translations/hu.json index 0ba0763..a92460d 100644 --- a/assets/translations/hu.json +++ b/assets/translations/hu.json @@ -74,7 +74,6 @@ "changeX": "Változás {}", "installUpdateApps": "Appok telepítése/frissítése", "installUpdateSelectedApps": "Telepítse/frissítse a kiválasztott appokat", - "onlyWorksWithNonEVDApps": "Csak azoknál az alkalmazásoknál működik, amelyek telepítési állapota nem észlelhető autom. (nem gyakori).", "markXSelectedAppsAsUpdated": "Megjelöl {} kiválasztott alkalmazást frissítettként?", "no": "Nem", "yes": "Igen", @@ -212,6 +211,7 @@ "filterAPKsByRegEx": "Filter APKs by Regular Expression", "removeFromObtainium": "Remove from Obtainium", "uninstallFromDevice": "Uninstall from Device", + "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.", "removeAppQuestion": { "one": "Eltávolítja az alkalmazást?", "other": "Eltávolítja az alkalmazást?" diff --git a/assets/translations/it.json b/assets/translations/it.json index a6eaaab..c172613 100644 --- a/assets/translations/it.json +++ b/assets/translations/it.json @@ -74,7 +74,6 @@ "changeX": "Modifica {}", "installUpdateApps": "Installa/Aggiorna App", "installUpdateSelectedApps": "Installa/Aggiorna le App selezionate", - "onlyWorksWithNonEVDApps": "Funziona solo per le App il cui stato d'installazione non può essere rilevato automaticamente (inconsueto).", "markXSelectedAppsAsUpdated": "Contrassegnare le {} App selezionate come aggiornate?", "no": "No", "yes": "Sì", @@ -213,6 +212,7 @@ "filterAPKsByRegEx": "Filter APKs by Regular Expression", "removeFromObtainium": "Remove from Obtainium", "uninstallFromDevice": "Uninstall from Device", + "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.", "removeAppQuestion": { "one": "Rimuovere l'App?", "other": "Rimuovere l'App?" diff --git a/assets/translations/ja.json b/assets/translations/ja.json index 20ef37d..05abcf6 100644 --- a/assets/translations/ja.json +++ b/assets/translations/ja.json @@ -74,7 +74,6 @@ "changeX": "{} を変更する", "installUpdateApps": "アプリのインストール/アップデート", "installUpdateSelectedApps": "選択したアプリのインストール/アップデート", - "onlyWorksWithNonEVDApps": "インストール状況を自動検出できないアプリ（一般的でないもの）のみ動作します。", "markXSelectedAppsAsUpdated": "{}個の選択したアプリをアップデート済みとしてマークしますか？", "no": "いいえ", "yes": "はい", @@ -213,6 +212,7 @@ "filterAPKsByRegEx": "正規表現でAPKを絞り込む", "removeFromObtainium": "Remove from Obtainium", "uninstallFromDevice": "Uninstall from Device", + "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.", "removeAppQuestion": { "one": "アプリを削除しますか？", "other": "アプリを削除しますか？" diff --git a/lib/pages/app.dart b/lib/pages/app.dart index 4a222f7..0946b13 100644 --- a/lib/pages/app.dart +++ b/lib/pages/app.dart @@ -42,6 +42,8 @@ class _AppPageState extends State { getUpdate(app.app.id); } var trackOnly = app?.app.additionalSettings['trackOnly'] == true; + var noVersionDetection = + app?.app.additionalSettings['noVersionDetection'] == true; var infoColumn = Column( mainAxisAlignment: MainAxisAlignment.center, @@ -190,8 +192,9 @@ class _AppPageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - if (app?.app.installedVersion != null && + if (noVersionDetection && !trackOnly && + app?.app.installedVersion != null && app?.app.installedVersion != app?.app.latestVersion) IconButton( onPressed: app?.downloadProgress != null @@ -203,13 +206,6 @@ class _AppPageState extends State { return AlertDialog( title: Text(tr( 'alreadyUpToDateQuestion')), - content: Text( - tr('onlyWorksWithNonEVDApps'), - style: const TextStyle( - fontWeight: - FontWeight.bold, - fontStyle: - FontStyle.italic)), actions: [ TextButton( onPressed: () { diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart index e81be28..ce666e7 100644 --- a/lib/pages/apps.dart +++ b/lib/pages/apps.dart @@ -662,7 +662,7 @@ class AppsPageState extends State { ])), content: Text( - tr('onlyWorksWithNonEVDApps'), + tr('onlyWorksWithNonVersionDetectApps'), style: const TextStyle(fontWeight: FontWeight.bold, fontStyle: FontStyle.italic), ), actions: [ @@ -675,7 +675,7 @@ class AppsPageState extends State { onPressed: () { HapticFeedback.selectionClick(); appsProvider.saveApps(selectedApps.map((a) { - if (a.installedVersion != null) { + if (a.installedVersion != null && a.additionalSettings['noVersionDetection'] == true) { a.installedVersion = a.latestVersion; } return a;