Merge pull request #347 from ImranR98/dev

Bugfixes from prev. commit

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,46 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="142.129"
+    android:viewportHeight="142.129"
+    android:width="503.6066dp"
+    android:height="503.6066dp">
+    <group
+        android:translateX="-30.39437"
+        android:translateY="-54.68043">
+        <path
+            android:pathData="M109.8808 153.22596c-0.73146 -0.38777 -5.00657 -2.75679 -25.032416 -13.87149 -5.57273 -3.09297 -10.93823 -6.06723 -11.92332 -6.60948 -2.23728 -1.23152 -2.58105 -1.53456 -2.58105 -2.27528 0 -0.3879 0.89293 -2.87231 2.98561 -8.30689 1.64209 -4.2644 3.09426 -8.0014 3.22705 -8.30444 0.3024 -0.69008 0.78972 -1.27621 1.26573 -1.52236 0.44558 -0.23042 11.58052 -4.29685 12.14814 -4.43644 0.61355 -0.1509 1.1428 0.13977 1.45487 0.79901 0.14976 0.31638 0.77213 1.94934 1.38303 3.6288 0.6109 1.67945 1.52036 4.16275 2.02104 5.51844 1.14709 3.10604 1.18992 3.54589 0.3912 4.01771 -0.2117 0.12505 -1.58874 0.66539 -3.06009 1.20075 -1.47136 0.53536 -2.87533 1.08982 -3.11993 1.23213 -0.56422 0.32826 -0.64913 0.83523 -0.20815 1.24273 0.17523 0.16193 3.00434 1.77571 6.28691 3.58618 9.174936 5.06035 8.665596 4.83136 9.277626 4.17097 0.29987 -0.32356 5.78141 -14.266 6.09596 -15.50521 0.1344 -0.5295 0.11969 -0.60308 -0.16695 -0.83519 -0.39165 -0.31714 -0.335 -0.33071 -3.93797 0.9431 -3.56937 1.26192 -3.90926 1.28864 -4.38744 0.34488 -0.25108 -0.49556 -4.095796 -11.05481 -4.334456 -11.90432 -0.15438 -0.5495 0.0344 -1.0717 0.49701 -1.37482 0.19228 -0.12598 2.990116 -1.19935 6.217406 -2.38526 4.78924 -1.75986 6.0081 -2.15842 6.63117 -2.16837 0.8037 -0.0128 0.90917 0.0424 15.64514 8.19599 1.02104 0.56495 1.56579 1.15961 1.56579 1.70925 0 0.21814 -3.6538 9.91011 -8.11957 21.53771 -6.2982 16.39877 -8.19916 21.21114 -8.4744 21.45338 -0.46789 0.41179 -0.8512 0.39392 -1.74794 -0.0815z"
+            android:strokeWidth="0.139">
+            <aapt:attr
+                name="android:fillColor">
+                <gradient
+                    android:startX="76.74697"
+                    android:startY="113.4246"
+                    android:endX="110.6445"
+                    android:endY="152.5006"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#9B58DC"
+                        android:offset="0" />
+                    <item
+                        android:color="#321C92"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+            <aapt:attr
+                name="android:strokeColor">
+                <gradient
+                    android:startX="76.74697"
+                    android:startY="113.4246"
+                    android:endX="110.6445"
+                    android:endY="152.5006"
+                    android:tileMode="clamp">
+                    <item
+                        android:color="#9B58DC"
+                        android:offset="0" />
+                    <item
+                        android:color="#321C92"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

assets/graphics/icon.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="142.12897mm"
+   height="142.12897mm"
+   viewBox="0 0 142.12897 142.12897"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="icon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="2.4175295"
+     inkscape:cx="371.03994"
+     inkscape:cy="273.62644"
+     inkscape:window-width="2256"
+     inkscape:window-height="1427"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs2"><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3657"><stop
+         style="stop-color:#9b58dc;stop-opacity:1;"
+         offset="0"
+         id="stop3653" /><stop
+         style="stop-color:#321c92;stop-opacity:1;"
+         offset="1"
+         id="stop3655" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient945"><stop
+         style="stop-color:#9b58dc;stop-opacity:1;"
+         offset="0"
+         id="stop941" /><stop
+         style="stop-color:#321c92;stop-opacity:1;"
+         offset="1"
+         id="stop943" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient945"
+       id="linearGradient947"
+       x1="76.787094"
+       y1="113.40435"
+       x2="110.68458"
+       y2="152.48038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04012535,0.02025786)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3657"
+       id="linearGradient3659"
+       x1="76.787094"
+       y1="113.40435"
+       x2="110.68458"
+       y2="152.48038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04012535,0.02025786)" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-30.394373,-54.680428)"><path
+       style="fill:url(#linearGradient3659);fill-opacity:1;stroke:url(#linearGradient947);stroke-width:0.139;stroke-dasharray:none"
+       d="m 109.8808,153.22596 c -0.73146,-0.38777 -5.00657,-2.75679 -25.032416,-13.87149 -5.57273,-3.09297 -10.93823,-6.06723 -11.92332,-6.60948 -2.23728,-1.23152 -2.58105,-1.53456 -2.58105,-2.27528 0,-0.3879 0.89293,-2.87231 2.98561,-8.30689 1.64209,-4.2644 3.09426,-8.0014 3.22705,-8.30444 0.3024,-0.69008 0.78972,-1.27621 1.26573,-1.52236 0.44558,-0.23042 11.58052,-4.29685 12.14814,-4.43644 0.61355,-0.1509 1.1428,0.13977 1.45487,0.79901 0.14976,0.31638 0.77213,1.94934 1.38303,3.6288 0.6109,1.67945 1.52036,4.16275 2.02104,5.51844 1.14709,3.10604 1.18992,3.54589 0.3912,4.01771 -0.2117,0.12505 -1.58874,0.66539 -3.06009,1.20075 -1.47136,0.53536 -2.87533,1.08982 -3.11993,1.23213 -0.56422,0.32826 -0.64913,0.83523 -0.20815,1.24273 0.17523,0.16193 3.00434,1.77571 6.28691,3.58618 9.174936,5.06035 8.665596,4.83136 9.277626,4.17097 0.29987,-0.32356 5.78141,-14.266 6.09596,-15.50521 0.1344,-0.5295 0.11969,-0.60308 -0.16695,-0.83519 -0.39165,-0.31714 -0.335,-0.33071 -3.93797,0.9431 -3.56937,1.26192 -3.90926,1.28864 -4.38744,0.34488 -0.25108,-0.49556 -4.095796,-11.05481 -4.334456,-11.90432 -0.15438,-0.5495 0.0344,-1.0717 0.49701,-1.37482 0.19228,-0.12598 2.990116,-1.19935 6.217406,-2.38526 4.78924,-1.75986 6.0081,-2.15842 6.63117,-2.16837 0.8037,-0.0128 0.90917,0.0424 15.64514,8.19599 1.02104,0.56495 1.56579,1.15961 1.56579,1.70925 0,0.21814 -3.6538,9.91011 -8.11957,21.53771 -6.2982,16.39877 -8.19916,21.21114 -8.4744,21.45338 -0.46789,0.41179 -0.8512,0.39392 -1.74794,-0.0815 z"
+       id="path239" /></g></svg>

assets/translations/de.json

@@ -207,12 +207,19 @@
     "addCategory": "Kategorie hinzufügen",
     "label": "Bezeichnung",
     "language": "Sprache",
