Increment version

lib/app_sources/fdroid.dart

@@ -34,23 +34,39 @@ class FDroid implements AppSource {
       String standardUrl, List<String> additionalData) async {
     Response res = await get(Uri.parse(standardUrl));
     if (res.statusCode == 200) {
-      var latestReleaseDiv =
-          parse(res.body).querySelector('#latest.package-version');
-      var apkUrl = latestReleaseDiv
-          ?.querySelector('.package-version-download a')
-          ?.attributes['href'];
-      if (apkUrl == null) {
-        throw noAPKFound;
+      var releases = parse(res.body).querySelectorAll('.package-version');
+      if (releases.isEmpty) {
+        throw couldNotFindReleases;
       }
-      var version = latestReleaseDiv
-          ?.querySelector('.package-version-header b')
+      String? latestVersion = releases[0]
+          .querySelector('.package-version-header b')
           ?.innerHtml
           .split(' ')
-          .last;
-      if (version == null) {
+          .sublist(1)
+          .join(' ');
+      if (latestVersion == null) {
         throw couldNotFindLatestVersion;
       }
-      return APKDetails(version, [apkUrl]);
+      List<String> apkUrls = releases
+          .where((element) =>
+              element
+                  .querySelector('.package-version-header b')
+                  ?.innerHtml
+                  .split(' ')
+                  .sublist(1)
+                  .join(' ') ==
+              latestVersion)
+          .map((e) =>
+              e
+                  .querySelector('.package-version-download a')
+                  ?.attributes['href'] ??
+              '')
+          .where((element) => element.isNotEmpty)
+          .toList();
+      if (apkUrls.isEmpty) {
+        throw noAPKFound;
+      }
+      return APKDetails(latestVersion, apkUrls);
     } else {
       throw couldNotFindReleases;
     }

lib/app_sources/github.dart

@@ -69,9 +69,10 @@ class GitHub implements AppSource {
         if (!includePrereleases && releases[i]['prerelease'] == true) {
           continue;
         }
+
         if (regexFilter != null &&
             !RegExp(regexFilter)
-                .hasMatch((releases[i]['name'] as String).trim())) {
+                .hasMatch((releases[i]['tag_name'] as String).trim())) {
           continue;
         }
         var apkUrls = getReleaseAPKUrls(releases[i]);

lib/main.dart

@@ -14,7 +14,7 @@ import 'package:workmanager/workmanager.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 
-const String currentVersion = '0.6.0';
+const String currentVersion = '0.6.3';
 const String currentReleaseTag =
     'v$currentVersion-beta'; // KEEP THIS IN SYNC WITH GITHUB RELEASES
 

lib/pages/add_app.dart

@@ -121,8 +121,10 @@ class _AddAppPageState extends State<AddAppPage> {
                                             app.preferredApkIndex =
                                                 app.apkUrls.indexOf(apkUrl);
                                             var downloadedApk =
-                                                await appsProvider
-                                                    .downloadApp(app);
+                                                await appsProvider.downloadApp(
+                                                    app,
+                                                    showOccasionalProgressToast:
+                                                        true);
                                             app.id = downloadedApk.appId;
                                             if (appsProvider.apps
                                                 .containsKey(app.id)) {
@@ -154,7 +156,8 @@ class _AddAppPageState extends State<AddAppPage> {
                                   child: const Text('Add'))
                         ],
                       ),
-                      if (pickedSource != null)
+                      if (pickedSource != null &&
+                          pickedSource!.additionalDataDefaults.isNotEmpty)
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.stretch,
                           children: [

lib/pages/app.dart

@@ -62,10 +62,13 @@ class _AppPageState extends State<AppPage> {
                                 children: [
                                     Image.memory(
                                       app!.installedInfo!.icon!,
-                                      scale: 1.5,
+                                      height: 150,
                                     )
                                   ])
                             : Container(),
+                        const SizedBox(
+                          height: 25,
+                        ),
                         Text(
                           app?.installedInfo?.name ?? app?.app.name ?? 'App',
                           textAlign: TextAlign.center,

lib/pages/apps.dart

@@ -212,8 +212,15 @@ class AppsPageState extends State<AppsPage> {
                                       )),
                             ],
                           )
-                        : Text(sortedApps[index].app.installedVersion ??
-                            'Not Installed')),
+                        : SingleChildScrollView(
+                            child: SizedBox(
+                                width: 80,
+                                child: Text(
+                                  sortedApps[index].app.installedVersion ??
+                                      'Not Installed',
+                                  overflow: TextOverflow.fade,
+                                  textAlign: TextAlign.end,
+                                )))),
                 onTap: () {
                   if (selectedIds.isNotEmpty) {
                     toggleAppSelected(sortedApps[index].app.id);
@@ -310,15 +317,20 @@ class AppsPageState extends State<AppsPage> {
                                     message:
                                         '${existingUpdateIdsAllOrSelected.length} update${existingUpdateIdsAllOrSelected.length == 1 ? '' : 's'} and ${newInstallIdsAllOrSelected.length} new install${newInstallIdsAllOrSelected.length == 1 ? '' : 's'}.',
                                     items: formInputs,
-                                    defaultValues: const ['true'],
+                                    defaultValues: [
+                                      'true',
+                                      existingUpdateIdsAllOrSelected.isEmpty
+                                          ? 'true'
+                                          : ''
+                                    ],
                                     initValid: true,
                                   );
                                 }).then((values) {
                               if (values != null) {
                                 bool shouldInstallUpdates =
-                                    values.length < 2 || values[0] == 'true';
-                                bool shouldInstallNew =
-                                    values.length >= 2 && values[1] == 'true';
+                                    values.isEmpty || values[0] == 'true';
+                                bool shouldInstallNew = values.isEmpty ||
+                                    (values.length >= 2 && values[1] == 'true');
                                 settingsProvider
                                     .getInstallPermission()
                                     .then((_) {

lib/providers/apps_provider.dart

@@ -8,6 +8,7 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:install_plugin_v2/install_plugin_v2.dart';
 import 'package:installed_apps/app_info.dart';
 import 'package:installed_apps/installed_apps.dart';
@@ -115,7 +116,9 @@ class AppsProvider with ChangeNotifier {
   // Downloads the App (preferred URL) and returns an ApkFile object
   // If the app was already saved, updates it's download progress % in memory
   // But also works for Apps that are not saved
-  Future<DownloadedApp> downloadApp(App app) async {
+  Future<DownloadedApp> downloadApp(App app,
+      {bool showOccasionalProgressToast = false}) async {
+    int? prevProg;
     var fileName = '${app.id}-${app.latestVersion}-${app.preferredApkIndex}';
     File downloadFile = await downloadApk(app.apkUrls[app.preferredApkIndex],
         '${app.id}-${app.latestVersion}-${app.preferredApkIndex}',
@@ -123,6 +126,14 @@ class AppsProvider with ChangeNotifier {
       if (apps[app.id] != null) {
         apps[app.id]!.downloadProgress = progress;
       }
+      int? prog = progress?.ceil();
+      if (showOccasionalProgressToast &&
+          (prog == 25 || prog == 50 || prog == 75) &&
+          prevProg != prog) {
+        Fluttertoast.showToast(
+            msg: 'Progress: $prog%', toastLength: Toast.LENGTH_SHORT);
+      }
+      prevProg = prog;
       notifyListeners();
     }, SourceProvider().getSource(app.url).apkUrlPrefetchModifier);
     // Delete older versions of the APK if any

lib/providers/source_provider.dart

@@ -104,6 +104,11 @@ preStandardizeUrl(String url) {
   if (url.toLowerCase().indexOf('https://www.') == 0) {
     url = 'https://${url.substring(12)}';
   }
+  url = url
+      .split('/')
+      .where((e) => e.isNotEmpty)
+      .join('/')
+      .replaceFirst(':/', '://');
   return url;
 }
 
@@ -205,7 +210,7 @@ class SourceProvider {
             ? name
             : names.name[0].toUpperCase() + names.name.substring(1),
         null,
-        apk.version,
+        apk.version.replaceAll('/', '-'),
         apk.apkUrls,
         apk.apkUrls.length - 1,
         additionalData,

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.6.0+44 # When changing this, update the tag in main() accordingly
+version: 0.6.3+47 # When changing this, update the tag in main() accordingly
 
 environment:
   sdk: '>=2.18.2 <3.0.0'