chore:fix incorrect version

faster build faster build faster build faster build faster build

.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

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

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

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.

lib/services/patcher_api.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 
-import 'package:app_installer/app_installer.dart';
 import 'package:collection/collection.dart';
 import 'package:cr_file_saver/file_saver.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
+import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
@@ -232,10 +232,8 @@ class PatcherAPI {
             );
           }
         } else {
-          await AppInstaller.installApk(_outFile!.path);
-          return await DeviceApps.isAppInstalled(
-            patchedApp.packageName,
-          );
+          final install = await InstallPlugin.installApk(_outFile!.path);
+          return install['isSuccess'];
         }
       } on Exception catch (e) {
         if (kDebugMode) {

lib/services/root_api.dart

@@ -73,7 +73,7 @@ class RootAPI {
   }
 
   Future<List<String>> getInstalledApps() async {
-    final List<String> apps = List.empty();
+    final List<String> apps = List.empty(growable: true);
     try {
       String? res = await Root.exec(
         cmd: 'ls "$_revancedDirPath"',

lib/ui/views/app_selector/app_selector_view.dart

@@ -88,7 +88,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                         ),
                       ),
                     )
-                  : model.apps.isEmpty
+                  : model.allApps.isEmpty
                       ? const AppSkeletonLoader()
                       : Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0)

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -45,9 +45,7 @@ class AppSelectorViewModel extends BaseViewModel {
           .length
           .compareTo(_patcherAPI.getFilteredPatches(a.packageName).length),
     );
-    noApps = apps.isEmpty;
     getAllApps();
-
     notifyListeners();
   }
 
@@ -57,7 +55,7 @@ class AppSelectorViewModel extends BaseViewModel {
         .toSet()
         .where((name) => !apps.any((app) => app.packageName == name))
         .toList();
-
+    noApps = allApps.isEmpty;
     return allApps;
   }
 

lib/ui/views/home/home_viewmodel.dart

@@ -1,13 +1,13 @@
 // ignore_for_file: use_build_context_synchronously
 import 'dart:async';
 import 'dart:io';
-import 'package:app_installer/app_installer.dart';
 import 'package:cross_connectivity/cross_connectivity.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:injectable/injectable.dart';