-    "storagePermissionDenied": "Storage permission denied",
-    "selectedCategorizeWarning": "This will replace any existing category settings for the selected Apps.",
-    "filterAPKsByRegEx": "Filter APKs by Regular Expression",
-    "removeFromObtainium": "Remove from Obtainium",
-    "uninstallFromDevice": "Uninstall from Device",
-    "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "storagePermissionDenied": "Speicherberechtigung verweigert",
+    "selectedCategorizeWarning": "Dadurch werden alle bestehenden Kategorieeinstellungen für die ausgewählten Apps ersetzt.",
+    "filterAPKsByRegEx": "APKs nach regulärem Ausdruck filtern",
+    "removeFromObtainium": "Aus Obtainium entfernen",
+    "uninstallFromDevice": "Vom Gerät deinstallieren",
+    "onlyWorksWithNonVersionDetectApps": "Funktioniert nur bei Apps mit deaktivierter Versionserkennung.",
+    "releaseDateAsVersion": "Veröffentlichungsdatum als Version verwenden",
+    "releaseDateAsVersionExplanation": "Diese Option sollte nur für Apps verwendet werden, bei denen die Versionserkennung nicht korrekt funktioniert, aber ein Veröffentlichungsdatum verfügbar ist.",
+    "changes": "Änderungen",
+    "releaseDate": "Veröffentlichungsdatum",
+    "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
+    "versionDetection": "Versionserkennung",
+    "standardVersionDetection": "Standardversionserkennung",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "App entfernen?"

assets/translations/en.json

@@ -213,6 +213,13 @@
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
     "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "releaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "changes": "Changes",
+    "releaseDate": "Release Date",
+    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/fa.json

@@ -213,6 +213,13 @@
     "removeFromObtainium": "از Obtainium حذف کنید",
     "uninstallFromDevice": "حذف نصب از دستگاه",
     "onlyWorksWithNonVersionDetectApps": "فقط برای برنامه‌هایی کار می‌کند که تشخیص نسخه غیرفعال است.",
+    "releaseDateAsVersion": "از تاریخ انتشار به عنوان نسخه استفاده کنید",
+    "releaseDateAsVersionExplanation": "این گزینه فقط باید برای برنامه هایی استفاده شود که تشخیص نسخه به درستی کار نمی کند، اما تاریخ انتشار در دسترس است.",
+    "changes": "تغییرات",
+    "releaseDate": "تاریخ انتشار",
+    "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
+    "versionDetection": "تشخیص نسخه",
+    "standardVersionDetection": "تشخیص نسخه استاندارد",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

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'.",
@@ -56,7 +56,7 @@
     "appsString": "Appok",
     "noApps": "Nincs App",
     "noAppsForFilter": "Nincsenek appok a szűrőhöz",
-    "byX": "{} által",
+    "byX": "Fejlesztő: {}",
     "percentProgress": "Folyamat: {}%",
     "pleaseWait": "Kis türelmet",
     "updateAvailable": "Frissítés érhető el",
@@ -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.",
@@ -191,7 +191,7 @@
     "update": "Frissít",
     "markUpdated": "Frissítettnek jelöl",
     "additionalOptions": "További lehetőségek",
-    "disableVersionDetection": "Verzióérzékelés letiltása",
+    "disableVersionDetection": "Verzió érzékelés letiltása",
     "noVersionDetectionExplanation": "Ezt a beállítást csak olyan alkalmazásoknál szabad használni, ahol a verzióérzékelés nem működik megfelelően.",
     "downloadingX": "{} letöltés",
     "downloadNotifDescription": "Értesíti a felhasználót az app letöltésének előrehaladásáról",
@@ -212,6 +212,13 @@
     "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.",
+    "releaseDateAsVersion": "Használja a Kiadás dátumát, mint verziót",
+    "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": "Változtatások",
+    "releaseDate": "Kiadás dátuma",
+    "importFromURLsInFile": "Importálás fájlban található URL-ből (mint pl. OPML)",
+    "versionDetection": "Verzió érzékelés",
+    "standardVersionDetection": "Alapért. verzió érzékelés",
     "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,6 +213,13 @@
     "removeFromObtainium": "Rimuovi da Obtainium",
     "uninstallFromDevice": "Disinstalla dal dispositivo",
     "onlyWorksWithNonVersionDetectApps": "Funziona solo per le App con il rilevamento della versione disattivato.",
+    "releaseDateAsVersion": "Usa data di rilascio come versione",
+    "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": "Novità",
+    "releaseDate": "Data di rilascio",
+    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -107,7 +107,7 @@
     "line": "行",
     "searchX": "{}で検索",
     "noResults": "結果は見つかりませんでした",
-    "importX": "{}をインポートする",
+    "importX": "{}をインポート",
     "importedAppsIdDisclaimer": "インポートしたアプリが「未インストール」と表示されることがあります。\nこれを解決するには、Obtainiumから再インストールしてください。\nアプリのデータには影響しません。\n\nURLとサードパーティのインポートメソッドにのみ影響します。",
     "importErrors": "インポートエラー",
     "importedXOfYApps": "{} / {} アプリをインポートしました",
@@ -213,6 +213,13 @@
     "removeFromObtainium": "Obtainiumから削除する",
     "uninstallFromDevice": "デバイスからアンインストールする",
     "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
+    "releaseDateAsVersion": "リリース日をバージョンとして使用する",
+    "releaseDateAsVersionExplanation": "このオプションは、バージョン検出が正しく機能しないアプリで、リリース日が利用可能な場合にのみ使用する必要があります。",
+    "changes": "変更点",
+    "releaseDate": "リリース日",
+    "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
+    "versionDetection": "バージョン検出",
+    "standardVersionDetection": "標準のバージョン検出",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -213,6 +213,13 @@
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
+    "releaseDateAsVersion": "Use Release Date as Version",
+    "releaseDateAsVersionExplanation": "This option should only be used for Apps where version detection does not work correctly, but a release date is available.",
+    "changes": "Changes",
+    "releaseDate": "Release Date",
+    "importFromURLsInFile": "Import from URLs in File (like OPML)",
+    "versionDetection": "Version Detection",
+    "standardVersionDetection": "Standard version detection",
     "removeAppQuestion": {
         "one": "删除应用？",
         "other": "删除应用？"

lib/app_sources/apkmirror.dart

@@ -1,5 +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';
 
@@ -7,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
@@ -28,12 +49,38 @@ 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) {
-      String? titleString = parse(res.body)
-          .querySelector('item')
-          ?.querySelector('title')
-          ?.innerHtml;
+      var items = parse(res.body).querySelectorAll('item');
+      dynamic targetRelease;
+      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(' ')
+          .sublist(0, 5)
+          .join(' ');
+      DateTime? releaseDate =
+          dateString != null ? HttpDate.parse('$dateString GMT') : null;
       String? version = titleString
           ?.substring(RegExp('[0-9]').firstMatch(titleString)?.start ?? 0,
               RegExp(' by ').firstMatch(titleString)?.start ?? 0)
@@ -44,7 +91,8 @@ class APKMirror extends AppSource {
       if (version == null || version.isEmpty) {
         throw NoVersionError();
       }
-      return APKDetails(version, [], getAppNames(standardUrl));
+      return APKDetails(version, [], getAppNames(standardUrl),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/codeberg.dart

@@ -54,9 +54,9 @@ class Codeberg extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'];
+    bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'];
+        additionalSettings['fallbackToOlderReleases'] == true;
     String? regexFilter =
         (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
                     ?.isNotEmpty ==
@@ -112,11 +112,15 @@ class Codeberg extends AppSource {
         throw NoReleasesError();
       }
       String? version = targetRelease['tag_name'];
+      DateTime? releaseDate = targetRelease['published_at'] != null
+          ? DateTime.parse(targetRelease['published_at'])
+          : null;
       if (version == null) {
         throw NoVersionError();
       }
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl));
+          getAppNames(standardUrl),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/fdroidrepo.dart

@@ -69,6 +69,8 @@ class FDroidRepo extends AppSource {
           foundApps[0].querySelector('name')?.innerHtml ?? appIdOrName;
       var releases = foundApps[0].querySelectorAll('package');
       String? latestVersion = releases[0].querySelector('version')?.innerHtml;
+      String? added = releases[0].querySelector('added')?.innerHtml;
+      DateTime? releaseDate = added != null ? DateTime.parse(added) : null;
       if (latestVersion == null) {
         throw NoVersionError();
       }
@@ -78,7 +80,8 @@ class FDroidRepo extends AppSource {
               element.querySelector('apkname') != null)
           .map((e) => '$standardUrl/${e.querySelector('apkname')!.innerHtml}')
           .toList();
-      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName));
+      return APKDetails(latestVersion, apkUrls, AppNames(authorName, appName),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/github.dart

@@ -101,9 +101,9 @@ class GitHub extends AppSource {
     String standardUrl,
     Map<String, dynamic> additionalSettings,
   ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'];
+    bool includePrereleases = additionalSettings['includePrereleases'] == true;
     bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'];
+        additionalSettings['fallbackToOlderReleases'] == true;
     String? regexFilter =
         (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
                     ?.isNotEmpty ==
@@ -154,11 +154,15 @@ class GitHub extends AppSource {
         throw NoReleasesError();
       }
       String? version = targetRelease['tag_name'];
+      DateTime? releaseDate = targetRelease['published_at'] != null
+          ? DateTime.parse(targetRelease['published_at'])
+          : null;
       if (version == null) {
         throw NoVersionError();
       }
       return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl));
+          getAppNames(standardUrl),
+          releaseDate: releaseDate);
     } else {
       rateLimitErrorCheck(res);
       throw getObtainiumHttpError(res);

lib/app_sources/gitlab.dart

@@ -54,10 +54,14 @@ class GitLab extends AppSource {
       var entryId = entry?.querySelector('id')?.innerHtml;
       var version =
           entryId == null ? null : Uri.parse(entryId).pathSegments.last;
+      var releaseDateString = entry?.querySelector('updated')?.innerHtml;
+      DateTime? releaseDate =
+          releaseDateString != null ? DateTime.parse(releaseDateString) : null;
       if (version == null) {
         throw NoVersionError();
       }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl));
