Merge pull request #309 from ImranR98/dev

Release Filter Support for APKMirror (#307) + UI Bugfix (#303)

assets/translations/hu.json

@@ -34,7 +34,7 @@
     "githubStarredRepos": "GitHub Csillagos Repo-k",
     "uname": "Felh.név",
     "wrongArgNum": "Rossz számú argumentumot adott meg",
-    "xIsTrackOnly": "A(z) {} csak nyomkövethető",
+    "xIsTrackOnly": "A(z) {} csak nyomonkövethető",
     "source": "Forrás",
     "app": "App",
     "appsFromSourceAreTrackOnly": "Az ebből a forrásból származó alkalmazások 'Csak nyomon követhetőek'.",
@@ -78,7 +78,7 @@
     "no": "Nem",
     "yes": "Igen",
     "markSelectedAppsUpdated": "Jelölje meg a kiválasztott appokat frissítettként",
-    "pinToTop": "Rögzítés a felülre",
+    "pinToTop": "Rögzítés felülre",
     "unpinFromTop": "Eltávolít felülről",
     "resetInstallStatusForSelectedAppsQuestion": "Visszaállítja a kiválasztott appok telepítési állapotát?",
     "installStatusOfXWillBeResetExplanation": "A kiválasztott appok telepítési állapota visszaáll.\n\nEz akkor segíthet, ha az Obtainiumban megjelenített app verzió hibás, frissítések vagy egyéb problémák miatt.",
@@ -212,10 +212,10 @@
     "removeFromObtainium": "Eltávolítás az Obtainiumból",
     "uninstallFromDevice": "Eltávolítás a készülékről",
     "onlyWorksWithNonVersionDetectApps": "Csak azoknál az alkalmazásoknál működik, amelyeknél a verzióérzékelés le van tiltva.",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "useReleaseDateAsVersion": "Használja a Kiadás dátumát, mint verziót",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "releaseDateAsVersionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzió érzékelése nem működik megfelelően, de elérhető a kiadás dátuma.",
-    "changes": "Changes",
+    "changes": "Változtatások",
-    "releaseDate": "Release Date",
+    "releaseDate": "Kiadás dátuma",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -56,9 +56,9 @@
     "appsString": "App",
     "noApps": "Nessuna App",
     "noAppsForFilter": "Nessuna App per i filtri selezionati",
-    "byX": "Da {}",
+    "byX": "Di {}",
     "percentProgress": "Progresso: {}%",
-    "pleaseWait": "Attendere prego",
+    "pleaseWait": "In attesa",
     "updateAvailable": "Aggiornamento disponibile",
     "estimateInBracketsShort": "(prev.)",
     "notInstalled": "Non installato",
@@ -94,7 +94,7 @@
     "author": "Autore",
     "upToDateApps": "App aggiornate",
     "nonInstalledApps": "App non installate",
-    "importExport": "Importa - Esporta",
+    "importExport": "Importa/Esporta",
     "settings": "Impostazioni",
     "exportedTo": "Esportato in {}",
     "obtainiumExport": "Esporta da Obtainium",
@@ -213,10 +213,10 @@
     "removeFromObtainium": "Rimuovi da Obtainium",
     "uninstallFromDevice": "Disinstalla dal dispositivo",
     "onlyWorksWithNonVersionDetectApps": "Funziona solo per le App con il rilevamento della versione disattivato.",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "useReleaseDateAsVersion": "Usa data di rilascio come versione",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "releaseDateAsVersionExplanation": "Questa opzione dovrebbe essere usata solo per le App in cui il rilevamento della versione non funziona correttamente, ma è disponibile una data di rilascio.",
-    "changes": "Changes",
+    "changes": "Novità",
-    "releaseDate": "Release Date",
+    "releaseDate": "Data di rilascio",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -213,10 +213,10 @@
     "removeFromObtainium": "Obtainiumから削除する",
     "uninstallFromDevice": "デバイスからアンインストールする",
     "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
-    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "useReleaseDateAsVersion": "リリース日をバージョンとして使用する",
-    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "releaseDateAsVersionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリで、リリース日が利用可能な場合にのみ使用する必要があります。",
-    "changes": "Changes",
+    "changes": "変更点",
-    "releaseDate": "Release Date",
+    "releaseDate": "リリース日",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

lib/app_sources/apkmirror.dart

@@ -1,7 +1,9 @@
 import 'dart:io';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
 
@@ -9,6 +11,23 @@ class APKMirror extends AppSource {
   APKMirror() {
     host = 'apkmirror.com';
     enforceTrackOnly = true;
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ],
+      [
+        GeneratedFormTextField('filterReleaseTitlesByRegEx',
+            label: tr('filterReleaseTitlesByRegEx'),
+            required: false,
+            additionalValidators: [
+              (value) {
+                return regExValidator(value);
+              }
+            ])
+      ]
+    ];
   }
 
   @override
@@ -30,11 +49,31 @@ class APKMirror extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
+    String? regexFilter =
+        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
+                    ?.isNotEmpty ==
+                true
+            ? additionalSettings['filterReleaseTitlesByRegEx']
+            : null;
     Response res = await get(Uri.parse('$standardUrl/feed'));
     if (res.statusCode == 200) {
-      var item = parse(res.body).querySelector('item');
+      var items = parse(res.body).querySelectorAll('item');
-      String? titleString = item?.querySelector('title')?.innerHtml;
+      dynamic targetRelease;
-      String? dateString = item
+      for (int i = 0; i < items.length; i++) {
+        if (!fallbackToOlderReleases && i > 0) break;
+        String? nameToFilter = items[i].querySelector('title')?.innerHtml;
+        if (regexFilter != null &&
+            nameToFilter != null &&
+            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
+          continue;
+        }
+        targetRelease = items[i];
+        break;
+      }
+      String? titleString = targetRelease?.querySelector('title')?.innerHtml;
+      String? dateString = targetRelease
           ?.querySelector('pubDate')
           ?.innerHtml
           .split(' ')

lib/main.dart

@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';
 
-const String currentVersion = '0.11.0';
+const String currentVersion = '0.11.1';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/apps.dart

@@ -266,6 +266,7 @@ class AppsPageState extends State<AppsPage> {
                           )
                         : null,
                     title: Text(
+                      maxLines: 1,
                       listedApps[index].installedInfo?.name ??
                           listedApps[index].app.name,
                       style: TextStyle(
@@ -298,11 +299,14 @@ class AppsPageState extends State<AppsPage> {
                                   Row(
                                       mainAxisSize: MainAxisSize.min,
                                       children: [
-                                        Text(
+                                        Container(
-                                          '${listedApps[index].app.installedVersion ?? tr('notInstalled')}${listedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                            constraints: const BoxConstraints(
-                                          overflow: TextOverflow.ellipsis,
+                                                maxWidth: 150),
-                                          textAlign: TextAlign.end,
+                                            child: Text(
-                                        )
+                                              '${listedApps[index].app.installedVersion ?? tr('notInstalled')}${listedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                              overflow: TextOverflow.ellipsis,
+                                              textAlign: TextAlign.end,
+                                            ))
                                       ]),
                                   GestureDetector(
                                       onTap: changesUrl == null

pubspec.lock

@@ -830,10 +830,10 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: f7ec234830f86d0ef2bd664e8460b0038b8c1a83ff076035cad74ac70273753c
+      sha256: dad1f2caa3272071275436984eb123276a6810dbe7cd6f4c60697640b56a4699
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   webview_flutter_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.11.0+119 # When changing this, update the tag in main() accordingly
+version: 0.11.1+120 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'