+import 'package:install_plugin/install_plugin.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
@@ -51,7 +51,7 @@ class HomeViewModel extends BaseViewModel {
           _toast.showBottom('homeView.installingMessage');
           final File? managerApk = await _managerAPI.downloadManager();
           if (managerApk != null) {
-            await AppInstaller.installApk(managerApk.path);
+            await InstallPlugin.installApk(managerApk.path);
           } else {
             _toast.showBottom('homeView.errorDownloadMessage');
           }
@@ -72,7 +72,7 @@ class HomeViewModel extends BaseViewModel {
       _toast.showBottom('homeView.installingMessage');
       final File? managerApk = await _managerAPI.downloadManager();
       if (managerApk != null) {
-        await AppInstaller.installApk(managerApk.path);
+        await InstallPlugin.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }
@@ -272,7 +272,7 @@ class HomeViewModel extends BaseViewModel {
                                 child: CustomMaterialButton(
                                   label: I18nText('updateButton'),
                                   onPressed: () async {
-                                    await AppInstaller.installApk(
+                                    await InstallPlugin.installApk(
                                       downloadedApk!.path,
                                     );
                                   },
@@ -318,7 +318,7 @@ class HomeViewModel extends BaseViewModel {
         //       UILocalNotificationDateInterpretation.absoluteTime,
         // );
         _toast.showBottom('homeView.installingMessage');
-        await AppInstaller.installApk(managerApk.path);
+        await InstallPlugin.installApk(managerApk.path);
       } else {
         _toast.showBottom('homeView.errorDownloadMessage');
       }

lib/ui/views/navigation/navigation_view.dart

@@ -13,58 +13,68 @@ class NavigationView extends StatelessWidget {
     return ViewModelBuilder<NavigationViewModel>.reactive(
       onViewModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => locator<NavigationViewModel>(),
-      builder: (context, model, child) => Scaffold(
-        body: PageTransitionSwitcher(
-          duration: const Duration(milliseconds: 400),
-          transitionBuilder: (
-            Widget child,
-            Animation<double> animation,
-            Animation<double> secondaryAnimation,
-          ) {
-            return FadeThroughTransition(
-              animation: animation,
-              secondaryAnimation: secondaryAnimation,
-              fillColor: Theme.of(context).colorScheme.surface,
-              child: child,
-            );
-          },
-          child: model.getViewForIndex(model.currentIndex),
-        ),
-        bottomNavigationBar: NavigationBar(
-          onDestinationSelected: model.setIndex,
-          selectedIndex: model.currentIndex,
-          destinations: <Widget>[
-            NavigationDestination(
-              icon: model.isIndexSelected(0)
-                  ? const Icon(Icons.dashboard)
-                  : const Icon(Icons.dashboard_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.dashboardTab',
+      builder: (context, model, child) => WillPopScope(
+        onWillPop: () async {
+          if (model.currentIndex == 0) {
+            return true;
+          } else {
+            model.setIndex(0);
+            return false;
+          }
+        },
+        child: Scaffold(
+          body: PageTransitionSwitcher(
+            duration: const Duration(milliseconds: 400),
+            transitionBuilder: (
+              Widget child,
+              Animation<double> animation,
+              Animation<double> secondaryAnimation,
+            ) {
+              return FadeThroughTransition(
+                animation: animation,
+                secondaryAnimation: secondaryAnimation,
+                fillColor: Theme.of(context).colorScheme.surface,
+                child: child,
+              );
+            },
+            child: model.getViewForIndex(model.currentIndex),
+          ),
+          bottomNavigationBar: NavigationBar(
+            onDestinationSelected: model.setIndex,
+            selectedIndex: model.currentIndex,
+            destinations: <Widget>[
+              NavigationDestination(
+                icon: model.isIndexSelected(0)
+                    ? const Icon(Icons.dashboard)
+                    : const Icon(Icons.dashboard_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.dashboardTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-            NavigationDestination(
-              icon: model.isIndexSelected(1)
-                  ? const Icon(Icons.build)
-                  : const Icon(Icons.build_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.patcherTab',
+              NavigationDestination(
+                icon: model.isIndexSelected(1)
+                    ? const Icon(Icons.build)
+                    : const Icon(Icons.build_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.patcherTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-            NavigationDestination(
-              icon: model.isIndexSelected(2)
-                  ? const Icon(Icons.settings)
-                  : const Icon(Icons.settings_outlined),
-              label: FlutterI18n.translate(
-                context,
-                'navigationView.settingsTab',
+              NavigationDestination(
+                icon: model.isIndexSelected(2)
+                    ? const Icon(Icons.settings)
+                    : const Icon(Icons.settings_outlined),
+                label: FlutterI18n.translate(
+                  context,
+                  'navigationView.settingsTab',
+                ),
+                tooltip: '',
               ),
-              tooltip: '',
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );

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();
             },
           )
         ],

lib/ui/widgets/appSelectorView/installed_app_item.dart

@@ -84,12 +84,16 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
                         },
                       ),
                       const SizedBox(width: 4),
-                      Text(
-                        widget.patchesCount == 1
-                            ? '• ${widget.patchesCount} patch'
-                            : '• ${widget.patchesCount} patches',
-                        style: TextStyle(
-                          color: Theme.of(context).colorScheme.secondary,
+                      Flexible(
+                        child: Text(
+                          widget.patchesCount == 1
+                              ? '• ${widget.patchesCount} patch'
+                              : '• ${widget.patchesCount} patches',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
                         ),
                       ),
                     ],

lib/ui/widgets/appSelectorView/not_installed_app_item.dart

@@ -78,12 +78,16 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
                         },
                       ),
                       const SizedBox(width: 4),
-                      Text(
-                        widget.patchesCount == 1
-                            ? '• ${widget.patchesCount} patch'
-                            : '• ${widget.patchesCount} patches',
-                        style: TextStyle(
-                          color: Theme.of(context).colorScheme.secondary,
+                      Flexible(
+                        child: Text(
+                          widget.patchesCount == 1
+                              ? '• ${widget.patchesCount} patch'
+                              : '• ${widget.patchesCount} patches',
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: TextStyle(
+                            color: Theme.of(context).colorScheme.secondary,
+                          ),
                         ),
                       ),
                     ],

lib/ui/widgets/homeView/installed_apps_card.dart

@@ -1,61 +1,96 @@
+import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patched_application.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 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';
 
+//ignore: must_be_immutable
 class InstalledAppsCard extends StatelessWidget {
   InstalledAppsCard({Key? key}) : super(key: key);
 
-  final List<PatchedApplication> apps =
-      locator<HomeViewModel>().patchedInstalledApps;
+  List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  List<PatchedApplication> patchedApps = [];
+
+  Future _getApps() async {
+    if (apps.isNotEmpty) {
+      patchedApps = [...apps];
+      for (final element in apps) {
+        await DeviceApps.getApp(element.packageName).then((value) {
+          if (element.version != value?.versionName) {
+            patchedApps.remove(element);
+          }
+        });
+      }
+      if (apps.length != patchedApps.length) {
+        await _managerAPI.setPatchedApps(patchedApps);
+        apps.clear();
+        apps = [...patchedApps];
+      }
+    }
+  }
 
   @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());
+        }
+      },
+    );
   }
 }

pubspec.yaml

@@ -4,14 +4,13 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 1.4.0+100400000
+version: 1.4.3+100400003
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
   animations: ^2.0.7
-  app_installer: ^1.1.0
   collection: ^1.17.0
   cross_connectivity: ^3.0.5
   cr_file_saver:
@@ -59,8 +58,8 @@ dependencies:
   pull_to_refresh: ^2.0.0
   root:
     git:
-      url: https://github.com/gokul1630/root
-      ref: main
+      url: https://github.com/EvadeMaster/root
+      ref: 82803aa40f63cddff81c3e4d27ce8ce3e7c83f60
   share_extend: ^2.0.0
   shared_preferences: ^2.1.0
   skeletons: ^0.0.3
@@ -75,6 +74,7 @@ dependencies:
   flutter_dotenv: ^5.0.2
   flutter_markdown: ^0.6.14
   dio_cache_interceptor: ^3.4.0
+  install_plugin: ^2.1.0
 
 dev_dependencies:
   json_serializable: ^6.6.1