Merge pull request #1478 from ImranR98/dev

Resume failed downloads when possible instead of starting again (#634), Typo: 'Installed' not 'Updated' (#1469) + Bugfix: Don't incorrectly show message when user cancel, Add changelog button to app page (#1474)
ImranR98 · Mar 17, 2024 · 3817585 · 3817585
2 parents 4495051 + da496f7
commit 3817585
Show file tree

Hide file tree

Showing 9 changed files with 268 additions and 188 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,6 @@ jobs:
           if [ ${{ inputs.beta }} == true ]; then BETA=true; else BETA=false; fi
           echo "beta=$BETA" >> $GITHUB_OUTPUT
           TAG="v$VERSION"
-          if [ $BETA == true ]; then TAG="$TAG"-beta; fi
           echo "tag=$TAG" >> $GITHUB_OUTPUT
 
       - name: Build APKs

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,19 +22,15 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'dev.rikka.tools.refine'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace "dev.imranr.obtainium"
+    compileSdk flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -54,7 +51,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 24
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,22 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.10'
-    ext {
-        compileSdkVersion   = 34                // or latest
-        targetSdkVersion    = 34                // or latest
-        appCompatVersion    = "1.4.2"           // or latest
-    }
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "dev.rikka.tools.refine:gradle-plugin:4.3.1"
-    }
-}
-
 allprojects {
     repositories {
         google()

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+}
+
+include ":app"
diff --git a/lib/pages/app.dart b/lib/pages/app.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:obtainium/components/generated_form_modal.dart';
 import 'package:obtainium/custom_errors.dart';
 import 'package:obtainium/main.dart';
+import 'package:obtainium/pages/apps.dart';
 import 'package:obtainium/pages/settings.dart';
 import 'package:obtainium/providers/apps_provider.dart';
 import 'package:obtainium/providers/settings_provider.dart';
@@ -108,6 +109,7 @@ class _AppPageState extends State<AppPage> {
         infoLines =
             '$infoLines\n${app?.app.apkUrls.length == 1 ? app?.app.apkUrls[0].key : plural('apk', app?.app.apkUrls.length ?? 0)}';
       }
+      var changeLogFn = app != null ? getChangeLogFn(context, app.app) : null;
       return Column(
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -125,13 +127,26 @@ class _AppPageState extends State<AppPage> {
                         .textTheme
                         .bodyLarge!
                         .copyWith(fontWeight: FontWeight.bold)),
-                app?.app.releaseDate == null
-                    ? const SizedBox.shrink()
-                    : Text(
-                        app!.app.releaseDate.toString(),
-                        textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.labelSmall,
-                      ),
+                changeLogFn != null || app?.app.releaseDate != null
+                    ? GestureDetector(
+                        onTap: changeLogFn,
+                        child: Text(
+                          app?.app.releaseDate == null
+                              ? tr('changes')
+                              : app!.app.releaseDate.toString(),
+                          textAlign: TextAlign.center,
+                          style:
+                              Theme.of(context).textTheme.labelSmall!.copyWith(
+                                    decoration: changeLogFn != null
+                                        ? TextDecoration.underline
+                                        : null,
+                                    fontStyle: changeLogFn != null
+                                        ? FontStyle.italic
+                                        : null,
+                                  ),
+                        ),
+                      )
+                    : const SizedBox.shrink(),
                 const SizedBox(
                   height: 8,
                 ),
@@ -361,14 +376,17 @@ class _AppPageState extends State<AppPage> {
                 !areDownloadsRunning
             ? () async {
                 try {
+                  var successMessage = app?.app.installedVersion == null
+                      ? tr('installed')
+                      : tr('appsUpdated');
                   HapticFeedback.heavyImpact();
                   var res = await appsProvider.downloadAndInstallLatestApps(
                     app?.app.id != null ? [app!.app.id] : [],
                     globalNavigatorKey.currentContext,
                   );
                   if (res.isNotEmpty && !trackOnly) {
                     // ignore: use_build_context_synchronously
-                    showMessage(tr('appsUpdated'), context);
+                    showMessage(successMessage, context);
                   }
                   if (res.isNotEmpty && mounted) {
                     Navigator.of(context).pop();

diff --git a/lib/pages/apps.dart b/lib/pages/apps.dart
@@ -26,6 +26,92 @@ class AppsPage extends StatefulWidget {
   State<AppsPage> createState() => AppsPageState();
 }
 
+showChangeLogDialog(BuildContext context, App app, String? changesUrl,
+    AppSource appSource, String changeLog) {
+  showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return GeneratedFormModal(
+          title: tr('changes'),
+          items: const [],
+          message: app.latestVersion,
+          additionalWidgets: [
+            changesUrl != null
+                ? GestureDetector(
+                    child: Text(
+                      changesUrl,
+                      style: const TextStyle(
+                          decoration: TextDecoration.underline,
+                          fontStyle: FontStyle.italic),
+                    ),
+                    onTap: () {
+                      launchUrlString(changesUrl,
+                          mode: LaunchMode.externalApplication);
+                    },
+                  )
+                : const SizedBox.shrink(),
+            changesUrl != null
+                ? const SizedBox(
+                    height: 16,
+                  )
+                : const SizedBox.shrink(),
+            appSource.changeLogIfAnyIsMarkDown
+                ? SizedBox(
+                    width: MediaQuery.of(context).size.width,
+                    height: MediaQuery.of(context).size.height - 350,
+                    child: Markdown(
+                      data: changeLog,
+                      onTapLink: (text, href, title) {
+                        if (href != null) {
+                          launchUrlString(
+                              href.startsWith('http://') ||
+                                      href.startsWith('https://')
+                                  ? href
+                                  : '${Uri.parse(app.url).origin}/$href',
+                              mode: LaunchMode.externalApplication);
+                        }
+                      },
+                      extensionSet: md.ExtensionSet(
+                        md.ExtensionSet.gitHubFlavored.blockSyntaxes,
+                        [
+                          md.EmojiSyntax(),
+                          ...md.ExtensionSet.gitHubFlavored.inlineSyntaxes
+                        ],
+                      ),
+                    ))
+                : Text(changeLog),
+          ],
+          singleNullReturnButton: tr('ok'),
+        );
+      });
+}
+
+getChangeLogFn(BuildContext context, App app) {
+  AppSource appSource =
+      SourceProvider().getSource(app.url, overrideSource: app.overrideSource);
+  String? changesUrl = appSource.changeLogPageFromStandardUrl(app.url);
+  String? changeLog = app.changeLog;
+  if (changeLog?.split('\n').length == 1) {
+    if (RegExp(
+            '(http|ftp|https)://([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:/~+#-]*[\\w@?^=%&/~+#-])?')
+        .hasMatch(changeLog!)) {
+      if (changesUrl == null) {
+        changesUrl = changeLog;
+        changeLog = null;
+      }
+    }
+  }
+  return (changeLog == null && changesUrl == null)
+      ? null
+      : () {
+          if (changeLog != null) {
+            showChangeLogDialog(context, app, changesUrl, appSource, changeLog);
+          } else {
+            launchUrlString(changesUrl!, mode: LaunchMode.externalApplication);
+          }
+        };
+}
+
 class AppsPageState extends State<AppsPage> {
   AppsFilter filter = AppsFilter();
   final AppsFilter neutralFilter = AppsFilter();
@@ -262,66 +348,6 @@ class AppsPageState extends State<AppsPage> {
         .where((a) => selectedAppIds.contains(a.id))
         .toSet();
 
-    showChangeLogDialog(
-        String? changesUrl, AppSource appSource, String changeLog, int index) {
-      showDialog(
-          context: context,
-          builder: (BuildContext context) {
-            return GeneratedFormModal(
-              title: tr('changes'),
-              items: const [],
-              message: listedApps[index].app.latestVersion,
-              additionalWidgets: [
-                changesUrl != null
-                    ? GestureDetector(
-                        child: Text(
-                          changesUrl,
-                          style: const TextStyle(
-                              decoration: TextDecoration.underline,
-                              fontStyle: FontStyle.italic),
-                        ),
-                        onTap: () {
-                          launchUrlString(changesUrl,
-                              mode: LaunchMode.externalApplication);
-                        },
-                      )
-                    : const SizedBox.shrink(),
-                changesUrl != null
-                    ? const SizedBox(
-                        height: 16,
-                      )
-                    : const SizedBox.shrink(),
-                appSource.changeLogIfAnyIsMarkDown
-                    ? SizedBox(
-                        width: MediaQuery.of(context).size.width,
-                        height: MediaQuery.of(context).size.height - 350,
-                        child: Markdown(
-                          data: changeLog,
-                          onTapLink: (text, href, title) {
-                            if (href != null) {
-                              launchUrlString(
-                                  href.startsWith('http://') ||
-                                          href.startsWith('https://')
-                                      ? href
-                                      : '${Uri.parse(listedApps[index].app.url).origin}/$href',
-                                  mode: LaunchMode.externalApplication);
-                            }
-                          },
-                          extensionSet: md.ExtensionSet(
-                            md.ExtensionSet.gitHubFlavored.blockSyntaxes,
-                            [
-                              md.EmojiSyntax(),
-                              ...md.ExtensionSet.gitHubFlavored.inlineSyntaxes
-                            ],
-                          ),
-                        ))
-                    : Text(changeLog),
-              ],
-              singleNullReturnButton: tr('ok'),
-            );
-          });
-    }
-
     getLoadingWidgets() {
       return [
         if (listedApps.isEmpty)
@@ -351,35 +377,6 @@ class AppsPageState extends State<AppsPage> {
       ];
     }
 
-    getChangeLogFn(int appIndex) {
-      AppSource appSource = SourceProvider().getSource(
-          listedApps[appIndex].app.url,
-          overrideSource: listedApps[appIndex].app.overrideSource);
-      String? changesUrl =
-          appSource.changeLogPageFromStandardUrl(listedApps[appIndex].app.url);
-      String? changeLog = listedApps[appIndex].app.changeLog;
-      if (changeLog?.split('\n').length == 1) {
-        if (RegExp(
-                '(http|ftp|https)://([\\w_-]+(?:(?:\\.[\\w_-]+)+))([\\w.,@?^=%&:/~+#-]*[\\w@?^=%&/~+#-])?')
-            .hasMatch(changeLog!)) {
-          if (changesUrl == null) {
-            changesUrl = changeLog;
-            changeLog = null;
-          }
-        }
-      }
-      return (changeLog == null && changesUrl == null)
-          ? null
-          : () {
-              if (changeLog != null) {
-                showChangeLogDialog(changesUrl, appSource, changeLog, appIndex);
-              } else {
-                launchUrlString(changesUrl!,
-                    mode: LaunchMode.externalApplication);
-              }
-            };
-    }
-
     getUpdateButton(int appIndex) {
       return IconButton(
           visualDensity: VisualDensity.compact,
@@ -444,7 +441,7 @@ class AppsPageState extends State<AppsPage> {
     }
 
     getSingleAppHorizTile(int index) {
-      var showChangesFn = getChangeLogFn(index);
+      var showChangesFn = getChangeLogFn(context, listedApps[index].app);
       var hasUpdate = listedApps[index].app.installedVersion != null &&
           listedApps[index].app.installedVersion !=
               listedApps[index].app.latestVersion;