Merge pull request #301 from ImranR98/dev

App edit bugfixes

assets/translations/de.json

@@ -213,6 +213,10 @@
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
     "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "useReleaseDateAsVersion": "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",
     "removeAppQuestion": {
         "one": "App entfernen?",
         "other": "App entfernen?"

assets/translations/en.json

@@ -213,6 +213,10 @@
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
     "onlyWorksWithNonVersionDetectApps": "Only works for Apps with version detection disabled.",
+    "useReleaseDateAsVersion": "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",
     "removeAppQuestion": {
         "one": "Remove App?",
         "other": "Remove Apps?"

assets/translations/fa.json

@@ -213,6 +213,10 @@
     "removeFromObtainium": "از Obtainium حذف کنید",
     "uninstallFromDevice": "حذف نصب از دستگاه",
     "onlyWorksWithNonVersionDetectApps": "فقط برای برنامه‌هایی کار می‌کند که تشخیص نسخه غیرفعال است.",
+    "useReleaseDateAsVersion": "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",
     "removeAppQuestion": {
         "one": "برنامه حذف شود؟",
         "other": "برنامه ها حذف شوند؟"

assets/translations/hu.json

@@ -212,6 +212,10 @@
     "removeFromObtainium": "Eltávolítás az Obtainiumból",
     "uninstallFromDevice": "Eltávolítás a készülékről",
     "onlyWorksWithNonVersionDetectApps": "Csak azoknál az alkalmazásoknál működik, amelyeknél a verzióérzékelés le van tiltva.",
+    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "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",
     "removeAppQuestion": {
         "one": "Eltávolítja az alkalmazást?",
         "other": "Eltávolítja az alkalmazást?"

assets/translations/it.json

@@ -213,6 +213,10 @@
     "removeFromObtainium": "Rimuovi da Obtainium",
     "uninstallFromDevice": "Disinstalla dal dispositivo",
     "onlyWorksWithNonVersionDetectApps": "Funziona solo per le App con il rilevamento della versione disattivato.",
+    "useReleaseDateAsVersion": "Use Release Date as Version",
+    "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",
     "removeAppQuestion": {
         "one": "Rimuovere l'App?",
         "other": "Rimuovere le App?"

assets/translations/ja.json

@@ -213,6 +213,10 @@
     "removeFromObtainium": "Obtainiumから削除する",
     "uninstallFromDevice": "デバイスからアンインストールする",
     "onlyWorksWithNonVersionDetectApps": "バージョン検出を無効にしているアプリにのみ動作します。",
+    "useReleaseDateAsVersion": "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",
     "removeAppQuestion": {
         "one": "アプリを削除しますか？",
         "other": "アプリを削除しますか？"

assets/translations/zh.json

@@ -213,6 +213,10 @@
     "filterAPKsByRegEx": "Filter APKs by Regular Expression",
     "removeFromObtainium": "Remove from Obtainium",
     "uninstallFromDevice": "Uninstall from Device",
+    "useReleaseDateAsVersion": "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",
     "removeAppQuestion": {
         "one": "删除应用？",
         "other": "删除应用？"

lib/app_sources/apkmirror.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:html/parser.dart';
 import 'package:http/http.dart';
 import 'package:obtainium/custom_errors.dart';
@@ -30,10 +32,16 @@ class APKMirror extends AppSource {
   ) async {
     Response res = await get(Uri.parse('$standardUrl/feed'));
     if (res.statusCode == 200) {
-      String? titleString = parse(res.body)
+      var item = parse(res.body).querySelector('item');
-          .querySelector('item')
+      String? titleString = item?.querySelector('title')?.innerHtml;
-          ?.querySelector('title')
+      String? dateString = item
-          ?.innerHtml;
+          ?.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 +52,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

@@ -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

@@ -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/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.12';
+const String currentVersion = '0.11.0';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -73,6 +73,8 @@ class _AddAppPageState extends State<AddAppPage> {
         var userPickedTrackOnly = additionalSettings['trackOnly'] == true;
         var userPickedNoVersionDetection =
             additionalSettings['noVersionDetection'] == true;
+        var userPickedReleaseDateAsVersion =
+            additionalSettings['releaseDateAsVersion'] == true;
         var cont = true;
         if ((userPickedTrackOnly || pickedSource!.enforceTrackOnly) &&
             // ignore: use_build_context_synchronously
@@ -93,7 +95,22 @@ class _AddAppPageState extends State<AddAppPage> {
                 null) {
           cont = false;
         }
-        if (userPickedNoVersionDetection &&
+        if (userPickedReleaseDateAsVersion && // ignore: use_build_context_synchronously
+            // ignore: use_build_context_synchronously
+            await showDialog(
+                    context: context,
+                    builder: (BuildContext ctx) {
+                      return GeneratedFormModal(
+                        title: tr('useReleaseDateAsVersion'),
+                        items: const [],
+                        message: tr('releaseDateAsVersionExplanation'),
+                      );
+                    }) ==
+                null) {
+          cont = false;
+        }
+        if (!userPickedReleaseDateAsVersion &&
+            userPickedNoVersionDetection &&
             // ignore: use_build_context_synchronously
             await showDialog(
                     context: context,
@@ -113,12 +130,13 @@ class _AddAppPageState extends State<AddAppPage> {
           App app = await sourceProvider.getApp(
               pickedSource!, userInput, additionalSettings,
               trackOnlyOverride: trackOnly,
-              noVersionDetectionOverride: userPickedNoVersionDetection);
+              noVersionDetectionOverride: userPickedNoVersionDetection,
+              releaseDateAsVersionOverride: userPickedReleaseDateAsVersion);
           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

@@ -113,7 +113,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 +136,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,
         ),
@@ -268,19 +283,53 @@ class _AppPageState extends State<AppPage> {
                                             );
                                           }).then((values) {
                                         if (app != null && values != null) {
-                                          var changedApp = app.app;
+                                          Map<String, dynamic>
-                                          changedApp.additionalSettings =
+                                              originalSettings =
-                                              values;
+                                              app.app.additionalSettings;
+                                          app.app.additionalSettings = values;
                                           if (source.enforceTrackOnly) {
-                                            changedApp.additionalSettings[
+                                            app.app.additionalSettings[
                                                 'trackOnly'] = true;
                                             showError(
                                                 tr('appsFromSourceAreTrackOnly'),
                                                 context);
                                           }
-                                          appsProvider.saveApps(
+                                          if (app.app.additionalSettings[
-                                              [changedApp]).then((value) {
+                                                  'releaseDateAsVersion'] ==
-                                            getUpdate(changedApp.id);
+                                              true) {
+                                            app.app.additionalSettings[
+                                                'noVersionDetection'] = true;
+                                            if (originalSettings[
+                                                    'releaseDateAsVersion'] !=
+                                                true) {
+                                              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[
+                                                  'releaseDateAsVersion'] ==
+                                              true) {
+                                            app.app.additionalSettings[
+                                                'noVersionDetection'] = false;
+                                            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,8 +230,8 @@ class AppsPageState extends State<AppsPage> {
                 delegate: SliverChildBuilderDelegate(
                     (BuildContext context, int index) {
               String? changesUrl = SourceProvider()
-                  .getSource(sortedApps[index].app.url)
+                  .getSource(listedApps[index].app.url)
-                  .changeLogPageFromStandardUrl(sortedApps[index].app.url);
+                  .changeLogPageFromStandardUrl(listedApps[index].app.url);
               var transparent = const Color.fromARGB(0, 0, 0, 0).value;
               return Container(
                   decoration: BoxDecoration(
@@ -234,52 +239,53 @@ class AppsPageState extends State<AppsPage> {
                           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),
+                        .withOpacity(listedApps[index].app.pinned ? 0.2 : 0.1),
-                    selected: selectedApps.contains(sortedApps[index].app),
+                    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,
                     title: Text(
-                      sortedApps[index].installedInfo?.name ??
+                      listedApps[index].installedInfo?.name ??
-                          sortedApps[index].app.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]),
                         style: TextStyle(
-                            fontWeight: sortedApps[index].app.pinned
+                            fontWeight: listedApps[index].app.pinned
                                 ? FontWeight.bold
                                 : FontWeight.normal)),
                     trailing: SingleChildScrollView(
                         reverse: true,
-                        child: sortedApps[index].downloadProgress != null
+                        child: listedApps[index].downloadProgress != null
                             ? Text(tr('percentProgress', args: [
-                                sortedApps[index]
+                                listedApps[index]
                                         .downloadProgress
                                         ?.toInt()
                                         .toString() ??
@@ -289,60 +295,101 @@ class AppsPageState extends State<AppsPage> {
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 crossAxisAlignment: CrossAxisAlignment.end,
                                 children: [
-                                  SizedBox(
+                                  Row(
-                                      width: 100,
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        Text(
+                                          '${listedApps[index].app.installedVersion ?? tr('notInstalled')}${listedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                          overflow: TextOverflow.ellipsis,
+                                          textAlign: TextAlign.end,
+                                        )
+                                      ]),
+                                  GestureDetector(
+                                      onTap: changesUrl == null
+                                          ? null
+                                          : () {
+                                              launchUrlString(changesUrl,
+                                                  mode: LaunchMode
+                                                      .externalApplication);
+                                            },
                                       child: Text(
-                                        '${sortedApps[index].app.installedVersion ?? tr('notInstalled')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBrackets')}' : ''}',
+                                        listedApps[index].app.releaseDate ==
-                                        overflow: TextOverflow.fade,
+                                                null
-                                        textAlign: TextAlign.end,
+                                            ? tr('changes')
+                                            : DateFormat('yyyy-MM-dd').format(
+                                                listedApps[index]
+                                                    .app
+                                                    .releaseDate!),
+                                        style: const TextStyle(
+                                            fontStyle: FontStyle.italic,
+                                            decoration:
+                                                TextDecoration.underline),
                                       )),
-                                  sortedApps[index].app.installedVersion !=
+                                  listedApps[index].app.installedVersion !=
                                               null &&
-                                          sortedApps[index]
+                                          listedApps[index]
                                                   .app
                                                   .installedVersion !=
-                                              sortedApps[index]
+                                              listedApps[index]
                                                   .app
                                                   .latestVersion
-                                      ? GestureDetector(
+                                      ? appsProvider.areDownloadsRunning()
-                                          onTap: changesUrl == null
+                                          ? Text(tr('pleaseWait'))
-                                              ? null
+                                          : Row(
-                                              : () {
+                                              mainAxisSize: MainAxisSize.min,
-                                                  launchUrlString(changesUrl,
+                                              mainAxisAlignment:
-                                                      mode: LaunchMode
+                                                  MainAxisAlignment.end,
-                                                          .externalApplication);
+                                              children: [
-                                                },
+                                                GestureDetector(
-                                          child: appsProvider
+                                                    onTap: () {
-                                                  .areDownloadsRunning()
+                                                      appsProvider
-                                              ? Text(tr('pleaseWait'))
+                                                          .downloadAndInstallLatestApps(
-                                              : Text(
+                                                              [
-                                                  '${tr('updateAvailable')}${sortedApps[index].app.additionalSettings['trackOnly'] == true ? ' ${tr('estimateInBracketsShort')}' : ''}',
+                                                            listedApps[index]
-                                                  style: TextStyle(
+                                                                .app
-                                                      fontStyle:
+                                                                .id
-                                                          FontStyle.italic,
+                                                          ],
-                                                      decoration: changesUrl ==
+                                                              globalNavigatorKey
-                                                              null
+                                                                  .currentContext).catchError(
-                                                          ? TextDecoration.none
+                                                              (e) {
-                                                          : TextDecoration
+                                                        showError(e, context);
-                                                              .underline),
+                                                      });
-                                                ))
+                                                    },
-                                      : const SizedBox(),
+                                                    child: Text(
+                                                      listedApps[index]
+                                                                      .app
+                                                                      .additionalSettings[
+                                                                  'trackOnly'] ==
+                                                              true
+                                                          ? tr('markUpdated')
+                                                          : tr('update'),
+                                                      style: TextStyle(
+                                                          color:
+                                                              Theme.of(context)
+                                                                  .colorScheme
+                                                                  .primary,
+                                                          fontWeight:
+                                                              FontWeight.bold),
+                                                    )),
+                                              ],
+                                            )
+                                      : const SizedBox.shrink(),
                                 ],
                               ))),
                     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 +401,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(

lib/pages/settings.dart

@@ -101,6 +101,10 @@ class _SettingsPageState extends State<SettingsPage> {
           DropdownMenuItem(
             value: SortColumnSettings.added,
             child: Text(tr('asAdded')),
+          ),
+          DropdownMenuItem(
+            value: SortColumnSettings.releaseDate,
+            child: Text(tr('releaseDate')),
           )
         ],
         onChanged: (value) {

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;

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 }
 

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() {
@@ -111,30 +114,34 @@ class App {
       preferredApkIndex = 0;
     }
     return App(
-        json['id'] as String,
+      json['id'] as String,
-        json['url'] as String,
+      json['url'] as String,
-        json['author'] as String,
+      json['author'] as String,
-        json['name'] as String,
+      json['name'] as String,
-        json['installedVersion'] == null
+      json['installedVersion'] == null
-            ? null
+          ? null
-            : json['installedVersion'] as String,
+          : json['installedVersion'] as String,
-        json['latestVersion'] as String,
+      json['latestVersion'] as String,
-        json['apkUrls'] == null
+      json['apkUrls'] == null
-            ? []
+          ? []
-            : List<String>.from(jsonDecode(json['apkUrls'])),
+          : List<String>.from(jsonDecode(json['apkUrls'])),
-        preferredApkIndex,
+      preferredApkIndex,
-        additionalSettings,
+      additionalSettings,
-        json['lastUpdateCheck'] == null
+      json['lastUpdateCheck'] == null
-            ? null
+          ? null
-            : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
+          : DateTime.fromMicrosecondsSinceEpoch(json['lastUpdateCheck']),
-        json['pinned'] ?? false,
+      json['pinned'] ?? false,
-        categories: json['categories'] != null
+      categories: json['categories'] != null
-            ? (json['categories'] as List<dynamic>)
+          ? (json['categories'] as List<dynamic>)
-                .map((e) => e.toString())
+              .map((e) => e.toString())
-                .toList()
+              .toList()
-            : json['category'] != null
+          : json['category'] != null
-                ? [json['category'] as String]
+              ? [json['category'] as String]
-                : []);
+              : [],
+      releaseDate: json['releaseDate'] == null
+          ? null
+          : DateTime.fromMicrosecondsSinceEpoch(json['releaseDate']),
+    );
   }
 
   Map<String, dynamic> toJson() => {
@@ -149,7 +156,8 @@ class App {
         'additionalSettings': jsonEncode(additionalSettings),
         'lastUpdateCheck': lastUpdateCheck?.microsecondsSinceEpoch,
         'pinned': pinned,
-        'categories': categories
+        'categories': categories,
+        'releaseDate': releaseDate?.microsecondsSinceEpoch
       };
 }
 
@@ -225,6 +233,10 @@ class AppSource {
         label: tr('trackOnly'),
       )
     ],
+    [
+      GeneratedFormSwitch('releaseDateAsVersion',
+          label: tr('useReleaseDateAsVersion'))
+    ],
     [
       GeneratedFormSwitch('noVersionDetection', label: tr('noVersionDetection'))
     ],
@@ -350,34 +362,28 @@ class SourceProvider {
     return false;
   }
 
-  String generateTempID(AppNames names, AppSource source) =>
+  String generateTempID(
-      '${names.author.toLowerCase()}_${names.name.toLowerCase()}_${source.host}';
+          String standardUrl, Map<String, dynamic> additionalSettings) =>
+      (standardUrl + additionalSettings.toString()).hashCode.toString();
 
-  bool isTempId(String id) {
+  bool isTempId(App app) {
-    List<String> parts = id.split('_');
+    return app.id == generateTempID(app.url, app.additionalSettings);
-    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;
   }
 
   Future<App> getApp(
-    AppSource source,
+      AppSource source, String url, Map<String, dynamic> additionalSettings,
-    String url,
+      {App? currentApp,
-    Map<String, dynamic> additionalSettings, {
+      bool trackOnlyOverride = false,
-    App? currentApp,
+      bool noVersionDetectionOverride = false,
-    bool trackOnlyOverride = false,
+      bool releaseDateAsVersionOverride = false}) async {
-    noVersionDetectionOverride = false,
-  }) async {
     if (trackOnlyOverride || source.enforceTrackOnly) {
       additionalSettings['trackOnly'] = true;
     }
+    if (releaseDateAsVersionOverride) {
+      additionalSettings['releaseDateAsVersion'] = true;
+      noVersionDetectionOverride =
+          true; // Rel. date as version means no ver. det.
+    }
     if (noVersionDetectionOverride) {
       additionalSettings['noVersionDetection'] = true;
     }
@@ -385,6 +391,10 @@ class SourceProvider {
     String standardUrl = source.standardizeURL(preStandardizeUrl(url));
     APKDetails apk =
         await source.getLatestAPKDetails(standardUrl, additionalSettings);
+    if (additionalSettings['releaseDateAsVersion'] == true &&
+        apk.releaseDate != null) {
+      apk.version = apk.releaseDate!.microsecondsSinceEpoch.toString();
+    }
     if (additionalSettings['apkFilterRegEx'] != null) {
       var reg = RegExp(additionalSettings['apkFilterRegEx']);
       apk.apkUrls =
@@ -400,7 +410,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 +423,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

@@ -258,10 +258,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:

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.12+118 # When changing this, update the tag in main() accordingly
+version: 0.11.0+119 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'