chore: merge dev branch to main branch (#1032)

2024-05-14 13:56:57 +02:00 · 2023-07-23 13:53:25 +05:30 · 2023-07-23 13:53:25 +05:30 · fd43ac7581
commit fd43ac7581
parent 768ad0c9bc e49c19b3cd
7 changed files with 84 additions and 60 deletions
--- a/.github/workflows/analyze.yml
+++ b/.github/workflows/analyze.yml
@ -1,14 +1,25 @@
 name: Analyze Code

 on:
+  push:
+    branches: [ "dev" ]
+    paths: 
+      - "**.dart"
+      - ".github/workflows/analyze.yml"
  pull_request:
    branches: [ "main", "dev" ]
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
    paths: 
      - "**.dart"
      - ".github/workflows/analyze.yml"

 jobs:
  build:
+    name: "Static analysis & format check"
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -2,23 +2,29 @@
    package="app.revanced.manager.flutter">
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.INTERNET" />
+
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    
    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />

+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
   <application
        android:label="ReVanced Manager"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:largeHeap="true"
+        android:requestLegacyExternalStorage="true"
        android:extractNativeLibs="true"
        android:enableOnBackInvokedCallback="true">
        <activity
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M -XX:+UseParallelGC
+org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.caching=true
 android.useAndroidX=true
 android.enableJetifier=true
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@ -1 +1 @@
-Patch your favourite apps, right on your device.
+Patch your favorite apps, right on your device.
--- a/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart
+++ b/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart
@ -93,7 +93,9 @@ class SManageApiUrl extends BaseViewModel {
            onPressed: () {
              _managerAPI.setApiUrl('');
              _toast.showBottom('settingsView.restartAppForChanges');
-              Navigator.of(context).pop();
+              Navigator.of(context)
+                ..pop()
+                ..pop();
            },
          )
        ],
--- a/lib/ui/widgets/homeView/installed_apps_card.dart
+++ b/lib/ui/widgets/homeView/installed_apps_card.dart
@ -8,24 +8,14 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/application_item.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';

-class InstalledAppsCard extends StatefulWidget {
-  const InstalledAppsCard({Key? key}) : super(key: key);
+//ignore: must_be_immutable
+class InstalledAppsCard extends StatelessWidget {
+  InstalledAppsCard({Key? key}) : super(key: key);

-  @override
-  State<InstalledAppsCard> createState() => _InstalledAppsCardState();
-}
-
-class _InstalledAppsCardState extends State<InstalledAppsCard> {
  List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
  final ManagerAPI _managerAPI = locator<ManagerAPI>();
  List<PatchedApplication> patchedApps = [];

-  @override
-  void initState() {
-    super.initState();
-    _getApps();
-  }
-
  Future _getApps() async {
    if (apps.isNotEmpty) {
      patchedApps = [...apps];
@ -41,54 +31,66 @@ class _InstalledAppsCardState extends State<InstalledAppsCard> {
        apps.clear();
        apps = [...patchedApps];
      }
-      setState(() {});
    }
  }

  @override
  Widget build(BuildContext context) {
-    return apps.isEmpty
-        ? CustomCard(
-            child: Center(
-              child: Column(
-                children: <Widget>[
-                  Icon(
-                    size: 40,
-                    Icons.file_download_off,
-                    color: Theme.of(context).colorScheme.secondary,
-                  ),
-                  const SizedBox(height: 16),
-                  I18nText(
-                    'homeView.noInstallations',
-                    child: Text(
-                      '',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                            color: Theme.of(context).colorScheme.secondary,
+    return FutureBuilder(
+      future: _getApps(),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          return apps.isEmpty
+              ? CustomCard(
+                  child: Center(
+                    child: Column(
+                      children: <Widget>[
+                        Icon(
+                          size: 40,
+                          Icons.file_download_off,
+                          color: Theme.of(context).colorScheme.secondary,
+                        ),
+                        const SizedBox(height: 16),
+                        I18nText(
+                          'homeView.noInstallations',
+                          child: Text(
+                            '',
+                            textAlign: TextAlign.center,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                ),
                          ),
+                        )
+                      ],
                    ),
-                  )
-                ],
-              ),
-            ),
-          )
-        : ListView(
-            shrinkWrap: true,
-            padding: EdgeInsets.zero,
-            physics: const NeverScrollableScrollPhysics(),
-            children: apps
-                .map(
-                  (app) => ApplicationItem(
-                    icon: app.icon,
-                    name: app.name,
-                    patchDate: app.patchDate,
-                    changelog: app.changelog,
-                    isUpdatableApp: false,
-                    onPressed: () =>
-                        locator<HomeViewModel>().navigateToAppInfo(app),
                  ),
                )
-                .toList(),
-          );
+              : ListView(
+                  shrinkWrap: true,
+                  padding: EdgeInsets.zero,
+                  physics: const NeverScrollableScrollPhysics(),
+                  children: apps
+                      .map(
+                        (app) => ApplicationItem(
+                          icon: app.icon,
+                          name: app.name,
+                          patchDate: app.patchDate,
+                          changelog: app.changelog,
+                          isUpdatableApp: false,
+                          onPressed: () =>
+                              locator<HomeViewModel>().navigateToAppInfo(app),
+                        ),
+                      )
+                      .toList(),
+                );
+        } else {
+          return const Center(child: CircularProgressIndicator());
+        }
+      },
+    );
  }
 }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -59,7 +59,7 @@ dependencies:
  root:
    git:
      url: https://github.com/EvadeMaster/root
-      ref: 9bcf0dc06b8e2e3ccd5fbd16bc849938e817b36b
+      ref: 82803aa40f63cddff81c3e4d27ce8ce3e7c83f60
  share_extend: ^2.0.0
  shared_preferences: ^2.1.0
  skeletons: ^0.0.3