+      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
+          releaseDate: releaseDate);
     } else {
       throw getObtainiumHttpError(res);
     }

lib/app_sources/html.dart

@@ -27,6 +27,10 @@ class HTML extends AppSource {
           .where((element) => element.toLowerCase().endsWith('.apk'))
           .toList();
       links.sort((a, b) => a.split('/').last.compareTo(b.split('/').last));
+      if (additionalSettings['apkFilterRegEx'] != null) {
+        var reg = RegExp(additionalSettings['apkFilterRegEx']);
+        links = links.where((element) => reg.hasMatch(element)).toList();
+      }
       if (links.isEmpty) {
         throw NoReleasesError();
       }
@@ -37,7 +41,9 @@ class HTML extends AppSource {
           .map((e) => e.toLowerCase().startsWith('http://') ||
                   e.toLowerCase().startsWith('https://')
               ? e
-              : '${uri.origin}/$e')
+              : e.startsWith('/')
+                  ? '${uri.origin}/$e'
+                  : '${uri.origin}/${uri.path}/$e')
           .toList();
       return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
     } else {

lib/app_sources/steammobile.dart

@@ -10,7 +10,10 @@ class SteamMobile extends AppSource {
     host = 'store.steampowered.com';
     name = tr('steam');
     additionalSourceAppSpecificSettingFormItems = [
-      [GeneratedFormDropdown('app', apks.entries.toList(), label: tr('app'))]
+      [
+        GeneratedFormDropdown('app', apks.entries.toList(),
+            label: tr('app'), defaultValue: apks.entries.toList()[0].key)
+      ]
     ];
   }
 
@@ -35,7 +38,8 @@ class SteamMobile extends AppSource {
       if (apkNamePrefix == null) {
         throw NoReleasesError();
       }
-      String apkInURLRegexPattern = '/$apkNamePrefix-[^/]+\\.apk\$';
+      String apkInURLRegexPattern =
+          '/$apkNamePrefix-([0-9]+\\.)*[0-9]+\\.apk\$';
       var links = parse(res.body)
           .querySelectorAll('a')
           .map((e) => e.attributes['href'] ?? '')

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.10.10';
+const String currentVersion = '0.11.7';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 
@@ -211,6 +211,14 @@ class _ObtainiumState extends State<Obtainium> {
               false)
         ]);
       }
