Merge pull request #495 from ImranR98/dev

HTML Source Bugfix (#288) + Better Placeholder Icon Visibility (#490)
Increment version, update packages
2025-10-28 12:03:45 +01:00 · 2023-04-28 22:25:30 -04:00 · 2023-04-28 22:24:41 -04:00 · 2023-04-28 22:23:26 -04:00 · 2023-04-28 22:22:55 -04:00 · 2023-04-28 22:18:58 -04:00
35 changed files with 569 additions and 374 deletions
--- a/assets/translations/de.json
+++ b/assets/translations/de.json
@@ -122,6 +122,7 @@
    "followSystem": "System folgen",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "App sortieren nach",
    "authorName": "Autor/Name",
    "nameAuthor": "Name/Autor",
@@ -221,10 +222,11 @@
    "importFromURLsInFile": "Importieren von URLs aus Datei ( z.B. OPML)",
    "versionDetection": "Versionserkennung",
    "standardVersionDetection": "Standardversionserkennung",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "Nach Kategorie gruppieren",
+    "autoApkFilterByArch": "Nach Möglichkeit versuchen, APKs nach CPU-Architektur zu filtern",
    "removeAppQuestion": {
        "one": "App entfernen?",
-        "other": "App entfernen?"
+        "other": "Apps entfernen?"
    },
    "tooManyRequestsTryAgainInMinutes": {
        "one": "Zu viele Anfragen (Rate begrenzt) - versuchen Sie es in {} Minute erneut",
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -122,6 +122,7 @@
    "followSystem": "Follow System",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "App Sort By",
    "authorName": "Author/Name",
    "nameAuthor": "Name/Author",
@@ -222,6 +223,7 @@
    "versionDetection": "Version Detection",
    "standardVersionDetection": "Standard version detection",
    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
    "removeAppQuestion": {
        "one": "Remove App?",
        "other": "Remove Apps?"
--- a/assets/translations/fa.json
+++ b/assets/translations/fa.json
@@ -122,6 +122,7 @@
    "followSystem": "هماهنگ با سیستم",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "مرتب سازی برنامه بر اساس",
    "authorName": "سازنده/اسم",
    "nameAuthor": "اسم/سازنده",
@@ -207,7 +208,7 @@
    "addCategory": "اضافه کردن دسته",
    "label": "برچسب",
    "language": "زبان",
-    "copiedToClipboard": "Copied to Clipboard",
+    "copiedToClipboard": "در کلیپ بورد کپی شد",
    "storagePermissionDenied": "مجوز ذخیره سازی رد شد",
    "selectedCategorizeWarning": "این جایگزین تنظیمات دسته بندی موجود برای برنامه های انتخابی می شود.",
    "filterAPKsByRegEx": "فایل‌های APK را با نظم فیلتر کنید",
@@ -221,7 +222,8 @@
    "importFromURLsInFile": "وارد کردن از آدرس های اینترنتی موجود در فایل (مانند OPML)",
    "versionDetection": "تشخیص نسخه",
    "standardVersionDetection": "تشخیص نسخه استاندارد",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "گروه بر اساس دسته",
+    "autoApkFilterByArch": "در صورت امکان سعی کنید APKها را بر اساس معماری CPU فیلتر کنید",
    "removeAppQuestion": {
        "one": "برنامه حذف شود؟",
        "other": "برنامه ها حذف شوند؟"
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -122,6 +122,7 @@
    "followSystem": "Suivre le système",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "Applications triées par",
    "authorName": "Auteur/Nom",
    "nameAuthor": "Nom/Auteur",
@@ -222,6 +223,7 @@
    "versionDetection": "Détection des versions",
    "standardVersionDetection": "Détection de version standard",
    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
    "removeAppQuestion": {
        "one": "Supprimer l'application ?",
        "other": "Supprimer les applications ?"
--- a/assets/translations/hu.json
+++ b/assets/translations/hu.json
@@ -122,6 +122,7 @@
    "followSystem": "Rendszer szerint",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Használjon tiszta fekete sötét témát",
    "appSortBy": "App rendezés...",
    "authorName": "Szerző/Név",
    "nameAuthor": "Név/Szerző",
@@ -206,7 +207,7 @@
    "addCategory": "Új kategória",
    "label": "Címke",
    "language": "Nyelv",
-    "copiedToClipboard": "Copied to Clipboard",
+    "copiedToClipboard": "Másolva a vágólapra",
    "storagePermissionDenied": "Tárhely engedély megtagadva",
    "selectedCategorizeWarning": "Ez felváltja a kiválasztott alkalmazások meglévő kategória-beállításait.",
    "filterAPKsByRegEx": "Az APK-k szűrése reguláris kifejezéssel",
@@ -221,6 +222,7 @@
    "versionDetection": "Verzió érzékelés",
    "standardVersionDetection": "Alapért. verzió érzékelés",
    "groupByCategory": "Csoportosítás Kategória alapján",
+    "autoApkFilterByArch": "Ha lehetséges, próbálja CPU architektúra szerint szűrni az APK-kat",
    "removeAppQuestion": {
        "one": "Eltávolítja az alkalmazást?",
        "other": "Eltávolítja az alkalmazást?"
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@@ -122,6 +122,7 @@
    "followSystem": "Segui sistema",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "App ordinate per",
    "authorName": "Autore/Nome",
    "nameAuthor": "Nome/Autore",
@@ -207,7 +208,7 @@
    "addCategory": "Aggiungi categoria",
    "label": "Etichetta",
    "language": "Lingua",
-    "copiedToClipboard": "Copied to Clipboard",
+    "copiedToClipboard": "Copiato negli appunti",
    "storagePermissionDenied": "Accesso ai file non autorizzato",
    "selectedCategorizeWarning": "Ciò sostituirà le impostazioni di categoria esistenti per le App selezionate.",
    "filterAPKsByRegEx": "Filtra file APK con espressioni regolari",
@@ -221,7 +222,8 @@
    "importFromURLsInFile": "Importa da URL in file (come OPML)",
    "versionDetection": "Rilevamento di versione",
    "standardVersionDetection": "Rilevamento di versione standard",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "Raggruppa per categoria",
+    "autoApkFilterByArch": "Tenta di filtrare gli APK in base all'architettura della CPU, se possibile",
    "removeAppQuestion": {
        "one": "Rimuovere l'App?",
        "other": "Rimuovere le App?"
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -122,6 +122,7 @@
    "followSystem": "システムに従う",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "アプリの並び方",
    "authorName": "作者名/アプリ名",
    "nameAuthor": "アプリ名/作者名",
@@ -221,7 +222,8 @@
    "importFromURLsInFile": "ファイル（OPMLなど）内のURLからインポート",
    "versionDetection": "バージョン検出",
    "standardVersionDetection": "標準のバージョン検出",
-    "groupByCategory": "Group by Category",
+    "groupByCategory": "カテゴリ別にグループ化する",
+    "autoApkFilterByArch": "可能であれば，CPUアーキテクチャによるAPKのフィルタリングを試みる",
    "removeAppQuestion": {
        "one": "アプリを削除しますか？",
        "other": "アプリを削除しますか？"
--- a/assets/translations/zh.json
+++ b/assets/translations/zh.json
@@ -123,6 +123,7 @@
    "followSystem": "跟随系统",
    "obtainium": "Obtainium",
    "materialYou": "Material You",
+    "useBlackTheme": "Use pure black dark theme",
    "appSortBy": "排列方式",
    "authorName": "作者 / 名字",
    "nameAuthor": "名字 / 作者",
@@ -222,6 +223,7 @@
    "versionDetection": "Version Detection",
    "standardVersionDetection": "Standard version detection",
    "groupByCategory": "Group by Category",
+    "autoApkFilterByArch": "Attempt to filter APKs by CPU architecture if possible",
    "removeAppQuestion": {
        "one": "删除应用？",
        "other": "删除应用？"
--- a/lib/app_sources/codeberg.dart
+++ b/lib/app_sources/codeberg.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:http/http.dart';
+import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/components/generated_form.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
@@ -35,6 +36,8 @@ class Codeberg extends AppSource {
    canSearch = true;
  }

+  var gh = GitHub();
+
  @override
  String standardizeURL(String url) {
    RegExp standardUrlRegEx = RegExp('^https?://$host/[^/]+/[^/]+');
@@ -54,78 +57,10 @@ class Codeberg extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
-    bool includePrereleases = additionalSettings['includePrereleases'] == true;
-    bool fallbackToOlderReleases =
-        additionalSettings['fallbackToOlderReleases'] == true;
-    String? regexFilter =
-        (additionalSettings['filterReleaseTitlesByRegEx'] as String?)
-                    ?.isNotEmpty ==
-                true
-            ? additionalSettings['filterReleaseTitlesByRegEx']
-            : null;
-    Response res = await get(Uri.parse(
-        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
-    if (res.statusCode == 200) {
-      var releases = jsonDecode(res.body) as List<dynamic>;
-
-      List<String> getReleaseAPKUrls(dynamic release) =>
-          (release['assets'] as List<dynamic>?)
-              ?.map((e) {
-                return e['name'] != null && e['browser_download_url'] != null
-                    ? MapEntry(e['name'] as String,
-                        e['browser_download_url'] as String)
-                    : const MapEntry('', '');
-              })
-              .where((element) => element.key.toLowerCase().endsWith('.apk'))
-              .map((e) => e.value)
-              .toList() ??
-          [];
-
-      dynamic targetRelease;
-
-      for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
-        if (!includePrereleases && releases[i]['prerelease'] == true) {
-          continue;
-        }
-        if (releases[i]['draft'] == true) {
-          // Draft releases not supported
-        }
-        var nameToFilter = releases[i]['name'] as String?;
-        if (nameToFilter == null || nameToFilter.trim().isEmpty) {
-          // Some leave titles empty so tag is used
-          nameToFilter = releases[i]['tag_name'] as String;
-        }
-        if (regexFilter != null &&
-            !RegExp(regexFilter).hasMatch(nameToFilter.trim())) {
-          continue;
-        }
-        var apkUrls = getReleaseAPKUrls(releases[i]);
-        if (apkUrls.isEmpty && additionalSettings['trackOnly'] != true) {
-          continue;
-        }
-        targetRelease = releases[i];
-        targetRelease['apkUrls'] = apkUrls;
-        break;
-      }
-      if (targetRelease == null) {
-        throw NoReleasesError();
-      }
-      String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
-      if (version == null) {
-        throw NoVersionError();
-      }
-      var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
-          getAppNames(standardUrl),
-          releaseDate: releaseDate,
-          changeLog: changeLog.isEmpty ? null : changeLog);
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+    return gh.getLatestAPKDetailsCommon(
+        'https://$host/api/v1/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
+        standardUrl,
+        additionalSettings);
  }

  AppNames getAppNames(String standardUrl) {
@@ -136,20 +71,9 @@ class Codeberg extends AppSource {

  @override
  Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
-        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100'));
-    if (res.statusCode == 200) {
-      Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['data'] as List<dynamic>)) {
-        urlsWithDescriptions.addAll({
-          e['html_url'] as String: e['description'] != null
-              ? e['description'] as String
-              : tr('noDescription')
-        });
-      }
-      return urlsWithDescriptions;
-    } else {
-      throw getObtainiumHttpError(res);
-    }
+    return gh.searchCommon(
+        query,
+        'https://$host/api/v1/repos/search?q=${Uri.encodeQueryComponent(query)}&limit=100',
+        'data');
  }
 }
--- a/lib/app_sources/fdroid.dart
+++ b/lib/app_sources/fdroid.dart
@@ -50,7 +50,7 @@ class FDroid extends AppSource {
          .where((element) => element['versionName'] == latestVersion)
          .map((e) => '${apkUrlPrefix}_${e['versionCode']}.apk')
          .toList();
-      return APKDetails(latestVersion, apkUrls,
+      return APKDetails(latestVersion, getApkUrlsFromUrls(apkUrls),
          AppNames(name, Uri.parse(standardUrl).pathSegments.last));
    } else {
      throw getObtainiumHttpError(res);
--- a/lib/app_sources/fdroidrepo.dart
+++ b/lib/app_sources/fdroidrepo.dart
@@ -80,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, getApkUrlsFromUrls(apkUrls),
+          AppNames(authorName, appName),
          releaseDate: releaseDate);
    } else {
      throw getObtainiumHttpError(res);
--- a/lib/app_sources/github.dart
+++ b/lib/app_sources/github.dart
@@ -96,11 +96,9 @@ class GitHub extends AppSource {
  String? changeLogPageFromStandardUrl(String standardUrl) =>
      '$standardUrl/releases';

-  @override
-  Future<APKDetails> getLatestAPKDetails(
-    String standardUrl,
-    Map<String, dynamic> additionalSettings,
-  ) async {
+  Future<APKDetails> getLatestAPKDetailsCommon(String requestUrl,
+      String standardUrl, Map<String, dynamic> additionalSettings,
+      {Function(Response)? onHttpErrorCode}) async {
    bool includePrereleases = additionalSettings['includePrereleases'] == true;
    bool fallbackToOlderReleases =
        additionalSettings['fallbackToOlderReleases'] == true;
@@ -110,27 +108,50 @@ class GitHub extends AppSource {
                true
            ? additionalSettings['filterReleaseTitlesByRegEx']
            : null;
-    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100'));
+    Response res = await get(Uri.parse(requestUrl));
    if (res.statusCode == 200) {
      var releases = jsonDecode(res.body) as List<dynamic>;

-      List<String> getReleaseAPKUrls(dynamic release) =>
+      List<MapEntry<String, String>> getReleaseAPKUrls(dynamic release) =>
          (release['assets'] as List<dynamic>?)
              ?.map((e) {
-                return e['browser_download_url'] != null
-                    ? e['browser_download_url'] as String
-                    : '';
+                return e['name'] != null && e['browser_download_url'] != null
+                    ? MapEntry(e['name'] as String,
+                        e['browser_download_url'] as String)
+                    : const MapEntry('', '');
              })
-              .where((element) => element.toLowerCase().endsWith('.apk'))
+              .where((element) => element.key.toLowerCase().endsWith('.apk'))
              .toList() ??
          [];

+      DateTime? getReleaseDateFromRelease(dynamic rel) =>
+          rel?['published_at'] != null
+              ? DateTime.parse(rel['published_at'])
+              : null;
+      releases.sort((a, b) {
+        // See #478
+        if (a == b) {
+          return 0;
+        } else if (a == null) {
+          return -1;
+        } else if (b == null) {
+          return 1;
+        } else {
+          return getReleaseDateFromRelease(a)!
+              .compareTo(getReleaseDateFromRelease(b)!);
+        }
+      });
+      releases = releases.reversed.toList();
      dynamic targetRelease;
-
+      var prerrelsSkipped = 0;
      for (int i = 0; i < releases.length; i++) {
-        if (!fallbackToOlderReleases && i > 0) break;
+        if (!fallbackToOlderReleases && i > prerrelsSkipped) break;
        if (!includePrereleases && releases[i]['prerelease'] == true) {
+          prerrelsSkipped++;
+          continue;
+        }
+        if (releases[i]['draft'] == true) {
+          // Draft releases not supported
          continue;
        }
        var nameToFilter = releases[i]['name'] as String?;
@@ -154,36 +175,51 @@ class GitHub extends AppSource {
        throw NoReleasesError();
      }
      String? version = targetRelease['tag_name'];
-      DateTime? releaseDate = targetRelease['published_at'] != null
-          ? DateTime.parse(targetRelease['published_at'])
-          : null;
+      DateTime? releaseDate = getReleaseDateFromRelease(targetRelease);
      if (version == null) {
        throw NoVersionError();
      }
      var changeLog = targetRelease['body'].toString();
-      return APKDetails(version, targetRelease['apkUrls'] as List<String>,
+      return APKDetails(
+          version,
+          targetRelease['apkUrls'] as List<MapEntry<String, String>>,
          getAppNames(standardUrl),
          releaseDate: releaseDate,
          changeLog: changeLog.isEmpty ? null : changeLog);
    } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
      throw getObtainiumHttpError(res);
    }
  }

+  @override
+  Future<APKDetails> getLatestAPKDetails(
+    String standardUrl,
+    Map<String, dynamic> additionalSettings,
+  ) async {
+    return getLatestAPKDetailsCommon(
+        'https://${await getCredentialPrefixIfAny()}api.$host/repos${standardUrl.substring('https://$host'.length)}/releases?per_page=100',
+        standardUrl,
+        additionalSettings, onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
  AppNames getAppNames(String standardUrl) {
    String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
    List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
    return AppNames(names[0], names[1]);
  }

-  @override
-  Future<Map<String, String>> search(String query) async {
-    Response res = await get(Uri.parse(
-        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100'));
+  Future<Map<String, String>> searchCommon(
+      String query, String requestUrl, String rootProp,
+      {Function(Response)? onHttpErrorCode}) async {
+    Response res = await get(Uri.parse(requestUrl));
    if (res.statusCode == 200) {
      Map<String, String> urlsWithDescriptions = {};
-      for (var e in (jsonDecode(res.body)['items'] as List<dynamic>)) {
+      for (var e in (jsonDecode(res.body)[rootProp] as List<dynamic>)) {
        urlsWithDescriptions.addAll({
          e['html_url'] as String:
              ((e['archived'] == true ? '[ARCHIVED] ' : '') +
@@ -194,11 +230,23 @@ class GitHub extends AppSource {
      }
      return urlsWithDescriptions;
    } else {
-      rateLimitErrorCheck(res);
+      if (onHttpErrorCode != null) {
+        onHttpErrorCode(res);
+      }
      throw getObtainiumHttpError(res);
    }
  }

+  @override
+  Future<Map<String, String>> search(String query) async {
+    return searchCommon(
+        query,
+        'https://${await getCredentialPrefixIfAny()}api.$host/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
+        'items', onHttpErrorCode: (Response res) {
+      rateLimitErrorCheck(res);
+    });
+  }
+
  rateLimitErrorCheck(Response res) {
    if (res.headers['x-ratelimit-remaining'] == '0') {
      throw RateLimitError(
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@@ -3,10 +3,19 @@ import 'package:http/http.dart';
 import 'package:obtainium/app_sources/github.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/providers/source_provider.dart';
+import 'package:obtainium/components/generated_form.dart';
+import 'package:easy_localization/easy_localization.dart';

 class GitLab extends AppSource {
  GitLab() {
    host = 'gitlab.com';
+
+    additionalSourceAppSpecificSettingFormItems = [
+      [
+        GeneratedFormSwitch('fallbackToOlderReleases',
+            label: tr('fallbackToOlderReleases'), defaultValue: true)
+      ]
+    ];
  }

  @override
@@ -28,40 +37,58 @@ class GitLab extends AppSource {
    String standardUrl,
    Map<String, dynamic> additionalSettings,
  ) async {
+    bool fallbackToOlderReleases =
+        additionalSettings['fallbackToOlderReleases'] == true;
    Response res = await get(Uri.parse('$standardUrl/-/tags?format=atom'));
    if (res.statusCode == 200) {
      var standardUri = Uri.parse(standardUrl);
      var parsedHtml = parse(res.body);
-      var entry = parsedHtml.querySelector('entry');
-      var entryContent =
-          parse(parseFragment(entry?.querySelector('content')!.innerHtml).text);
-      var apkUrls = [
-        ...getLinksFromParsedHTML(
-            entryContent,
-            RegExp(
-                '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
-                  return '\\${x[0]}';
-                })}/uploads/[^/]+/[^/]+\\.apk\$',
-                caseSensitive: false),
-            standardUri.origin),
-        // GitLab releases may contain links to externally hosted APKs
-        ...getLinksFromParsedHTML(entryContent,
-                RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
-            .where((element) => Uri.parse(element).host != '')
-            .toList()
-      ];
+      var apkDetailsList = parsedHtml.querySelectorAll('entry').map((entry) {
+        var entryContent = parse(
+            parseFragment(entry.querySelector('content')!.innerHtml).text);
+        var apkUrls = [
+          ...getLinksFromParsedHTML(
+              entryContent,
+              RegExp(
+                  '^${standardUri.path.replaceAllMapped(RegExp(r'[.*+?^${}()|[\]\\]'), (x) {
+                    return '\\${x[0]}';
+                  })}/uploads/[^/]+/[^/]+\\.apk\$',
+                  caseSensitive: false),
+              standardUri.origin),
+          // GitLab releases may contain links to externally hosted APKs
+          ...getLinksFromParsedHTML(entryContent,
+                  RegExp('/[^/]+\\.apk\$', caseSensitive: false), '')
+              .where((element) => Uri.parse(element).host != '')
+              .toList()
+        ];

-      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();
+        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, getApkUrlsFromUrls(apkUrls),
+            GitHub().getAppNames(standardUrl),
+            releaseDate: releaseDate);
+      });
+      if (apkDetailsList.isEmpty) {
+        throw NoReleasesError();
      }
-      return APKDetails(version, apkUrls, GitHub().getAppNames(standardUrl),
-          releaseDate: releaseDate);
+      if (fallbackToOlderReleases) {
+        if (additionalSettings['trackOnly'] != true) {
+          apkDetailsList =
+              apkDetailsList.where((e) => e.apkUrls.isNotEmpty).toList();
+        }
+        if (apkDetailsList.isEmpty) {
+          throw NoReleasesError();
+        }
+      }
+      return apkDetailsList.first;
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/html.dart
+++ b/lib/app_sources/html.dart
@@ -34,15 +34,27 @@ class HTML extends AppSource {
      var rel = links.last;
      var apkName = rel.split('/').last;
      var version = apkName.substring(0, apkName.length - 4);
-      List<String> apkUrls = [rel]
-          .map((e) => e.toLowerCase().startsWith('http://') ||
-                  e.toLowerCase().startsWith('https://')
-              ? e
-              : e.startsWith('/')
-                  ? '${uri.origin}/$e'
-                  : '${uri.origin}/${uri.path}/$e')
-          .toList();
-      return APKDetails(version, apkUrls, AppNames(uri.host, tr('app')));
+      List<String> apkUrls = [rel].map((e) {
+        try {
+          Uri.parse(e).origin;
+          return e;
+        } catch (err) {
+          // is relative
+        }
+        var currPathSegments = uri.path
+            .split('/')
+            .where((element) => element.trim().isNotEmpty)
+            .toList();
+        if (e.startsWith('/') || currPathSegments.isEmpty) {
+          return '${uri.origin}/$e';
+        } else if (e.split('/').length == 1) {
+          return '${uri.origin}/${currPathSegments.join('/')}/$e';
+        } else {
+          return '${uri.origin}/${currPathSegments.sublist(0, currPathSegments.length - 1).join('/')}/$e';
+        }
+      }).toList();
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(uri.host, tr('app')));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/mullvad.dart
+++ b/lib/app_sources/mullvad.dart
@@ -58,7 +58,7 @@ class Mullvad extends AppSource {
      }
      return APKDetails(
          versions[0],
-          ['https://mullvad.net/download/app/apk/latest'],
+          getApkUrlsFromUrls(['https://mullvad.net/download/app/apk/latest']),
          AppNames(name, 'Mullvad-VPN'),
          changeLog: changeLog);
    } else {
--- a/lib/app_sources/neutroncode.dart
+++ b/lib/app_sources/neutroncode.dart
@@ -98,7 +98,7 @@ class NeutronCode extends AppSource {
          ? (customDateParse(dateStringOriginal))
          : null;
      var changeLogElements = http.querySelectorAll('.pd-fdesc p');
-      return APKDetails(version, [apkUrl],
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
          AppNames(runtimeType.toString(), name ?? standardUrl.split('/').last),
          releaseDate: dateString != null ? DateTime.parse(dateString) : null,
          changeLog: changeLogElements.isNotEmpty
--- a/lib/app_sources/signal.dart
+++ b/lib/app_sources/signal.dart
@@ -28,7 +28,8 @@ class Signal extends AppSource {
      if (version == null) {
        throw NoVersionError();
      }
-      return APKDetails(version, apkUrls, AppNames(name, 'Signal'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames(name, 'Signal'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/sourceforge.dart
+++ b/lib/app_sources/sourceforge.dart
@@ -31,7 +31,8 @@ class SourceForge extends AppSource {
      getVersion(String url) {
        try {
          var tokens = url.split('/');
-          return tokens[tokens.length - 3];
+          var fi = tokens.indexOf('files');
+          return tokens[tokens[fi + 2] == 'download' ? fi - 1 : fi + 1];
        } catch (e) {
          return null;
        }
@@ -50,7 +51,7 @@ class SourceForge extends AppSource {
              .toList();
      return APKDetails(
          version,
-          apkUrlList,
+          getApkUrlsFromUrls(apkUrlList),
          AppNames(
              name, standardUrl.substring(standardUrl.lastIndexOf('/') + 1)));
    } else {
--- a/lib/app_sources/steammobile.dart
+++ b/lib/app_sources/steammobile.dart
@@ -53,7 +53,8 @@ class SteamMobile extends AppSource {
      var version = links[0].substring(
          versionMatch.start + apkNamePrefix.length + 2, versionMatch.end - 4);
      var apkUrls = [links[0]];
-      return APKDetails(version, apkUrls, AppNames(name, apks[apkNamePrefix]!));
+      return APKDetails(version, getApkUrlsFromUrls(apkUrls),
+          AppNames(name, apks[apkNamePrefix]!));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/telegramapp.dart
+++ b/lib/app_sources/telegramapp.dart
@@ -32,7 +32,8 @@ class TelegramApp extends AppSource {
        throw NoVersionError();
      }
      String? apkUrl = 'https://telegram.org/dl/android/apk';
-      return APKDetails(version, [apkUrl], AppNames('Telegram', 'Telegram'));
+      return APKDetails(version, getApkUrlsFromUrls([apkUrl]),
+          AppNames('Telegram', 'Telegram'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/vlc.dart
+++ b/lib/app_sources/vlc.dart
@@ -54,7 +54,8 @@ class VLC extends AppSource {
        throw getObtainiumHttpError(res2);
      }

-      return APKDetails(version, apkUrls, AppNames('VideoLAN', 'VLC'));
+      return APKDetails(
+          version, getApkUrlsFromUrls(apkUrls), AppNames('VideoLAN', 'VLC'));
    } else {
      throw getObtainiumHttpError(res);
    }
--- a/lib/app_sources/whatsapp.dart
+++ b/lib/app_sources/whatsapp.dart
@@ -64,9 +64,9 @@ class WhatsApp extends AppSource {
          vLines[0].substring(versionMatch.start, versionMatch.end);
      return APKDetails(
          version,
-          [
+          getApkUrlsFromUrls([
            'https://www.whatsapp.com/android?v=$version&=thisIsaPlaceholder&a=realURLPrefetchedAtDownloadTime'
-          ],
+          ]),
          AppNames('Meta', 'WhatsApp'));
    } else {
      throw getObtainiumHttpError(res);
--- a/lib/components/generated_form.dart
+++ b/lib/components/generated_form.dart
@@ -267,7 +267,10 @@ class _GeneratedFormState extends State<GeneratedForm> {
          formInputs[r][e] = Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
-              Text(widget.items[r][e].label),
+              Flexible(child: Text(widget.items[r][e].label)),
+              const SizedBox(
+                width: 8,
+              ),
              Switch(
                  value: values[widget.items[r][e].key],
                  onChanged: (value) {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -21,7 +21,7 @@ import 'package:easy_localization/src/easy_localization_controller.dart';
 // ignore: implementation_imports
 import 'package:easy_localization/src/localization.dart';

-const String currentVersion = '0.11.24';
+const String currentVersion = '0.11.35';
 const String currentReleaseTag =
    'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES

@@ -263,6 +263,14 @@ class _ObtainiumState extends State<Obtainium> {
        darkColorScheme = ColorScheme.fromSeed(
            seedColor: defaultThemeColour, brightness: Brightness.dark);
      }
+
+      // set the background and surface colors to pure black in the amoled theme
+      if (settingsProvider.useBlackTheme) {
+        darkColorScheme = darkColorScheme
+            .copyWith(background: Colors.black, surface: Colors.black)
+            .harmonized();
+      }
+
      return MaterialApp(
          title: 'Obtainium',
          localizationsDelegates: context.localizationDelegates,
--- a/lib/pages/add_app.dart
+++ b/lib/pages/add_app.dart
@@ -127,7 +127,8 @@ class _AddAppPageState extends State<AddAppPage> {
            if (apkUrl == null) {
              throw ObtainiumError(tr('cancelled'));
            }
-            app.preferredApkIndex = app.apkUrls.indexOf(apkUrl);
+            app.preferredApkIndex =
+                app.apkUrls.map((e) => e.value).toList().indexOf(apkUrl.value);
            // ignore: use_build_context_synchronously
            var downloadedApk = await appsProvider.downloadApp(
                app, globalNavigatorKey.currentContext);
--- a/lib/pages/app.dart
+++ b/lib/pages/app.dart
@@ -38,7 +38,7 @@ class _AppPageState extends State<AppPage> {
    bool areDownloadsRunning = appsProvider.areDownloadsRunning();

    var sourceProvider = SourceProvider();
-    AppInMemory? app = appsProvider.apps[widget.appId];
+    AppInMemory? app = appsProvider.apps[widget.appId]?.deepCopy();
    var source = app != null ? sourceProvider.getSource(app.app.url) : null;
    if (!areDownloadsRunning && prevApp == null && app != null) {
      prevApp = app;
@@ -153,7 +153,7 @@ class _AppPageState extends State<AppPage> {
              height: 25,
            ),
            Text(
-              app?.app.name ?? tr('app'),
+              app?.name ?? tr('app'),
              textAlign: TextAlign.center,
              style: Theme.of(context).textTheme.displayLarge,
            ),
@@ -268,9 +268,7 @@ class _AppPageState extends State<AppPage> {
            }).toList();

            return GeneratedFormModal(
-              title: tr('additionalOptions'),
-              items: items,
-            );
+                title: tr('additionalOptions'), items: items);
          });
    }

@@ -307,6 +305,15 @@ class _AppPageState extends State<AppPage> {
      }
    }

+    getResetInstallStatusButton() => TextButton(
+        onPressed: app?.app == null
+            ? null
+            : () {
+                app!.app.installedVersion = null;
+                appsProvider.saveApps([app.app]);
+              },
+        child: Text(tr('resetInstallStatus')));
+
    getInstallOrUpdateButton() => TextButton(
        onPressed: (app?.app.installedVersion == null ||
                    app?.app.installedVersion != app?.app.latestVersion) &&
@@ -386,7 +393,7 @@ class _AppPageState extends State<AppPage> {
                                      scrollable: true,
                                      content: getInfoColumn(),
                                      title: Text(
-                                          '${app.app.name} ${tr('byX', args: [
+                                          '${app.name} ${tr('byX', args: [
                                            app.app.author
                                          ])}'),
                                      actions: [
@@ -402,7 +409,13 @@ class _AppPageState extends State<AppPage> {
                            icon: const Icon(Icons.more_horiz),
                            tooltip: tr('more')),
                      const SizedBox(width: 16.0),
-                      Expanded(child: getInstallOrUpdateButton()),
+                      Expanded(
+                          child: !isVersionDetectionStandard &&
+                                  app?.app.installedVersion != null &&
+                                  app?.app.installedVersion ==
+                                      app?.app.latestVersion
+                              ? getResetInstallStatusButton()
+                              : getInstallOrUpdateButton()),
                      const SizedBox(width: 16.0),
                      Expanded(
                          child: TextButton(
--- a/lib/pages/apps.dart
+++ b/lib/pages/apps.dart
@@ -29,13 +29,13 @@ class AppsPageState extends State<AppsPage> {
  final AppsFilter neutralFilter = AppsFilter();
  var updatesOnlyFilter =
      AppsFilter(includeUptodate: false, includeNonInstalled: false);
-  Set<App> selectedApps = {};
+  Set<String> selectedAppIds = {};
  DateTime? refreshingSince;

  clearSelected() {
-    if (selectedApps.isNotEmpty) {
+    if (selectedAppIds.isNotEmpty) {
      setState(() {
-        selectedApps.clear();
+        selectedAppIds.clear();
      });
      return true;
    }
@@ -43,10 +43,10 @@ class AppsPageState extends State<AppsPage> {
  }

  selectThese(List<App> apps) {
-    if (selectedApps.isEmpty) {
+    if (selectedAppIds.isEmpty) {
      setState(() {
        for (var a in apps) {
-          selectedApps.add(a);
+          selectedAppIds.add(a.id);
        }
      });
    }
@@ -57,20 +57,20 @@ class AppsPageState extends State<AppsPage> {
    var appsProvider = context.watch<AppsProvider>();
    var settingsProvider = context.watch<SettingsProvider>();
    var sourceProvider = SourceProvider();
-    var listedApps = appsProvider.apps.values.toList();
+    var listedApps = appsProvider.getAppValues().toList();
    var currentFilterIsUpdatesOnly =
        filter.isIdenticalTo(updatesOnlyFilter, settingsProvider);

-    selectedApps = selectedApps
-        .where((element) => listedApps.map((e) => e.app).contains(element))
+    selectedAppIds = selectedAppIds
+        .where((element) => listedApps.map((e) => e.app.id).contains(element))
        .toSet();

    toggleAppSelected(App app) {
      setState(() {
-        if (selectedApps.contains(app)) {
-          selectedApps.remove(app);
+        if (selectedAppIds.map((e) => e).contains(app.id)) {
+          selectedAppIds.removeWhere((a) => a == app.id);
        } else {
-          selectedApps.add(app);
+          selectedAppIds.add(app.id);
        }
      });
    }
@@ -94,8 +94,7 @@ class AppsPageState extends State<AppsPage> {
            .toList();

        for (var t in nameTokens) {
-          var name = app.installedInfo?.name ?? app.app.name;
-          if (!name.toLowerCase().contains(t.toLowerCase())) {
+          if (!app.name.toLowerCase().contains(t.toLowerCase())) {
            return false;
          }
        }
@@ -120,13 +119,13 @@ class AppsPageState extends State<AppsPage> {
    }).toList();

    listedApps.sort((a, b) {
-      var nameA = a.installedInfo?.name ?? a.app.name;
-      var nameB = b.installedInfo?.name ?? b.app.name;
      int result = 0;
      if (settingsProvider.sortColumn == SortColumnSettings.authorName) {
-        result = (a.app.author + nameA).compareTo(b.app.author + nameB);
+        result = ((a.app.author + a.name).toLowerCase())
+            .compareTo((b.app.author + b.name).toLowerCase());
      } else if (settingsProvider.sortColumn == SortColumnSettings.nameAuthor) {
-        result = (nameA + a.app.author).compareTo(nameB + b.app.author);
+        result = ((a.name + a.app.author).toLowerCase())
+            .compareTo((b.name + b.app.author).toLowerCase());
      } else if (settingsProvider.sortColumn ==
          SortColumnSettings.releaseDate) {
        result = (a.app.releaseDate)?.compareTo(
@@ -143,15 +142,15 @@ class AppsPageState extends State<AppsPage> {
    var existingUpdates = appsProvider.findExistingUpdates(installedOnly: true);

    var existingUpdateIdsAllOrSelected = existingUpdates
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
            ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
        .toList();
    var newInstallIdsAllOrSelected = appsProvider
        .findExistingUpdates(nonInstalledOnly: true)
-        .where((element) => selectedApps.isEmpty
+        .where((element) => selectedAppIds.isEmpty
            ? listedApps.where((a) => a.app.id == element).isNotEmpty
-            : selectedApps.map((e) => e.id).contains(element))
+            : selectedAppIds.map((e) => e).contains(element))
        .toList();

    List<String> trackOnlyUpdateIdsAllOrSelected = [];
@@ -206,12 +205,17 @@ class AppsPageState extends State<AppsPage> {
    var listedCategories = getListedCategories();
    listedCategories.sort((a, b) {
      return a != null && b != null
-          ? a.compareTo(b)
+          ? a.toLowerCase().compareTo(b.toLowerCase())
          : a == null
              ? 1
              : -1;
    });

+    Set<App> selectedApps = listedApps
+        .map((e) => e.app)
+        .where((a) => selectedAppIds.contains(a.id))
+        .toSet();
+
    showChangeLogDialog(
        String? changesUrl, AppSource appSource, String changeLog, int index) {
      showDialog(
@@ -220,6 +224,7 @@ class AppsPageState extends State<AppsPage> {
            return GeneratedFormModal(
              title: tr('changes'),
              items: const [],
+              message: listedApps[index].app.latestVersion,
              additionalWidgets: [
                changesUrl != null
                    ? GestureDetector(
@@ -288,7 +293,8 @@ class AppsPageState extends State<AppsPage> {
        if (refreshingSince != null)
          SliverToBoxAdapter(
            child: LinearProgressIndicator(
-              value: appsProvider.apps.values
+              value: appsProvider
+                      .getAppValues()
                      .where((element) => !(element.app.lastUpdateCheck
                              ?.isBefore(refreshingSince!) ??
                          true))
@@ -358,7 +364,7 @@ class AppsPageState extends State<AppsPage> {
                        child: Image(
                          image: const AssetImage(
                              'assets/graphics/icon_small.png'),
-                          color: Colors.white.withOpacity(0.1),
+                          color: Colors.white.withOpacity(0.3),
                          colorBlendMode: BlendMode.modulate,
                          gaplessPlayback: true,
                        ),
@@ -400,7 +406,8 @@ class AppsPageState extends State<AppsPage> {
            children: [
              Row(mainAxisSize: MainAxisSize.min, children: [
                Container(
-                    constraints: const BoxConstraints(maxWidth: 150),
+                    constraints: BoxConstraints(
+                        maxWidth: MediaQuery.of(context).size.width / 4),
                    child: Text(
                      getVersionText(index),
                      overflow: TextOverflow.ellipsis,
@@ -467,15 +474,15 @@ class AppsPageState extends State<AppsPage> {
                .colorScheme
                .primary
                .withOpacity(listedApps[index].app.pinned ? 0.2 : 0.1),
-            selected: selectedApps.contains(listedApps[index].app),
+            selected:
+                selectedAppIds.map((e) => e).contains(listedApps[index].app.id),
            onLongPress: () {
              toggleAppSelected(listedApps[index].app);
            },
            leading: getAppIcon(index),
            title: Text(
              maxLines: 1,
-              listedApps[index].installedInfo?.name ??
-                  listedApps[index].app.name,
+              listedApps[index].name,
              style: TextStyle(
                overflow: TextOverflow.ellipsis,
                fontWeight: listedApps[index].app.pinned
@@ -497,7 +504,7 @@ class AppsPageState extends State<AppsPage> {
                  ]))
                : trailingRow,
            onTap: () {
-              if (selectedApps.isNotEmpty) {
+              if (selectedAppIds.isNotEmpty) {
                toggleAppSelected(listedApps[index].app);
              } else {
                Navigator.push(
@@ -534,7 +541,7 @@ class AppsPageState extends State<AppsPage> {
    }

    getSelectAllButton() {
-      return selectedApps.isEmpty
+      return selectedAppIds.isEmpty
          ? TextButton.icon(
              style: const ButtonStyle(visualDensity: VisualDensity.compact),
              onPressed: () {
@@ -548,17 +555,17 @@ class AppsPageState extends State<AppsPage> {
          : TextButton.icon(
              style: const ButtonStyle(visualDensity: VisualDensity.compact),
              onPressed: () {
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                    ? selectThese(listedApps.map((e) => e.app).toList())
                    : clearSelected();
              },
              icon: Icon(
-                selectedApps.isEmpty
+                selectedAppIds.isEmpty
                    ? Icons.select_all_outlined
                    : Icons.deselect_outlined,
                color: Theme.of(context).colorScheme.primary,
              ),
-              label: Text(selectedApps.length.toString()));
+              label: Text(selectedAppIds.length.toString()));
    }

    getMassObtainFunction() {
@@ -706,7 +713,7 @@ class AppsPageState extends State<AppsPage> {
          builder: (BuildContext ctx) {
            return AlertDialog(
              title: Text(tr('markXSelectedAppsAsUpdated',
-                  args: [selectedApps.length.toString()])),
+                  args: [selectedAppIds.length.toString()])),
              content: Text(
                tr('onlyWorksWithNonVersionDetectApps'),
                style: const TextStyle(
@@ -749,30 +756,28 @@ class AppsPageState extends State<AppsPage> {
      Navigator.of(context).pop();
    }

-    resetSelectedAppsInstallStatuses() {
-      () async {
-        try {
-          var values = await showDialog(
-              context: context,
-              builder: (BuildContext ctx) {
-                return GeneratedFormModal(
-                  title: tr('resetInstallStatusForSelectedAppsQuestion'),
-                  items: const [],
-                  initValid: true,
-                  message: tr('installStatusOfXWillBeResetExplanation',
-                      args: [plural('app', selectedApps.length)]),
-                );
-              });
-          if (values != null) {
-            appsProvider.saveApps(selectedApps.map((e) {
-              e.installedVersion = null;
-              return e;
-            }).toList());
-          }
-        } finally {
-          Navigator.of(context).pop();
+    resetSelectedAppsInstallStatuses() async {
+      try {
+        var values = await showDialog(
+            context: context,
+            builder: (BuildContext ctx) {
+              return GeneratedFormModal(
+                title: tr('resetInstallStatusForSelectedAppsQuestion'),
+                items: const [],
+                initValid: true,
+                message: tr('installStatusOfXWillBeResetExplanation',
+                    args: [plural('app', selectedAppIds.length)]),
+              );
+            });
+        if (values != null) {
+          appsProvider.saveApps(selectedApps.map((e) {
+            e.installedVersion = null;
+            return e;
+          }).toList());
        }
-      };
+      } finally {
+        Navigator.of(context).pop();
+      }
    }

    showMoreOptionsDialog() {
@@ -820,7 +825,7 @@ class AppsPageState extends State<AppsPage> {
                        icon: const Icon(Icons.share),
                      ),
                      IconButton(
-                        onPressed: resetSelectedAppsInstallStatuses(),
+                        onPressed: resetSelectedAppsInstallStatuses,
                        tooltip: tr('resetInstallStatus'),
                        icon: const Icon(Icons.restore_page_outlined),
                      ),
@@ -836,7 +841,7 @@ class AppsPageState extends State<AppsPage> {
        children: [
          IconButton(
            visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty
+            onPressed: selectedAppIds.isEmpty
                ? null
                : () {
                    appsProvider.removeAppsWithModal(
@@ -848,7 +853,7 @@ class AppsPageState extends State<AppsPage> {
          IconButton(
              visualDensity: VisualDensity.compact,
              onPressed: getMassObtainFunction(),
-              tooltip: selectedApps.isEmpty
+              tooltip: selectedAppIds.isEmpty
                  ? tr('installUpdateApps')
                  : tr('installUpdateSelectedApps'),
              icon: const Icon(
@@ -856,13 +861,13 @@ class AppsPageState extends State<AppsPage> {
              )),
          IconButton(
            visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : launchCategorizeDialog(),
+            onPressed: selectedAppIds.isEmpty ? null : launchCategorizeDialog(),
            tooltip: tr('categorize'),
            icon: const Icon(Icons.category_outlined),
          ),
          IconButton(
            visualDensity: VisualDensity.compact,
-            onPressed: selectedApps.isEmpty ? null : showMoreOptionsDialog,
+            onPressed: selectedAppIds.isEmpty ? null : showMoreOptionsDialog,
            tooltip: tr('more'),
            icon: const Icon(Icons.more_horiz),
          ),
--- a/lib/pages/import_export.dart
+++ b/lib/pages/import_export.dart
@@ -506,7 +506,7 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
          widget.onlyOneSelectionAllowed ? tr('selectURL') : tr('selectURLs')),
      content: Column(children: [
        ...urlWithDescriptionSelections.keys.map((urlWithD) {
-          select(bool? value) {
+          selectThis(bool? value) {
            setState(() {
              value ??= false;
              if (value! && widget.onlyOneSelectionAllowed) {
@@ -517,11 +517,56 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
            });
          }

-          return Row(children: [
+          var urlLink = GestureDetector(
+              onTap: () {
+                launchUrlString(urlWithD.key,
+                    mode: LaunchMode.externalApplication);
+              },
+              child: Text(
+                Uri.parse(urlWithD.key).path.substring(1),
+                style: const TextStyle(decoration: TextDecoration.underline),
+                textAlign: TextAlign.start,
+              ));
+
+          var descriptionText = Text(
+            urlWithD.value.length > 128
+                ? '${urlWithD.value.substring(0, 128)}...'
+                : urlWithD.value,
+            style: const TextStyle(fontStyle: FontStyle.italic, fontSize: 12),
+          );
+
+          var selectedUrlsWithDs = urlWithDescriptionSelections.entries
+              .where((e) => e.value)
+              .toList();
+
+          var singleSelectTile = ListTile(
+            title: urlLink,
+            subtitle: GestureDetector(
+              onTap: () {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+              child: descriptionText,
+            ),
+            leading: Radio<String>(
+              value: urlWithD.key,
+              groupValue: selectedUrlsWithDs.isEmpty
+                  ? null
+                  : selectedUrlsWithDs.first.key.key,
+              onChanged: (value) {
+                setState(() {
+                  selectOnlyOne(urlWithD.key);
+                });
+              },
+            ),
+          );
+
+          var multiSelectTile = Row(children: [
            Checkbox(
                value: urlWithDescriptionSelections[urlWithD],
                onChanged: (value) {
-                  select(value);
+                  selectThis(value);
                }),
            const SizedBox(
              width: 8,
@@ -534,28 +579,13 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
                const SizedBox(
                  height: 8,
                ),
-                GestureDetector(
-                    onTap: () {
-                      launchUrlString(urlWithD.key,
-                          mode: LaunchMode.externalApplication);
-                    },
-                    child: Text(
-                      Uri.parse(urlWithD.key).path.substring(1),
-                      style:
-                          const TextStyle(decoration: TextDecoration.underline),
-                      textAlign: TextAlign.start,
-                    )),
+                urlLink,
                GestureDetector(
                  onTap: () {
-                    select(!(urlWithDescriptionSelections[urlWithD] ?? false));
+                    selectThis(
+                        !(urlWithDescriptionSelections[urlWithD] ?? false));
                  },
-                  child: Text(
-                    urlWithD.value.length > 128
-                        ? '${urlWithD.value.substring(0, 128)}...'
-                        : urlWithD.value,
-                    style: const TextStyle(
-                        fontStyle: FontStyle.italic, fontSize: 12),
-                  ),
+                  child: descriptionText,
                ),
                const SizedBox(
                  height: 8,
@@ -563,6 +593,10 @@ class _UrlSelectionModalState extends State<UrlSelectionModal> {
              ],
            ))
          ]);
+
+          return widget.onlyOneSelectionAllowed
+              ? singleSelectTile
+              : multiSelectTile;
        })
      ]),
      actions: [
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -224,6 +224,17 @@ class _SettingsPageState extends State<SettingsPage> {
                            ),
                            themeDropdown,
                            height16,
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(tr('useBlackTheme')),
+                                Switch(
+                                    value: settingsProvider.useBlackTheme,
+                                    onChanged: (value) {
+                                      settingsProvider.useBlackTheme = value;
+                                    })
+                              ],
+                            ),
                            colourDropdown,
                            height16,
                            Row(
--- a/lib/providers/apps_provider.dart
+++ b/lib/providers/apps_provider.dart
@@ -34,6 +34,10 @@ class AppInMemory {
  AppInfo? installedInfo;

  AppInMemory(this.app, this.downloadProgress, this.installedInfo);
+  AppInMemory deepCopy() =>
+      AppInMemory(app.deepCopy(), downloadProgress, installedInfo);
+
+  String get name => app.overrideName ?? installedInfo?.name ?? app.finalName;
 }

 class DownloadedApk {
@@ -97,6 +101,8 @@ class AppsProvider with ChangeNotifier {
  late Stream<FGBGType>? foregroundStream;
  late StreamSubscription<FGBGType>? foregroundSubscription;

+  Iterable<AppInMemory> getAppValues() => apps.values.map((a) => a.deepCopy());
+
  AppsProvider() {
    // Subscribe to changes in the app foreground status
    foregroundStream = FGBGEvents.stream.asBroadcastStream();
@@ -159,18 +165,17 @@ class AppsProvider with ChangeNotifier {
  Future<DownloadedApk> downloadApp(App app, BuildContext? context) async {
    NotificationsProvider? notificationsProvider =
        context?.read<NotificationsProvider>();
-    var notifId = DownloadNotification(app.name, 0).id;
+    var notifId = DownloadNotification(app.finalName, 0).id;
    if (apps[app.id] != null) {
      apps[app.id]!.downloadProgress = 0;
      notifyListeners();
    }
    try {
-      var fileName =
-          '${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk';
      String downloadUrl = await SourceProvider()
          .getSource(app.url)
-          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex]);
-      var notif = DownloadNotification(app.name, 100);
+          .apkUrlPrefetchModifier(app.apkUrls[app.preferredApkIndex].value);
+      var fileName = '${app.id}-${downloadUrl.hashCode}.apk';
+      var notif = DownloadNotification(app.finalName, 100);
      notificationsProvider?.cancel(notif.id);
      int? prevProg;
      File downloadedFile =
@@ -180,7 +185,7 @@ class AppsProvider with ChangeNotifier {
          apps[app.id]!.downloadProgress = progress;
          notifyListeners();
        }
-        notif = DownloadNotification(app.name, prog ?? 100);
+        notif = DownloadNotification(app.finalName, prog ?? 100);
        if (prog != null && prevProg != prog) {
          notificationsProvider?.notify(notif);
        }
@@ -199,16 +204,17 @@ 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)) {
+        var isTempId = SourceProvider().isTempId(app);
+        if (apps[app.id] != null && !isTempId) {
          throw IDChangedError();
        }
        var originalAppId = app.id;
        app.id = newInfo.packageName;
        downloadedFile = downloadedFile.renameSync(
-            '${downloadedFile.parent.path}/${app.id}-${app.latestVersion}-${app.preferredApkIndex}.apk');
+            '${downloadedFile.parent.path}/${app.id}-${downloadUrl.hashCode}.apk');
        if (apps[originalAppId] != null) {
          await removeApps([originalAppId]);
-          await saveApps([app]);
+          await saveApps([app], onlyIfExists: !isTempId);
        }
      }
      return DownloadedApk(app.id, downloadedFile);
@@ -296,9 +302,11 @@ class AppsProvider with ChangeNotifier {
    await intent.launch();
  }

-  Future<String?> confirmApkUrl(App app, BuildContext? context) async {
+  Future<MapEntry<String, String>?> confirmApkUrl(
+      App app, BuildContext? context) async {
    // If the App has more than one APK, the user should pick one (if context provided)
-    String? apkUrl = app.apkUrls[app.preferredApkIndex];
+    MapEntry<String, String>? apkUrl =
+        app.apkUrls[app.preferredApkIndex >= 0 ? app.preferredApkIndex : 0];
    // get device supported architecture
    List<String> archs = (await DeviceInfoPlugin().androidInfo).supportedAbis;

@@ -321,14 +329,14 @@ class AppsProvider with ChangeNotifier {

    // If the picked APK comes from an origin different from the source, get user confirmation (if context provided)
    if (apkUrl != null &&
-        getHost(apkUrl) != getHost(app.url) &&
+        getHost(apkUrl.value) != getHost(app.url) &&
        context != null) {
      // ignore: use_build_context_synchronously
      if (await showDialog(
              context: context,
              builder: (BuildContext ctx) {
                return APKOriginWarningDialog(
-                    sourceUrl: app.url, apkUrl: apkUrl!);
+                    sourceUrl: app.url, apkUrl: apkUrl!.value);
              }) !=
          true) {
        apkUrl = null;
@@ -353,14 +361,19 @@ class AppsProvider with ChangeNotifier {
      if (apps[id] == null) {
        throw ObtainiumError(tr('appNotFound'));
      }
-      String? apkUrl;
+      MapEntry<String, String>? apkUrl;
      var trackOnly = apps[id]!.app.additionalSettings['trackOnly'] == true;
      if (!trackOnly) {
        apkUrl = await confirmApkUrl(apps[id]!.app, context);
      }
      if (apkUrl != null) {
-        int urlInd = apps[id]!.app.apkUrls.indexOf(apkUrl);
-        if (urlInd != apps[id]!.app.preferredApkIndex) {
+        int urlInd = apps[id]!
+            .app
+            .apkUrls
+            .map((e) => e.value)
+            .toList()
+            .indexOf(apkUrl.value);
+        if (urlInd >= 0 && urlInd != apps[id]!.app.preferredApkIndex) {
          apps[id]!.app.preferredApkIndex = urlInd;
          await saveApps([apps[id]!.app]);
        }
@@ -637,7 +650,7 @@ class AppsProvider with ChangeNotifier {
        sp.getSource(newApps[i].url);
        apps[newApps[i].id] = AppInMemory(newApps[i], null, info);
      } catch (e) {
-        errors.add([newApps[i].id, newApps[i].name, e.toString()]);
+        errors.add([newApps[i].id, newApps[i].finalName, e.toString()]);
      }
    }
    if (errors.isNotEmpty) {
@@ -667,12 +680,10 @@ class AppsProvider with ChangeNotifier {
      bool onlyIfExists = true}) async {
    attemptToCorrectInstallStatus =
        attemptToCorrectInstallStatus && (await doesInstalledAppsPluginWork());
-    for (var app in apps) {
+    for (var a in apps) {
+      var app = a.deepCopy();
      AppInfo? info = await getInstalledInfo(app.id);
      app.name = info?.name ?? app.name;
-      if (app.additionalSettings['appName']?.toString().isNotEmpty == true) {
-        app.name = app.additionalSettings['appName'].toString().trim();
-      }
      if (attemptToCorrectInstallStatus) {
        app = getCorrectedInstallStatusAppIfPossible(app, info) ?? app;
      }
@@ -903,7 +914,7 @@ class AppsProvider with ChangeNotifier {

  Future<List<List<String>>> addAppsByURL(List<String> urls) async {
    List<dynamic> results = await SourceProvider().getAppsByURLNaive(urls,
-        ignoreUrls: apps.values.map((e) => e.app.url).toList());
+        alreadyAddedUrls: apps.values.map((e) => e.app.url).toList());
    List<App> pps = results[0];
    Map<String, dynamic> errorsMap = results[1];
    for (var app in pps) {
@@ -923,7 +934,7 @@ class APKPicker extends StatefulWidget {
  const APKPicker({super.key, required this.app, this.initVal, this.archs});

  final App app;
-  final String? initVal;
+  final MapEntry<String, String>? initVal;
  final List<String>? archs;

  @override
@@ -931,7 +942,7 @@ class APKPicker extends StatefulWidget {
 }

 class _APKPickerState extends State<APKPicker> {
-  String? apkUrl;
+  MapEntry<String, String>? apkUrl;

  @override
  Widget build(BuildContext context) {
@@ -940,19 +951,17 @@ class _APKPickerState extends State<APKPicker> {
      scrollable: true,
      title: Text(tr('pickAnAPK')),
      content: Column(children: [
-        Text(tr('appHasMoreThanOnePackage', args: [widget.app.name])),
+        Text(tr('appHasMoreThanOnePackage', args: [widget.app.finalName])),
        const SizedBox(height: 16),
        ...widget.app.apkUrls.map(
          (u) => RadioListTile<String>(
-              title: Text(Uri.parse(u)
-                  .pathSegments
-                  .where((element) => element.isNotEmpty)
-                  .last),
-              value: u,
-              groupValue: apkUrl,
+              title: Text(u.key),
+              value: u.value,
+              groupValue: apkUrl!.value,
              onChanged: (String? val) {
                setState(() {
-                  apkUrl = val;
+                  apkUrl =
+                      widget.app.apkUrls.where((e) => e.value == val).first;
                });
              }),
        ),
--- a/lib/providers/notifications_provider.dart
+++ b/lib/providers/notifications_provider.dart
@@ -34,9 +34,9 @@ class UpdateNotification extends ObtainiumNotification {
    message = updates.isEmpty
        ? tr('noNewUpdates')
        : updates.length == 1
-            ? tr('xHasAnUpdate', args: [updates[0].name])
+            ? tr('xHasAnUpdate', args: [updates[0].finalName])
            : plural('xAndNMoreUpdatesAvailable', updates.length - 1,
-                args: [updates[0].name, (updates.length - 1).toString()]);
+                args: [updates[0].finalName, (updates.length - 1).toString()]);
  }
 }

@@ -46,9 +46,9 @@ class SilentUpdateNotification extends ObtainiumNotification {
            tr('appsUpdatedNotifDescription'), Importance.defaultImportance) {
    message = updates.length == 1
        ? tr('xWasUpdatedToY',
-            args: [updates[0].name, updates[0].latestVersion])
+            args: [updates[0].finalName, updates[0].latestVersion])
        : plural('xAndNMoreUpdatesInstalled', updates.length - 1,
-            args: [updates[0].name, (updates.length - 1).toString()]);
+            args: [updates[0].finalName, (updates.length - 1).toString()]);
  }
 }

--- a/lib/providers/settings_provider.dart
+++ b/lib/providers/settings_provider.dart
@@ -64,6 +64,15 @@ class SettingsProvider with ChangeNotifier {
    notifyListeners();
  }

+  bool get useBlackTheme {
+    return prefs?.getBool('useBlackTheme') ?? false;
+  }
+
+  set useBlackTheme(bool useBlackTheme) {
+    prefs?.setBool('useBlackTheme', useBlackTheme);
+    notifyListeners();
+  }
+
  int get updateInterval {
    var min = prefs?.getInt('updateInterval') ?? 360;
    if (!updateIntervals.contains(min)) {
@@ -164,7 +173,8 @@ class SettingsProvider with ChangeNotifier {

  void setCategories(Map<String, int> cats, {AppsProvider? appsProvider}) {
    if (appsProvider != null) {
-      List<App> changedApps = appsProvider.apps.values
+      List<App> changedApps = appsProvider
+          .getAppValues()
          .map((a) {
            var n1 = a.app.categories.length;
            a.app.categories.removeWhere((c) => !cats.keys.contains(c));
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@@ -3,6 +3,7 @@

 import 'dart:convert';

+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:html/dom.dart';
 import 'package:http/http.dart';
@@ -34,7 +35,7 @@ class AppNames {

 class APKDetails {
  late String version;
-  late List<String> apkUrls;
+  late List<MapEntry<String, String>> apkUrls;
  late AppNames names;
  late DateTime? releaseDate;
  late String? changeLog;
@@ -50,7 +51,7 @@ class App {
  late String name;
  String? installedVersion;
  late String latestVersion;
-  List<String> apkUrls = [];
+  List<MapEntry<String, String>> apkUrls = [];
  late int preferredApkIndex;
  late Map<String, dynamic> additionalSettings;
  late DateTime? lastUpdateCheck;
@@ -79,6 +80,31 @@ class App {
    return 'ID: $id URL: $url INSTALLED: $installedVersion LATEST: $latestVersion APK: $apkUrls PREFERREDAPK: $preferredApkIndex ADDITIONALSETTINGS: ${additionalSettings.toString()} LASTCHECK: ${lastUpdateCheck.toString()} PINNED $pinned';
  }

+  String? get overrideName =>
+      additionalSettings['appName']?.toString().trim().isNotEmpty == true
+          ? additionalSettings['appName']
+          : null;
+
+  String get finalName {
+    return overrideName ?? name;
+  }
+
+  App deepCopy() => App(
+      id,
+      url,
+      author,
+      name,
+      installedVersion,
+      latestVersion,
+      apkUrls,
+      preferredApkIndex,
+      Map.from(additionalSettings),
+      lastUpdateCheck,
+      pinned,
+      categories: categories,
+      changeLog: changeLog,
+      releaseDate: releaseDate);
+
  factory App.fromJson(Map<String, dynamic> json) {
    var source = SourceProvider().getSource(json['url']);
    var formItems = source.combinedAppSpecificSettingFormItems
@@ -134,6 +160,23 @@ class App {
    if (preferredApkIndex < 0) {
      preferredApkIndex = 0;
    }
+    // apkUrls can either be old list or new named list apkUrls
+    List<MapEntry<String, String>> apkUrls = [];
+    if (json['apkUrls'] != null) {
+      var apkUrlJson = jsonDecode(json['apkUrls']);
+      try {
+        apkUrls = getApkUrlsFromUrls(List<String>.from(apkUrlJson));
+      } catch (e) {
+        apkUrls = List<dynamic>.from(apkUrlJson)
+            .map((e) => MapEntry(e[0] as String, e[1] as String))
+            .toList();
+      }
+    }
+    // Arch based APK filter option should be disabled if it previously did not exist
+    if (json['additionalSettings'] != null &&
+        jsonDecode(json['additionalSettings'])['autoApkFilterByArch'] == null) {
+      additionalSettings['autoApkFilterByArch'] = false;
+    }
    return App(
        json['id'] as String,
        json['url'] as String,
@@ -143,9 +186,7 @@ class App {
            ? null
            : json['installedVersion'] as String,
        json['latestVersion'] as String,
-        json['apkUrls'] == null
-            ? []
-            : List<String>.from(jsonDecode(json['apkUrls'])),
+        apkUrls,
        preferredApkIndex,
        additionalSettings,
        json['lastUpdateCheck'] == null
@@ -173,7 +214,7 @@ class App {
        'name': name,
        'installedVersion': installedVersion,
        'latestVersion': latestVersion,
-        'apkUrls': jsonEncode(apkUrls),
+        'apkUrls': jsonEncode(apkUrls.map((e) => [e.key, e.value]).toList()),
        'preferredApkIndex': preferredApkIndex,
        'additionalSettings': jsonEncode(additionalSettings),
        'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
@@ -225,6 +266,13 @@ Map<String, dynamic> getDefaultValuesFromFormItems(
      .reduce((value, element) => [...value, ...element]));
 }

+List<MapEntry<String, String>> getApkUrlsFromUrls(List<String> urls) =>
+    urls.map((e) {
+      var segments = e.split('/').where((el) => el.trim().isNotEmpty);
+      var apkSegs = segments.where((s) => s.toLowerCase().endsWith('.apk'));
+      return MapEntry(apkSegs.isNotEmpty ? apkSegs.last : segments.last, e);
+    }).toList();
+
 class AppSource {
  String? host;
  late String name;
@@ -279,6 +327,10 @@ class AppSource {
            }
          ])
    ],
+    [
+      GeneratedFormSwitch('autoApkFilterByArch',
+          label: tr('autoApkFilterByArch'), defaultValue: true)
+    ],
    [GeneratedFormTextField('appName', label: tr('appName'), required: false)]
  ];

@@ -422,11 +474,24 @@ class SourceProvider {
    if (additionalSettings['apkFilterRegEx'] != null) {
      var reg = RegExp(additionalSettings['apkFilterRegEx']);
      apk.apkUrls =
-          apk.apkUrls.where((element) => reg.hasMatch(element)).toList();
+          apk.apkUrls.where((element) => reg.hasMatch(element.key)).toList();
    }
    if (apk.apkUrls.isEmpty && !trackOnly) {
      throw NoAPKError();
    }
+    if (apk.apkUrls.length > 1 &&
+        additionalSettings['autoApkFilterByArch'] == true) {
+      var abis = (await DeviceInfoPlugin().androidInfo).supportedAbis;
+      for (var abi in abis) {
+        var urls2 = apk.apkUrls
+            .where((element) => RegExp('.*$abi.*').hasMatch(element.key))
+            .toList();
+        if (urls2.isNotEmpty && urls2.length < apk.apkUrls.length) {
+          apk.apkUrls = urls2;
+          break;
+        }
+      }
+    }
    String apkVersion = apk.version.replaceAll('/', '-');
    var name = currentApp != null ? currentApp.name.trim() : '';
    name = name.isNotEmpty
@@ -454,11 +519,14 @@ class SourceProvider {

  // Returns errors in [results, errors] instead of throwing them
  Future<List<dynamic>> getAppsByURLNaive(List<String> urls,
-      {List<String> ignoreUrls = const []}) async {
+      {List<String> alreadyAddedUrls = const []}) async {
    List<App> apps = [];
    Map<String, dynamic> errors = {};
-    for (var url in urls.where((element) => !ignoreUrls.contains(element))) {
+    for (var url in urls) {
      try {
+        if (alreadyAddedUrls.contains(url)) {
+          throw ObtainiumError(tr('appAlreadyAdded'));
+        }
        var source = getSource(url);
        apps.add(await getApp(
            source,
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: "direct main"
    description:
      name: android_alarm_manager_plus
-      sha256: "8647cc5f9339f3955a2bd9ec40e0f10c3a80049f31f80b3ffdd87e07bb73fce2"
+      sha256: "88a8001851fdc9bd54fa4e30d0277bb900a50f3d86ff244da7f027400bf23ac0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
  android_intent_plus:
    dependency: "direct main"
    description:
      name: android_intent_plus
-      sha256: "54810cb33945c2c10742cd746ea994822c115e9dbe189919bc63cb436e45a6af"
+      sha256: "04cbc7c332a6f0bba88fed354de78813e9d24049c1800aaf10f449c7adc22603"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.6"
+    version: "3.1.9"
  animations:
    dependency: "direct main"
    description:
@@ -117,10 +117,10 @@ packages:
    dependency: "direct main"
    description:
      name: device_info_plus
-      sha256: "1d6e5a61674ba3a68fb048a7c7b4ff4bebfed8d7379dbe8f2b718231be9a7c95"
+      sha256: f52ab3b76b36ede4d135aab80194df8925b553686f0fa12226b4e2d658e45903
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.0"
+    version: "8.2.2"
  device_info_plus_platform_interface:
    dependency: transitive
    description:
@@ -133,10 +133,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: c4a508284b14ec4dda5adba2c28b2cdd34fbae1afead7e8c52cad87d51c5405b
+      sha256: bbebb1b7ebed819e0ec83d4abdc2a8482d934f6a85289ffc1c6acf7589fa2aad
      url: "https://pub.dev"
    source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
  easy_localization:
    dependency: "direct main"
    description:
@@ -181,10 +181,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013
+      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.6"
+    version: "5.2.10"
  flutter:
    dependency: "direct main"
    description: flutter
@@ -210,26 +210,26 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: "293995f94e120c8afce768981bd1fa9c5d6de67c547568e3b42ae2defdcbb4a0"
+      sha256: "2876372952b65ca7f684e698eba22bda1cf581fa071dd30ba2f01900f507d0d1"
      url: "https://pub.dev"
    source: hosted
-    version: "13.0.0"
+    version: "14.0.0+1"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
      name: flutter_local_notifications_linux
-      sha256: ccb08b93703aeedb58856e5637450bf3ffec899adb66dc325630b68994734b89
+      sha256: "909bb95de05a2e793503a2437146285a2f600cd0b3f826e26b870a334d8586d7"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.0+1"
+    version: "4.0.0"
  flutter_local_notifications_platform_interface:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
-      sha256: "5ec1feac5f7f7d9266759488bc5f76416152baba9aa1b26fe572246caa00d1ab"
+      sha256: "63235c42de5b6c99846969a27ad0209c401e6b77b0498939813725b5791c107c"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.0"
+    version: "7.0.0"
  flutter_localizations:
    dependency: transitive
    description: flutter
@@ -247,10 +247,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
+      sha256: "8ffe990dac54a4a5492747added38571a5ab474c8e5d196809ea08849c69b1bb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.13"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -417,18 +417,18 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
+      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.24"
+    version: "2.0.27"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
+      sha256: ad4c4d011830462633f03eb34445a45345673dfd4faf1ab0b4735fbd93b19183
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
  path_provider_linux:
    dependency: transitive
    description:
@@ -449,10 +449,10 @@ packages:
    dependency: transitive
    description:
      name: path_provider_windows
-      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
+      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.1.6"
  permission_handler:
    dependency: "direct main"
    description:
@@ -537,18 +537,18 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: b1f15232d41e9701ab2f04181f21610c36c83a12ae426b79b4bd011c567934b1
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.1"
+    version: "6.3.4"
  share_plus_platform_interface:
    dependency: transitive
    description:
      name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
+      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  shared_preferences:
    dependency: "direct main"
    description:
@@ -561,18 +561,18 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "8304d8a1f7d21a429f91dee552792249362b68a331ac5c3c1caf370f658873f6"
+      sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
  shared_preferences_foundation:
    dependency: transitive
    description:
      name: shared_preferences_foundation
-      sha256: cf2a42fb20148502022861f71698db12d937c7459345a1bdaa88fc91a91b3603
+      sha256: "0c1c16c56c9708aa9c361541a6f0e5cc6fc12a3232d866a687a7b7db30032b07"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
  shared_preferences_linux:
    dependency: transitive
    description:
@@ -622,18 +622,18 @@ packages:
    dependency: "direct main"
    description:
      name: sqflite
-      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
+      sha256: "8453780d1f703ead201a39673deb93decf85d543f359f750e2afc4908b55533f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.6"
+    version: "2.2.8"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
+      sha256: e77abf6ff961d69dfef41daccbb66b51e9983cdd5cb35bf30733598057401555
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.3"
+    version: "2.4.5"
  stack_trace:
    dependency: transitive
    description:
@@ -662,10 +662,10 @@ packages:
    dependency: transitive
    description:
      name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
  term_glyph:
    dependency: transitive
    description:
@@ -686,10 +686,10 @@ packages:
    dependency: transitive
    description:
      name: timezone
-      sha256: "24c8fcdd49a805d95777a39064862133ff816ebfffe0ceff110fb5960e557964"
+      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.1"
+    version: "0.9.2"
  typed_data:
    dependency: transitive
    description:
@@ -710,34 +710,34 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_android
-      sha256: dd729390aa936bf1bdf5cd1bc7468ff340263f80a2c4f569416507667de8e3c8
+      sha256: "22f8db4a72be26e9e3a4aa3f194b1f7afbc76d20ec141f84be1d787db2155cbd"
      url: "https://pub.dev"
    source: hosted
-    version: "6.0.26"
+    version: "6.0.31"
  url_launcher_ios:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "3dedc66ca3c0bef9e6a93c0999aee102556a450afcc1b7bcfeace7a424927d92"
+      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
  url_launcher_linux:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
  url_launcher_macos:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
+      sha256: "91ee3e75ea9dadf38036200c5d3743518f4a5eb77a8d13fda1ee5764373f185e"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.5"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -758,10 +758,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
+      sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  uuid:
    dependency: transitive
    description:
@@ -782,50 +782,50 @@ packages:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: "47663d51a9061451aa3880a214ee9a65dcbb933b77bc44388e194279ab3ccaf6"
+      sha256: "1a37bdbaaf5fbe09ad8579ab09ecfd473284ce482f900b5aea27cf834386a567"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.7"
+    version: "4.2.0"
  webview_flutter_android:
    dependency: transitive
    description:
      name: webview_flutter_android
-      sha256: "9e223788e1954087dac30d813dc151f8e12f09f1139f116ce20b5658893f3627"
+      sha256: d6cf18cd6c809c5a9294cd99707a21986aac4e08c87e1916ce2590315fb55d3a
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.4"
+    version: "3.6.2"
  webview_flutter_platform_interface:
    dependency: transitive
    description:
      name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
+      sha256: "78715dc442b7849dbde74e92bb67de1cecf5addf95531c5fb474e72f5fe9a507"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.3.0"
  webview_flutter_wkwebview:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: d601aba11ad8d4481e17a34a76fa1d30dee92dcbbe2c58b0df3120e9453099c7
+      sha256: c94d242d8cbe1012c06ba7ac790c46d6e6b68723b7d34f8c74ed19f68d166f49
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.3"
+    version: "3.4.0"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0+3"
+    version: "1.0.0"
  xml:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.11.24+146 # When changing this, update the tag in main() accordingly
+version: 0.11.35+157 # When changing this, update the tag in main() accordingly

 environment:
  sdk: '>=2.18.2 <3.0.0'
@@ -38,7 +38,7 @@ dependencies:
  cupertino_icons: ^1.0.5
  path_provider: ^2.0.11
  flutter_fgbg: ^0.2.0 # Try removing reliance on this
-  flutter_local_notifications: ^13.0.0
+  flutter_local_notifications: ^14.0.0+1
  provider: ^6.0.3
  http: ^0.13.5
  webview_flutter: ^4.0.0
@@ -49,7 +49,7 @@ dependencies:
  permission_handler: ^10.0.0
  fluttertoast: ^8.0.9
  device_info_plus: ^8.0.0
-  file_picker: ^5.1.0
+  file_picker: ^5.2.10
  animations: ^2.0.4
  install_plugin_v2: ^1.0.0
  share_plus: ^6.0.1
Author	SHA1	Message	Date
Imran Remtulla	ce44e200a5	Merge pull request #495 from ImranR98/dev HTML Source Bugfix (#288) + Better Placeholder Icon Visibility (#490)	2023-04-28 22:25:30 -04:00
Imran Remtulla	e8ebf53626	Increment version, update packages	2023-04-28 22:24:41 -04:00
Imran Remtulla	cdd6a4124c	Merge pull request #492 from gidano/main Update hu.json	2023-04-28 22:23:26 -04:00
Imran Remtulla	09c71e4e9f	Increase icon placeholder opacity (#490 )	2023-04-28 22:22:55 -04:00
Imran Remtulla	28a996441c	HTML Source Bugfix #288	2023-04-28 22:18:58 -04:00
gidano	396bf012c9	Update hu.json	2023-04-25 15:55:30 +02:00
Imran Remtulla	02da24aa75	Merge pull request #487 from ImranR98/dev Fixed null error for imported Apps (#476)	2023-04-23 03:23:38 -04:00
Imran Remtulla	3c6e66ce12	Fixed null error for imported Apps (#476 )	2023-04-23 03:22:56 -04:00
Imran Remtulla	0213b542e3	Merge pull request #486 from ImranR98/dev Several bugfixes and minor UI improvements + GitLab fallback support	2023-04-23 01:31:13 -04:00
Imran Remtulla	b0e8a4a297	Merge pull request #480 from markus-gitdev/main Update de.json	2023-04-23 01:22:57 -04:00
Imran Remtulla	e72b33ebf2	Added fallback option to GitLab Source (#456 )	2023-04-23 01:19:31 -04:00
Imran Remtulla	283722319b	More adaptive column spacing in apps list (#485 )	2023-04-23 00:53:03 -04:00
Imran Remtulla	b406bb5c6a	Increment version, update packages	2023-04-23 00:01:49 -04:00
Imran Remtulla	de2b7fa7a1	URL selection modal improvements (incl. #460 )	2023-04-22 23:49:55 -04:00
Imran Remtulla	be61220af4	Show version in changelog dialog (#482 )	2023-04-22 22:57:54 -04:00
Imran Remtulla	3e732a4317	Sort GitHub releases by date, remove codeberg redundancy	2023-04-22 22:42:59 -04:00
Imran Remtulla	9f2db4e4e7	App page 'reset install status' button shows if appropriate	2023-04-22 21:40:15 -04:00
Imran Remtulla	78141998f4	Attempt additional fix for #201	2023-04-21 15:54:17 -04:00
Markus	934f237e34	Update de.json Correction of "removeAppQuestion"	2023-04-19 12:04:51 +02:00
Imran Remtulla	1b2a9a39e3	Fix "reset install status" button being disabled	2023-04-19 02:05:31 -04:00
Imran Remtulla	dc52fb6181	Merge pull request #473 from ImranR98/dev Sourceforge apk url extraction bugfix	2023-04-15 15:19:08 -04:00
Imran Remtulla	9e4ac397d8	Sourceforge apk url extraction bugfix	2023-04-15 15:18:32 -04:00
Imran Remtulla	0ec944eae9	Merge pull request #472 from ImranR98/dev Bugfix in getting APK name from URL (affected Sourceforge and potentially others)	2023-04-15 14:43:02 -04:00
Imran Remtulla	ad250c30e4	Increment version	2023-04-15 14:41:38 -04:00
Imran Remtulla	1090f15508	Sourceforge bugfix	2023-04-15 14:34:14 -04:00
Imran Remtulla	666941350e	APK name bugfix	2023-04-15 14:28:00 -04:00
Imran Remtulla	eeadbce8b0	Merge pull request #466 from ImranR98/dev Increment version, update packages	2023-04-13 23:06:22 -04:00
Imran Remtulla	ce8aeff342	Increment version, update packages	2023-04-13 23:06:08 -04:00
Imran Remtulla	0d8362a2ed	Merge pull request #465 from Bnyro/amoled-theme Add an amoled black theme	2023-04-13 22:59:54 -04:00
Bnyro	3b28143a4e	Add an amoled black theme	2023-04-13 18:19:24 +02:00
Imran Remtulla	537628f378	Merge pull request #451 from gidano/gidano/Obtainium-HU Updated hu.json	2023-04-12 15:49:02 -04:00
Imran Remtulla	c92d76df98	Merge pull request #453 from mehdijahann/main Update fa.json	2023-04-12 15:48:51 -04:00
Imran Remtulla	b6959e1a8b	Merge pull request #457 from markus-gitdev/main Update de.json	2023-04-12 15:48:42 -04:00
Imran Remtulla	1bf648da60	Merge pull request #461 from ImranR98/dev Fixed HTML relative link handling (#455), Fixed App name override and sort inconsistencies (#450)	2023-04-12 15:48:28 -04:00
Imran Remtulla	6a1275e9e4	Sort no longer case-sensitive (#450 )	2023-04-12 15:46:48 -04:00
Imran Remtulla	df242b91ad	Increment version, update packages	2023-04-12 15:39:32 -04:00
Imran Remtulla	7ea75325bb	App name overrides more consistent (#450 )	2023-04-12 15:36:17 -04:00
Imran Remtulla	0704dfe2ee	Fixed relative link handling in HTML source	2023-04-12 15:17:08 -04:00
Imran Remtulla	6275cbf114	HTML Source - handle relative URLs in literal .html pages	2023-04-12 14:50:54 -04:00
Markus	36b8ef6782	Update de.json Translations for: - groupByCategory - autoApkFilterByArch	2023-04-11 13:10:03 +02:00
Mehdee	d274b9a428	Update fa.json	2023-04-10 16:54:29 +02:00
gidano	1c2980d1ac	Updated hu.json	2023-04-09 08:57:12 +02:00
Imran Remtulla	8f0aac057e	Merge pull request #442 from bluefly000/japanese-translation Update ja.json	2023-04-07 22:11:35 -04:00
Imran Remtulla	e929920a48	Merge pull request #440 from atilluF/main Update it.json	2023-04-07 22:11:27 -04:00
Imran Remtulla	8ed254c7dd	Merge pull request #446 from ImranR98/dev Bugfix: GitHub/Codeberg fallback + no-prerel fail	2023-04-07 22:11:20 -04:00
Imran Remtulla	46a00836df	Bugfix: GitHub/Codeberg fallback + no-prerel fail	2023-04-07 22:10:55 -04:00
bluefly000	f144ffdded	Update ja.json	2023-04-08 00:03:31 +09:00
atilluF	d597d569e2	Update it.json	2023-04-07 13:19:12 +02:00
Imran Remtulla	b62475de87	Merge pull request #439 from ImranR98/dev Use app deep copy in places to avoid bugs	2023-04-07 02:20:32 -04:00
Imran Remtulla	334ac8d3d6	Use app deep copy in places to avoid bugs	2023-04-07 01:54:14 -04:00
Imran Remtulla	9193788356	Merge pull request #438 from ImranR98/dev Better downloaded file naming (reduces conflicts)	2023-04-06 23:00:28 -04:00
Imran Remtulla	8f75ddd43f	Better download file naming (reduces conflicts)	2023-04-06 22:59:40 -04:00
Imran Remtulla	a2edc86bfa	Merge pull request #437 from ImranR98/dev Added simple APK try auto-select by CPU arch #436	2023-04-06 22:37:55 -04:00
Imran Remtulla	0804e680b2	Added simple APK try auto-select by CPU arch #436 Plus minor form switch UI fixes (overflow, spacing)	2023-04-06 22:37:24 -04:00
Imran Remtulla	49affd1bd4	Merge pull request #434 from ImranR98/dev Store APK names with URLs (#432)	2023-04-05 18:56:16 -04:00
Imran Remtulla	202ce4f0d5	Store APK names with URLs (#432 )	2023-04-05 18:50:19 -04:00