+      if (!supportedLocales
+              .map((e) => e.languageCode)
+              .contains(context.locale.languageCode) ||
+          settingsProvider.forcedLocale == null &&
+              context.deviceLocale.languageCode !=
+                  context.locale.languageCode) {
+        settingsProvider.resetLocaleSafe(context);
+      }
       // Register the background update task according to the user's setting
       if (existingUpdateInterval != settingsProvider.updateInterval) {
         if (existingUpdateInterval != -1) {

lib/pages/add_app.dart

@@ -71,8 +71,6 @@ class _AddAppPageState extends State<AddAppPage> {
       var settingsProvider = context.read<SettingsProvider>();
       () async {
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
-        var userPickedNoVersionDetection =
-            additionalSettings['noVersionDetection'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
             // ignore: use_build_context_synchronously
@@ -93,7 +91,21 @@ class _AddAppPageState extends State<AddAppPage> {
                 null) {
           cont = false;
         }
-        if (userPickedNoVersionDetection &&
+        if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
+            // ignore: use_build_context_synchronously
+            await showDialog(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return GeneratedFormModal(
+                        title: tr('releaseDateAsVersion'),
+                        items: const [],
+                        message: tr('releaseDateAsVersionExplanation'),
+                      );
+                    }) ==
+                null) {
+          cont = false;
+        }
+        if (additionalSettings['versionDetection'] == 'noVersionDetection' &&
             // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
@@ -112,13 +124,12 @@ class _AddAppPageState extends State<AddAppPage> {
           var trackOnly = pickedSource!.enforceTrackOnly || userPickedTrackOnly;
           App app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
-              trackOnlyOverride: trackOnly,
-              noVersionDetectionOverride: userPickedNoVersionDetection);
+              trackOnlyOverride: trackOnly);
           if (!trackOnly) {
             await settingsProvider.getInstallPermission();
           }
           // Only download the APK here if you need to for the package ID
-          if (sourceProvider.isTempId(app.id) &&
+          if (sourceProvider.isTempId(app) &&
               app.additionalSettings['trackOnly'] != true) {
             // ignore: use_build_context_synchronously
             var apkUrl = await appsProvider.confirmApkUrl(app, context);

lib/pages/app.dart

@@ -42,8 +42,6 @@ class _AppPageState extends State<AppPage> {
       getUpdate(app.app.id);
     }
     var trackOnly = app?.app.additionalSettings['trackOnly'] == true;
-    var noVersionDetection =
-        app?.app.additionalSettings['noVersionDetection'] == true;
 
     var infoColumn = Column(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -113,7 +111,7 @@ class _AppPageState extends State<AppPage> {
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        const SizedBox(height: 150),
+        const SizedBox(height: 125),
         app?.installedInfo != null
             ? Row(mainAxisAlignment: MainAxisAlignment.center, children: [
                 Image.memory(
@@ -136,6 +134,21 @@ class _AppPageState extends State<AppPage> {
           textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.headlineMedium,
         ),
+        const SizedBox(
+          height: 8,
+        ),
+        Text(
+          app?.app.id ?? '',
+          textAlign: TextAlign.center,
+          style: Theme.of(context).textTheme.labelSmall,
+        ),
+        app?.app.releaseDate == null
+            ? const SizedBox.shrink()
+            : Text(
+                app!.app.releaseDate.toString(),
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.labelSmall,
+              ),
         const SizedBox(
           height: 32,
         ),
@@ -192,7 +205,8 @@ class _AppPageState extends State<AppPage> {
                   child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        if (noVersionDetection &&
+                        if (app?.app.additionalSettings['versionDetection'] !=
+                                'standardVersionDetection' &&
                             !trackOnly &&
                             app?.app.installedVersion != null &&
                             app?.app.installedVersion != app?.app.latestVersion)
@@ -268,19 +282,49 @@ class _AppPageState extends State<AppPage> {
                                             );
                                           }).then((values) {
                                         if (app != null && values != null) {
-                                          var changedApp = app.app;
-                                          changedApp.additionalSettings =
-                                              values;
+                                          Map<String, dynamic>
+                                              originalSettings =
+                                              app.app.additionalSettings;
+                                          app.app.additionalSettings = values;
                                           if (source.enforceTrackOnly) {
-                                            changedApp.additionalSettings[
+                                            app.app.additionalSettings[
                                                 'trackOnly'] = true;
                                             showError(
                                                 tr('appsFromSourceAreTrackOnly'),
                                                 context);
                                           }
-                                          appsProvider.saveApps(
-                                              [changedApp]).then((value) {
-                                            getUpdate(changedApp.id);
+                                          if (app.app.additionalSettings[
+                                                  'versionDetection'] ==
+                                              'releaseDateAsVersion') {
+                                            if (originalSettings[
+                                                    'versionDetection'] !=
+                                                'releaseDateAsVersion') {
+                                              if (app.app.releaseDate != null) {
+                                                bool isUpdated =
+                                                    app.app.installedVersion ==
+                                                        app.app.latestVersion;
+                                                app.app.latestVersion = app
+                                                    .app
+                                                    .releaseDate!
+                                                    .microsecondsSinceEpoch
+                                                    .toString();
+                                                if (isUpdated) {
+                                                  app.app.installedVersion =
+                                                      app.app.latestVersion;
+                                                }
+                                              }
+                                            }
+                                          } else if (originalSettings[
+                                                  'versionDetection'] ==
+                                              'releaseDateAsVersion') {
+                                            app.app.installedVersion = app
+                                                    .installedInfo
+                                                    ?.versionName ??
+                                                app.app.installedVersion;
+                                          }
+                                          appsProvider.saveApps([app.app]).then(
+                                              (value) {
+                                            getUpdate(app.app.id);
                                           });
                                         }
                                       });

lib/pages/apps.dart

@@ -54,12 +54,12 @@ class AppsPageState extends State<AppsPage> {
   Widget build(BuildContext context) {
     var appsProvider = context.watch<AppsProvider>();
     var settingsProvider = context.watch<SettingsProvider>();
-    var sortedApps = appsProvider.apps.values.toList();
+    var listedApps = appsProvider.apps.values.toList();
     var currentFilterIsUpdatesOnly =
         filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);
 
     selectedApps = selectedApps
-        .where((element) => sortedApps.map((e) => e.app).contains(element))
+        .where((element) => listedApps.map((e) => e.app).contains(element))
         .toSet();
 
     toggleAppSelected(App app) {
@@ -72,7 +72,7 @@ class AppsPageState extends State<AppsPage> {
       });
     }
 
-    sortedApps = sortedApps.where((app) {
+    listedApps = listedApps.where((app) {
       if (app.app.installedVersion == app.app.latestVersion &&
           !(filter.includeUptodate)) {
         return false;
@@ -111,7 +111,7 @@ class AppsPageState extends State<AppsPage> {
       return true;
     }).toList();
 
-    sortedApps.sort((a, b) {
+    listedApps.sort((a, b) {
       var nameA = a.installedInfo?.name ?? a.app.name;
       var nameB = b.installedInfo?.name ?? b.app.name;
       int result = 0;
@@ -119,25 +119,30 @@ class AppsPageState extends State<AppsPage> {
         result = (a.app.author + nameA).compareTo(b.app.author + nameB);
       } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
         result = (nameA + a.app.author).compareTo(nameB + b.app.author);
+      } else if (settingsProvider.sortColumn ==
+          SortColumnSettings.releaseDate) {
+        result = (a.app.releaseDate)?.compareTo(
+                b.app.releaseDate ?? DateTime.fromMicrosecondsSinceEpoch(0)) ??
+            0;
       }
       return result;
     });
 
     if (settingsProvider.sortOrder == SortOrderSettings.descending) {
-      sortedApps = sortedApps.reversed.toList();
+      listedApps = listedApps.reversed.toList();
     }
 
     var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);
 
     var existingUpdateIdsAllOrSelected = existingUpdates
         .where((element) => selectedApps.isEmpty
-            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
+            ? listedApps.where((a) => a.app.id == element).isNotEmpty
             : selectedApps.map((e) => e.id).contains(element))
         .toList();
     var newInstallIdsAllOrSelected = appsProvider
         .findExistingUpdates(nonInstalledOnly: true)
         .where((element) => selectedApps.isEmpty
-            ? sortedApps.where((a) => a.app.id == element).isNotEmpty
+            ? listedApps.where((a) => a.app.id == element).isNotEmpty
             : selectedApps.map((e) => e.id).contains(element))
         .toList();
 
@@ -159,26 +164,26 @@ class AppsPageState extends State<AppsPage> {
 
     if (settingsProvider.pinUpdates) {
       var temp = [];
-      sortedApps = sortedApps.where((sa) {
+      listedApps = listedApps.where((sa) {
         if (existingUpdates.contains(sa.app.id)) {
           temp.add(sa);
           return false;
         }
         return true;
       }).toList();
-      sortedApps = [...temp, ...sortedApps];
+      listedApps = [...temp, ...listedApps];
     }
 
     var tempPinned = [];
     var tempNotPinned = [];
-    for (var a in sortedApps) {
+    for (var a in listedApps) {
       if (a.app.pinned) {
         tempPinned.add(a);
       } else {
         tempNotPinned.add(a);
       }
     }
-    sortedApps = [...tempPinned, ...tempNotPinned];
+    listedApps = [...tempPinned, ...tempNotPinned];
 
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.surface,
@@ -198,7 +203,7 @@ class AppsPageState extends State<AppsPage> {
           },
           child: CustomScrollView(slivers: <Widget>[
             CustomAppBar(title: tr('appsString')),
-            if (appsProvider.loadingApps || sortedApps.isEmpty)
+            if (appsProvider.loadingApps || listedApps.isEmpty)
               SliverFillRemaining(
                   child: Center(
                       child: appsProvider.loadingApps
@@ -225,86 +230,142 @@ class AppsPageState extends State<AppsPage> {
                 delegate: SliverChildBuilderDelegate(
                     (BuildContext context, int index) {
               String? changesUrl = SourceProvider()
-                  .getSource(sortedApps[index].app.url)
-                  .changeLogPageFromStandardUrl(sortedApps[index].app.url);
+                  .getSource(listedApps[index].app.url)
+                  .changeLogPageFromStandardUrl(listedApps[index].app.url);
               var transparent = const Color.fromARGB(0, 0, 0, 0).value;
+              var hasUpdate = listedApps[index].app.installedVersion != null &&
+                  listedApps[index].app.installedVersion !=
+                      listedApps[index].app.latestVersion;
+              var updateButton = IconButton(
+                  visualDensity: VisualDensity.compact,
+                  color: Theme.of(context).colorScheme.primary,
+                  tooltip:
+                      listedApps[index].app.additionalSettings['trackOnly'] ==
+                              true
+                          ? tr('markUpdated')
+                          : tr('update'),
+                  onPressed: appsProvider.areDownloadsRunning()
+                      ? null
+                      : () {
+                          appsProvider.downloadAndInstallLatestApps([
+                            listedApps[index].app.id
+                          ], globalNavigatorKey.currentContext).catchError((e) {
+                            showError(e, context);
+                          });
+                        },
+                  icon: Icon(
+                      listedApps[index].app.additionalSettings['trackOnly'] ==
+                              true
+                          ? Icons.check_circle_outline
+                          : Icons.install_mobile));
               return Container(
                   decoration: BoxDecoration(
                       border: Border.symmetric(
                           vertical: BorderSide(
                               width: 4,
                               color: Color(
-                                  sortedApps[index].app.categories.isNotEmpty
+                                  listedApps[index].app.categories.isNotEmpty
                                       ? settingsProvider.categories[
-                                              sortedApps[index]
+                                              listedApps[index]
                                                   .app
                                                   .categories
                                                   .first] ??
                                           transparent
                                       : transparent)))),
                   child: ListTile(
-                    tileColor: sortedApps[index].app.pinned
+                    tileColor: listedApps[index].app.pinned
                         ? Colors.grey.withOpacity(0.1)
                         : Colors.transparent,
                     selectedTileColor: Theme.of(context)
                         .colorScheme
                         .primary
-                        .withOpacity(sortedApps[index].app.pinned ? 0.2 : 0.1),
-                    selected: selectedApps.contains(sortedApps[index].app),
+                        .withOpacity(listedApps[index].app.pinned ? 0.2 : 0.1),
+                    selected: selectedApps.contains(listedApps[index].app),
                     onLongPress: () {
-                      toggleAppSelected(sortedApps[index].app);
+                      toggleAppSelected(listedApps[index].app);
                     },
-                    leading: sortedApps[index].installedInfo != null
+                    leading: listedApps[index].installedInfo != null
                         ? Image.memory(
-                            sortedApps[index].installedInfo!.icon!,
+                            listedApps[index].installedInfo!.icon!,
                             gaplessPlayback: true,
                           )
-                        : null,
+                        : Row(
+                            mainAxisSize: MainAxisSize.min,
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                                Transform(
+                                    alignment: Alignment.center,
+                                    transform: Matrix4.rotationZ(0.31),
+                                    child: Padding(
+                                      padding: const EdgeInsets.all(15),
+                                      child: Image(
+                                        image: const AssetImage(
+                                            'assets/graphics/icon_small.png'),
+                                        color: Colors.white.withOpacity(0.1),
+                                        colorBlendMode: BlendMode.modulate,
+                                        gaplessPlayback: true,
+                                      ),
+                                    )),
+                              ]),
                     title: Text(
-                      sortedApps[index].installedInfo?.name ??
-                          sortedApps[index].app.name,
+                      maxLines: 1,
+                      listedApps[index].installedInfo?.name ??
+                          listedApps[index].app.name,
                       style: TextStyle(
-                        fontWeight: sortedApps[index].app.pinned
+                        overflow: TextOverflow.ellipsis,
+                        fontWeight: listedApps[index].app.pinned
                             ? FontWeight.bold
                             : FontWeight.normal,
                       ),
                     ),
                     subtitle: Text(
-                        tr('byX', args: [sortedApps[index].app.author]),
+                        tr('byX', args: [listedApps[index].app.author]),
+                        maxLines: 1,
                         style: TextStyle(
-                            fontWeight: sortedApps[index].app.pinned
+                            overflow: TextOverflow.ellipsis,
+                            fontWeight: listedApps[index].app.pinned
                                 ? FontWeight.bold
                                 : FontWeight.normal)),
-                    trailing: SingleChildScrollView(
-                        reverse: true,
-                        child: sortedApps[index].downloadProgress != null
-                            ? Text(tr('percentProgress', args: [
-                                sortedApps[index]
-                                        .downloadProgress
-                                        ?.toInt()
-                                        .toString() ??
-                                    '100'
-                              ]))
-                            : (Column(
+                    trailing: listedApps[index].downloadProgress != null
+                        ? Text(tr('percentProgress', args: [
+                            listedApps[index]
+                                    .downloadProgress
+                                    ?.toInt()
+                                    .toString() ??
+                                '100'
+                          ]))
+                        : (Row(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              hasUpdate
+                                  ? updateButton
+                                  : const SizedBox.shrink(),
+                              hasUpdate
+                                  ? const SizedBox(
+                                      width: 10,
+                                    )
+                                  : const SizedBox.shrink(),
+                              Column(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 crossAxisAlignment: CrossAxisAlignment.end,
                                 children: [
-                                  SizedBox(
-                                      width: 100,
-                                      child: Text(
-                                        '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
-                                        overflow: TextOverflow.fade,
-                                        textAlign: TextAlign.end,
-                                      )),
-                                  sortedApps[index].app.installedVersion !=
-                                              null &&
-                                          sortedApps[index]
-                                                  .app
-                                                  .installedVersion !=
-                                              sortedApps[index]
-                                                  .app
-                                                  .latestVersion
-                                      ? GestureDetector(
+                                  Row(
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        Container(
+                                            constraints: const BoxConstraints(
+                                                maxWidth: 150),
+                                            child: Text(
+                                              '${listedApps[index].app.installedVersion ?? tr('notInstalled')}${listedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                              overflow: TextOverflow.ellipsis,
+                                              textAlign: TextAlign.end,
+                                            )),
+                                      ]),
+                                  Row(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      GestureDetector(
                                           onTap: changesUrl == null
                                               ? null
                                               : () {
@@ -312,37 +373,39 @@ class AppsPageState extends State<AppsPage> {
                                                       mode: LaunchMode
                                                           .externalApplication);
                                                 },
-                                          child: appsProvider
-                                                  .areDownloadsRunning()
-                                              ? Text(tr('pleaseWait'))
-                                              : Text(
-                                                  '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBracketsShort')}' : ''}',
-                                                  style: TextStyle(
-                                                      fontStyle:
-                                                          FontStyle.italic,
-                                                      decoration: changesUrl ==
-                                                              null
-                                                          ? TextDecoration.none
-                                                          : TextDecoration
-                                                              .underline),
-                                                ))
-                                      : const SizedBox(),
+                                          child: Text(
+                                            listedApps[index].app.releaseDate ==
+                                                    null
+                                                ? tr('changes')
+                                                : DateFormat('yyyy-MM-dd')
+                                                    .format(listedApps[index]
+                                                        .app
+                                                        .releaseDate!),
+                                            style: const TextStyle(
+                                                fontStyle: FontStyle.italic,
+                                                decoration:
+                                                    TextDecoration.underline),
+                                          ))
+                                    ],
+                                  ),
                                 ],
-                              ))),
+                              )
+                            ],
+                          )),
                     onTap: () {
                       if (selectedApps.isNotEmpty) {
-                        toggleAppSelected(sortedApps[index].app);
+                        toggleAppSelected(listedApps[index].app);
                       } else {
                         Navigator.push(
                           context,
                           MaterialPageRoute(
                               builder: (context) =>
-                                  AppPage(appId: sortedApps[index].app.id)),
+                                  AppPage(appId: listedApps[index].app.id)),
                         );
                       }
                     },
                   ));
-            }, childCount: sortedApps.length))
+            }, childCount: listedApps.length))
           ])),
       persistentFooterButtons: appsProvider.apps.isEmpty
           ? null
@@ -354,20 +417,20 @@ class AppsPageState extends State<AppsPage> {
                           style: const ButtonStyle(
                               visualDensity: VisualDensity.compact),
                           onPressed: () {
-                            selectThese(sortedApps.map((e) => e.app).toList());
+                            selectThese(listedApps.map((e) => e.app).toList());
                           },
                           icon: Icon(
                             Icons.select_all_outlined,
                             color: Theme.of(context).colorScheme.primary,
                           ),
-                          label: Text(sortedApps.length.toString()))
+                          label: Text(listedApps.length.toString()))
                       : TextButton.icon(
                           style: const ButtonStyle(
                               visualDensity: VisualDensity.compact),
                           onPressed: () {
                             selectedApps.isEmpty
                                 ? selectThese(
-                                    sortedApps.map((e) => e.app).toList())
+                                    listedApps.map((e) => e.app).toList())
                                 : clearSelected();
                           },
                           icon: Icon(
@@ -653,7 +716,7 @@ class AppsPageState extends State<AppsPage> {
                                                                                   onPressed: () {
                                                                                     HapticFeedback.selectionClick();
                                                                                     appsProvider.saveApps(selectedApps.map((a) {
-                                                                                      if (a.installedVersion != null && a.additionalSettings['noVersionDetection'] == true) {
+                                                                                      if (a.installedVersion != null && a.additionalSettings['versionDetection'] != 'standardVersionDetection') {
                                                                                         a.installedVersion = a.latestVersion;
                                                                                       }
                                                                                       return a;

lib/pages/import_export.dart

@@ -41,6 +41,66 @@ class _ImportExportPageState extends State<ImportExportPage> {
       ),
     );
 
+    urlListImport({String? initValue, bool overrideInitValid = false}) {
+      showDialog<Map<String, dynamic>?>(
+          context: context,
+          builder: (BuildContext ctx) {
+            return GeneratedFormModal(
+              initValid: overrideInitValid,
+              title: tr('importFromURLList'),
+              items: [
+                [
+                  GeneratedFormTextField('appURLList',
+                      defaultValue: initValue ?? '',
+                      label: tr('appURLList'),
+                      max: 7,
+                      additionalValidators: [
+                        (dynamic value) {
+                          if (value != null && value.isNotEmpty) {
+                            var lines = value.trim().split('\n');
+                            for (int i = 0; i < lines.length; i++) {
+                              try {
+                                sourceProvider.getSource(lines[i]);
+                              } catch (e) {
+                                return '${tr('line')} ${i + 1}: $e';
+                              }
+                            }
+                          }
+                          return null;
+                        }
+                      ])
+                ]
+              ],
+            );
+          }).then((values) {
+        if (values != null) {
+          var urls = (values['appURLList'] as String).split('\n');
+          setState(() {
+            importInProgress = true;
+          });
+          appsProvider.addAppsByURL(urls).then((errors) {
+            if (errors.isEmpty) {
+              showError(tr('importedX', args: [plural('apps', urls.length)]),
+                  context);
+            } else {
+              showDialog(
+                  context: context,
+                  builder: (BuildContext ctx) {
+                    return ImportErrorDialog(
+                        urlsLength: urls.length, errors: errors);
+                  });
+            }
+          }).catchError((e) {
+            showError(e, context);
+          }).whenComplete(() {
+            setState(() {
+              importInProgress = false;
+            });
+          });
+        }
+      });
+    }
+
     return Scaffold(
         backgroundColor: Theme.of(context).colorScheme.surface,
         body: CustomScrollView(slivers: <Widget>[
@@ -150,88 +210,60 @@ class _ImportExportPageState extends State<ImportExportPage> {
                           ],
                         )
                       else
-                        const Divider(
-                          height: 32,
-                        ),
-                      TextButton(
-                          onPressed: importInProgress
-                              ? null
-                              : () {
-                                  showDialog<Map<String, dynamic>?>(
-                                      context: context,
-                                      builder: (BuildContext ctx) {
-                                        return GeneratedFormModal(
-                                          title: tr('importFromURLList'),
-                                          items: [
-                                            [
-                                              GeneratedFormTextField(
-                                                  'appURLList',
-                                                  label: tr('appURLList'),
-                                                  max: 7,
-                                                  additionalValidators: [
-                                                    (dynamic value) {
-                                                      if (value != null &&
-                                                          value.isNotEmpty) {
-                                                        var lines = value
-                                                            .trim()
-                                                            .split('\n');
-                                                        for (int i = 0;
-                                                            i < lines.length;
-                                                            i++) {
-                                                          try {
-                                                            sourceProvider
-                                                                .getSource(
-                                                                    lines[i]);
-                                                          } catch (e) {
-                                                            return '${tr('line')} ${i + 1}: $e';
-                                                          }
-                                                        }
-                                                      }
-                                                      return null;
-                                                    }
-                                                  ])
-                                            ]
-                                          ],
-                                        );
-                                      }).then((values) {
-                                    if (values != null) {
-                                      var urls =
-                                          (values['appURLList'] as String)
-                                              .split('\n');
-                                      setState(() {
-                                        importInProgress = true;
-                                      });
-                                      appsProvider
-                                          .addAppsByURL(urls)
-                                          .then((errors) {
-                                        if (errors.isEmpty) {
-                                          showError(
-                                              tr('importedX', args: [
-                                                plural('apps', urls.length)
-                                              ]),
-                                              context);
-                                        } else {
-                                          showDialog(
-                                              context: context,
-                                              builder: (BuildContext ctx) {
-                                                return ImportErrorDialog(
-                                                    urlsLength: urls.length,
-                                                    errors: errors);
-                                              });
-                                        }
-                                      }).catchError((e) {
-                                        showError(e, context);
-                                      }).whenComplete(() {
-                                        setState(() {
-                                          importInProgress = false;
+                        Column(
+                          children: [
+                            const Divider(
+                              height: 32,
+                            ),
+                            TextButton(
+                                onPressed: importInProgress
+                                    ? null
+                                    : () {
+                                        urlListImport();
+                                      },
+                                child: Text(
+                                  tr('importFromURLList'),
+                                )),
+                            const SizedBox(height: 8),
+                            TextButton(
+                                onPressed: importInProgress
+                                    ? null
+                                    : () {
+                                        FilePicker.platform
+                                            .pickFiles()
+                                            .then((result) {
+                                          if (result != null) {
+                                            urlListImport(
+                                                overrideInitValid: true,
+                                                initValue:
+                                                    RegExp('https?://[^"]+')
+                                                        .allMatches(File(result
+                                                                .files
+                                                                .single
+                                                                .path!)
+                                                            .readAsStringSync())
+                                                        .map((e) =>
+                                                            e.input.substring(
+                                                                e.start, e.end))
+                                                        .toSet()
+                                                        .toList()
+                                                        .where((url) {
+                                                  try {
+                                                    sourceProvider
+                                                        .getSource(url);
+                                                    return true;
+                                                  } catch (e) {
+                                                    return false;
+                                                  }
+                                                }).join('\n'));
+                                          }
                                         });
-                                      });
-                                    }
-                                  });
-                                },
-                          child: Text(
-                            tr('importFromURLList'),
-                          )),
+                                      },
+                                child: Text(
+                                  tr('importFromURLsInFile'),
+                                )),
+                          ],
+                        ),
                       ...sourceProvider.sources
                           .where((element) => element.canSearch)
                           .map((source) => Column(
@@ -280,6 +312,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                     if (urlsWithDescriptions
                                                         .isNotEmpty) {
                                                       var selectedUrls =
+                                                          // ignore: use_build_context_synchronously
                                                           await showDialog<
                                                                   List<
                                                                       String>?>(
@@ -314,6 +347,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                   ]),
                                                               context);
                                                         } else {
+                                                          // ignore: use_build_context_synchronously
                                                           showDialog(
                                                               context: context,
                                                               builder:
@@ -391,6 +425,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                         e.toString())
                                                                     .toList());
                                                     var selectedUrls =
+                                                        // ignore: use_build_context_synchronously
                                                         await showDialog<
                                                                 List<String>?>(
                                                             context: context,
@@ -418,6 +453,7 @@ class _ImportExportPageState extends State<ImportExportPage> {
                                                                 ]),
                                                             context);
                                                       } else {
+                                                        // ignore: use_build_context_synchronously
                                                         showDialog(
                                                             context: context,
                                                             builder:

lib/pages/settings.dart

@@ -87,6 +87,7 @@ class _SettingsPageState extends State<SettingsPage> {
         });
 
     var sortDropdown = DropdownButtonFormField(
+        isExpanded: true,
         decoration: InputDecoration(labelText: tr('appSortBy')),
         value: settingsProvider.sortColumn,
         items: [
@@ -101,6 +102,10 @@ class _SettingsPageState extends State<SettingsPage> {
           DropdownMenuItem(
             value: SortColumnSettings.added,
             child: Text(tr('asAdded')),
+          ),
+          DropdownMenuItem(
+            value: SortColumnSettings.releaseDate,
+            child: Text(tr('releaseDate')),
           )
         ],
         onChanged: (value) {
@@ -110,6 +115,7 @@ class _SettingsPageState extends State<SettingsPage> {
         });
 
     var orderDropdown = DropdownButtonFormField(
+        isExpanded: true,
         decoration: InputDecoration(labelText: tr('appSortOrder')),
         value: settingsProvider.sortOrder,
         items: [
@@ -146,7 +152,7 @@ class _SettingsPageState extends State<SettingsPage> {
           if (value != null) {
             context.setLocale(Locale(value));
           } else {
-            context.resetLocale();
+            settingsProvider.resetLocaleSafe(context);
           }
         });
 

lib/providers/apps_provider.dart

@@ -182,7 +182,7 @@ class AppsProvider with ChangeNotifier {
     // The former case should be handled (give the App its real ID), the latter is a security issue
     var newInfo = await PackageArchiveInfo.fromPath(downloadedFile.path);
     if (app.id != newInfo.packageName) {
-      if (apps[app.id] != null && !SourceProvider().isTempId(app.id)) {
+      if (apps[app.id] != null && !SourceProvider().isTempId(app)) {
         throw IDChangedError();
       }
       var originalAppId = app.id;
@@ -467,8 +467,8 @@ class AppsProvider with ChangeNotifier {
   App? getCorrectedInstallStatusAppIfPossible(App app, AppInfo? installedInfo) {
     var modded = false;
     var trackOnly = app.additionalSettings['trackOnly'] == true;
-    var noVersionDetection =
-        app.additionalSettings['noVersionDetection'] == true;
+    var noVersionDetection = app.additionalSettings['versionDetection'] !=
+        'standardVersionDetection';
     if (installedInfo == null && app.installedVersion != null && !trackOnly) {
       app.installedVersion = null;
       modded = true;

lib/providers/settings_provider.dart

@@ -6,7 +6,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:obtainium/app_sources/github.dart';
-import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/main.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -18,7 +17,7 @@ enum ThemeSettings { system, light, dark }
 
 enum ColourSettings { basic, materialYou }
 
-enum SortColumnSettings { added, nameAuthor, authorName }
+enum SortColumnSettings { added, nameAuthor, authorName, releaseDate }
 
 enum SortOrderSettings { ascending, descending }
 
@@ -179,4 +178,15 @@ class SettingsProvider with ChangeNotifier {
 
   bool setEqual(Set<String> a, Set<String> b) =>
       a.length == b.length && a.union(b).length == a.length;
+
+  void resetLocaleSafe(BuildContext context) {
+    if (context.supportedLocales
+        .map((e) => e.languageCode)
+        .contains(context.deviceLocale.languageCode)) {
+      context.resetLocale();
+    } else {
+      context.setLocale(context.fallbackLocale!);
+      context.deleteSaveLocale();
+    }
+  }
 }

lib/providers/source_provider.dart

@@ -33,8 +33,9 @@ class APKDetails {
   late String version;
   late List<String> apkUrls;
   late AppNames names;
+  late DateTime? releaseDate;
 
-  APKDetails(this.version, this.apkUrls, this.names);
+  APKDetails(this.version, this.apkUrls, this.names, {this.releaseDate});
 }
 
 class App {
@@ -50,6 +51,7 @@ class App {
   late DateTime? lastUpdateCheck;
   bool pinned = false;
   List<String> categories;
+  late DateTime? releaseDate;
   App(
       this.id,
       this.url,
@@ -62,7 +64,8 @@ class App {
       this.additionalSettings,
       this.lastUpdateCheck,
       this.pinned,
-      {this.categories = const []});
+      {this.categories = const [],
+      this.releaseDate});
 
   @override
   String toString() {
@@ -97,6 +100,20 @@ class App {
       additionalSettings['noVersionDetection'] =
           json['noVersionDetection'] == 'true' || json['trackOnly'] == true;
     }
+    // Convert bool style version detection options to dropdown style
+    if (additionalSettings['noVersionDetection'] == true) {
+      additionalSettings['versionDetection'] = 'noVersionDetection';
+    }
+    if (additionalSettings['releaseDateAsVersion'] == true) {
+      additionalSettings['versionDetection'] = 'releaseDateAsVersion';
+      additionalSettings.remove('releaseDateAsVersion');
+    }
+    if (additionalSettings['noVersionDetection'] != null) {
+      additionalSettings.remove('noVersionDetection');
+    }
+    if (additionalSettings['releaseDateAsVersion'] != null) {
+      additionalSettings.remove('releaseDateAsVersion');
+    }
     // Ensure additionalSettings are correctly typed
     for (var item in formItems) {
       if (additionalSettings[item.key] != null) {
@@ -111,30 +128,34 @@ class App {
       preferredApkIndex = 0;
     }
     return App(
-        json['id'] as String,
-        json['url'] as String,
-        json['author'] as String,
-        json['name'] as String,
-        json['installedVersion'] == null
-            ? null
-            : json['installedVersion'] as String,
-        json['latestVersion'] as String,
-        json['apkUrls'] == null
-            ? []
-            : List<String>.from(jsonDecode(json['apkUrls'])),
-        preferredApkIndex,
-        additionalSettings,
-        json['lastUpdateCheck'] == null
-            ? null
-            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
-        json['pinned'] ?? false,
-        categories: json['categories'] != null
-            ? (json['categories'] as List<dynamic>)
-                .map((e) => e.toString())
-                .toList()
-            : json['category'] != null
-                ? [json['category'] as String]
-                : []);
+      json['id'] as String,
+      json['url'] as String,
+      json['author'] as String,
+      json['name'] as String,
+      json['installedVersion'] == null
+          ? null
+          : json['installedVersion'] as String,
+      json['latestVersion'] as String,
+      json['apkUrls'] == null
+          ? []
+          : List<String>.from(jsonDecode(json['apkUrls'])),
+      preferredApkIndex,
+      additionalSettings,
+      json['lastUpdateCheck'] == null
+          ? null
+          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
+      json['pinned'] ?? false,
+      categories: json['categories'] != null
+          ? (json['categories'] as List<dynamic>)
+              .map((e) => e.toString())
+              .toList()
+          : json['category'] != null
+              ? [json['category'] as String]
+              : [],
+      releaseDate: json['releaseDate'] == null
+          ? null
+          : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
+    );
   }
 
   Map<String, dynamic> toJson() => {
@@ -149,7 +170,8 @@ class App {
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'categories': categories
+        'categories': categories,
+        'releaseDate': releaseDate?.microsecondsSinceEpoch
       };
 }
 
@@ -226,7 +248,16 @@ class AppSource {
       )
     ],
     [
-      GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
+      GeneratedFormDropdown(
+          'versionDetection',
+          [
+            MapEntry(
+                'standardVersionDetection', tr('standardVersionDetection')),
+            MapEntry('releaseDateAsVersion', tr('releaseDateAsVersion')),
+            MapEntry('noVersionDetection', tr('noVersionDetection'))
+          ],
+          label: tr('versionDetection'),
+          defaultValue: 'standardVersionDetection')
     ],
     [
       GeneratedFormTextField('apkFilterRegEx',
@@ -350,41 +381,29 @@ class SourceProvider {
     return false;
   }
 
-  String generateTempID(AppNames names, AppSource source) =>
-      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
+  String generateTempID(
+          String standardUrl, Map<String, dynamic> additionalSettings) =>
+      (standardUrl + additionalSettings.toString()).hashCode.toString();
 
-  bool isTempId(String id) {
-    List<String> parts = id.split('_');
-    if (parts.length < 3) {
-      return false;
-    }
-    for (int i = 0; i < parts.length - 1; i++) {
-      if (RegExp('.*[A-Z].*').hasMatch(parts[i])) {
-        // TODO: Look into RegEx for non-Latin characters
-        return false;
-      }
-    }
-    return true;
+  bool isTempId(App app) {
+    // return app.id == generateTempID(app.url, app.additionalSettings);
+    return RegExp('^[0-9]+\$').hasMatch(app.id);
   }
 
   Future<App> getApp(
-    AppSource source,
-    String url,
-    Map<String, dynamic> additionalSettings, {
-    App? currentApp,
-    bool trackOnlyOverride = false,
-    noVersionDetectionOverride = false,
-  }) async {
+      AppSource source, String url, Map<String, dynamic> additionalSettings,
+      {App? currentApp, bool trackOnlyOverride = false}) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
-    if (noVersionDetectionOverride) {
-      additionalSettings['noVersionDetection'] = true;
-    }
     var trackOnly = additionalSettings['trackOnly'] == true;
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['versionDetection'] == 'releaseDateAsVersion' &&
+        apk.releaseDate != null) {
+      apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();
+    }
     if (additionalSettings['apkFilterRegEx'] != null) {
       var reg = RegExp(additionalSettings['apkFilterRegEx']);
       apk.apkUrls =
@@ -400,7 +419,7 @@ class SourceProvider {
         currentApp?.id ??
             source.tryInferringAppId(standardUrl,
                 additionalSettings: additionalSettings) ??
-            generateTempID(apk.names, source),
+            generateTempID(standardUrl, additionalSettings),
         standardUrl,
         apk.names.author[0].toUpperCase() + apk.names.author.substring(1),
         name.trim().isNotEmpty
@@ -413,7 +432,8 @@ class SourceProvider {
         additionalSettings,
         DateTime.now(),
         currentApp?.pinned ?? false,
-        categories: currentApp?.categories ?? const []);
+        categories: currentApp?.categories ?? const [],
+        releaseDate: apk.releaseDate);
   }
 
   // Returns errors in [results, errors] instead of throwing them

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: "direct main"
     description:
       name: android_alarm_manager_plus
-      sha256: "71e796198588e0038dd125bf8c91683b3237b938ffad037413245c689b87ae28"
+      sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   android_intent_plus:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: ebd110b60723334bdc6eeb373116d6c52e9bed8feb9dcbd9f034531f56636e31
+      sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   animations:
     dependency: "direct main"
     description:
@@ -25,22 +25,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.7"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.6"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   async:
     dependency: transitive
     description:
@@ -65,22 +57,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -97,14 +73,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.17.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
   cross_file:
     dependency: transitive
     description:
@@ -149,10 +117,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "7ff671ed0a6356fa8f2e1ae7d3558d3fb7b6a41e24455e4f8df75b811fb8e4ab"
+      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "8.1.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -230,14 +198,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.2"
-  flutter_launcher_icons:
-    dependency: "direct dev"
-    description:
-      name: flutter_launcher_icons
-      sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -258,10 +218,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f6c1611e0c4a88a382691a97bb3c3feb24cc0c0b54152b8b5fb7ffb837f7fbf"
+      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.0+1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -279,10 +239,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -297,18 +257,18 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1"
+      sha256: "2f9c4d3f4836421f7067a28f8939814597b27614e021da9d63e5d3fb6e212d25"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.2"
+    version: "8.2.1"
   html:
     dependency: "direct main"
     description:
       name: html
-      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.1"
+    version: "0.15.2"
   http:
     dependency: "direct main"
     description:
@@ -325,14 +285,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.0"
   install_plugin_v2:
     dependency: "direct main"
     description:
@@ -365,14 +317,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.5"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.8.0"
   lints:
     dependency: transitive
     description:
@@ -449,50 +393,50 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.0.23"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.9"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   permission_handler:
     dependency: "direct main"
     description:
@@ -553,18 +497,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.2"
+    version: "2.1.4"
   process:
     dependency: transitive
     description:
@@ -585,10 +521,10 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: e387077716f80609bb979cd199331033326033ecd1c8f200a90c5f57b1c9f55e
+      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   share_plus_platform_interface:
     dependency: transitive
     description:
@@ -601,58 +537,58 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9"
+      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.0.18"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
+      sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "2b55c18636a4edc529fa5cd44c03d3f3100c00513f518c5127c951978efcccd0"
+      sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
+      sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
+      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
+      sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
+      sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -670,10 +606,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f"
+      sha256: "851d5040552cf911f4cabda08d003eca76b27da3ed0002978272e27c8fbf8ecc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4+1"
+    version: "2.2.5"
   sqflite_common:
     dependency: transitive
     description:
@@ -750,66 +686,66 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.8"
+    version: "6.1.10"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
+      sha256: "1f4d9ebe86f333c15d318f81dcdc08b01d45da44af74552608455ebdc08d9732"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.23"
+    version: "6.0.24"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: c9cd648d2f7ab56968e049d4e9116f96a85517f1dd806b96a86ea1018a3a82e5
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.18"
+    version: "6.1.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: e29039160ab3730e42f3d811dc2a6d5f2864b90a70fb765ea60144b03307f682
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
+      sha256: "2dddb3291a57b074dade66b5e07e64401dd2487caefd4e9e2f467138d8c7eb06"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "574cfbe2390666003c3a1d129bdc4574aaa6728f0c00a4829a81c316de69dd9b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.0.15"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: "97c9067950a0d09cbd93e2e3f0383d1403989362b97102fbf446473a48079a4b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
   uuid:
     dependency: transitive
     description:
@@ -830,34 +766,34 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: f7ec234830f86d0ef2bd664e8460b0038b8c1a83ff076035cad74ac70273753c
+      sha256: b6cd42db3ced5411f3d01599906156885b18e4188f7065a8a351eb84bee347e0
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.6"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "5f49a6e5fc59e21fcec5e1bbcd401afbee9792a24a4f3d9cef9b5bb0cd1e3767"
+      sha256: "5dd3f32b5c2d8f4bf9d05a349e4a65fa718eb137f396f336c3893d558a58fe84"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.4"
+    version: "3.3.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "8b2262dda5d26eabc600a7282a8c16a9473a0c765526afb0ffc33eef912f7968"
+      sha256: df6472164b3f4eaf3280422227f361dc8424b106726b7f21d79a8656ba53f71f
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "92e7e7fa468f1df597fb9d37bcf1f303175cbe147c4dbdf06ecc323d950116eb"
+      sha256: "87b6353b40e04f04d5f895a484ad6d92d682d9cce4d2d5b32d2d8aca2448d46e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.2.0"
   win32:
     dependency: transitive
     description:
@@ -882,14 +818,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.2"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
 sdks:
   dart: ">=2.18.2 <3.0.0"
   flutter: ">=3.4.0-17.0.pre"

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.10.10+116 # When changing this, update the tag in main() accordingly
+version: 0.11.7+128 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'
@@ -64,7 +64,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: ^0.11.0
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
@@ -73,12 +72,6 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.1
 
-flutter_icons:
-  android: true
-  image_path: "assets/graphics/icon.png"
-  adaptive_icon_background: "#FFFFFF"
-  adaptive_icon_foreground: "assets/graphics/icon.png"
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -97,6 +90,7 @@ flutter:
   
   assets:
     - assets/translations/
+    - assets/graphics/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware