build: Bump version to v0.0.23

Introduces new aapt2 binaries from revanced/aapt2

lib/services/github_api.dart

@@ -6,10 +6,18 @@ import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/models/patch.dart';
+import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 
 @lazySingleton
 class GithubAPI {
-  final Dio _dio = Dio(BaseOptions(baseUrl: 'https://api.github.com'));
+  final Dio _dio = Dio(
+    BaseOptions(baseUrl: 'https://api.github.com'),
+  )..httpClientAdapter = Http2Adapter(
+      ConnectionManager(
+        idleTimeout: 10000,
+        onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
+      ),
+    );
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
     const Duration(days: 1),

lib/services/manager_api.dart

@@ -319,4 +319,14 @@ class ManagerAPI {
     }
     return newCommits;
   }
+
+  Future<bool> isSplitApk(PatchedApplication patchedApp) async {
+    Application? app;
+    if (patchedApp.isFromStorage) {
+      app = await DeviceApps.getAppFromStorage(patchedApp.apkFilePath);
+    } else {
+      app = await DeviceApps.getApp(patchedApp.packageName);
+    }
+    return app != null && app.isSplit;
+  }
 }

lib/services/patcher_api.dart

@@ -87,10 +87,21 @@ class PatcherAPI {
         .toList();
   }
 
+  bool dependencyNeedsIntegrations(String name) {
+    return name.contains('integrations') ||
+        _patches.any(
+          (patch) =>
+              patch.name == name &&
+              (patch.dependencies.any(
+                (dep) => dependencyNeedsIntegrations(dep),
+              )),
+        );
+  }
+
   Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
     return selectedPatches.any(
       (patch) => patch.dependencies.any(
-        (dep) => dep.contains('integrations'),
+        (dep) => dependencyNeedsIntegrations(dep),
       ),
     );
   }

lib/services/revanced_api.dart

@@ -6,6 +6,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:timeago/timeago.dart';
+import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 
 @lazySingleton
 class RevancedAPI {
@@ -17,7 +18,15 @@ class RevancedAPI {
   );
 
   Future<void> initialize(String apiUrl) async {
-    _dio = Dio(BaseOptions(baseUrl: apiUrl));
+    _dio = Dio(BaseOptions(
+      baseUrl: apiUrl,
+    ))
+      ..httpClientAdapter = Http2Adapter(
+        ConnectionManager(
+          idleTimeout: 10000,
+          onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
+        ),
+      );
     _dio.interceptors.add(_dioCacheManager.interceptor);
   }
 

lib/services/root_api.dart

@@ -5,6 +5,15 @@ class RootAPI {
   final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
   final String _serviceDDirPath = '/data/adb/service.d';
 
+  Future<bool> isRooted() async {
+    try {
+      bool? isRooted = await Root.isRootAvailable();
+      return isRooted != null && isRooted;
+    } on Exception {
+      return false;
+    }
+  }
+
   Future<bool> hasRootPermissions() async {
     try {
       bool? isRooted = await Root.isRootAvailable();

lib/ui/views/installer/installer_view.dart

@@ -18,130 +18,134 @@ class InstallerView extends StatelessWidget {
       onModelReady: (model) => model.initialize(context),
       viewModelBuilder: () => InstallerViewModel(),
       builder: (context, model, child) => WillPopScope(
-        child: Scaffold(
-          body: CustomScrollView(
-            controller: model.scrollController,
-            slivers: <Widget>[
-              CustomSliverAppBar(
-                title: Text(
-                  model.headerLogs,
-                  style: GoogleFonts.inter(
-                    color: Theme.of(context).textTheme.headline6!.color,
-                  ),
-                ),
-                onBackButtonPressed: () => model.onWillPop(context),
-                actions: <Widget>[
-                  Visibility(
-                    visible: !model.isPatching && !model.hasErrors,
-                    child: CustomPopupMenu(
-                      onSelected: (value) => model.onMenuSelection(value),
-                      children: {
-                        0: I18nText(
-                          'installerView.shareApkMenuOption',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                        1: I18nText(
-                          'installerView.shareLogMenuOption',
-                          child: const Text(
-                            '',
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      },
+        child: SafeArea(
+          top: false,
+          child: Scaffold(
+            body: CustomScrollView(
+              controller: model.scrollController,
+              slivers: <Widget>[
+                CustomSliverAppBar(
+                  title: Text(
+                    model.headerLogs,
+                    style: GoogleFonts.inter(
+                      color: Theme.of(context).textTheme.headline6!.color,
                     ),
                   ),
-                ],
-                bottom: PreferredSize(
-                    preferredSize: const Size(double.infinity, 1.0),
-                    child:
-                        GradientProgressIndicator(progress: model.progress!)),
-              ),
-              SliverPadding(
-                padding: const EdgeInsets.all(20.0),
-                sliver: SliverList(
-                  delegate: SliverChildListDelegate.fixed(
-                    <Widget>[
-                      CustomCard(
-                        child: Text(
-                          model.logs,
-                          style: GoogleFonts.jetBrainsMono(
-                            fontSize: 13,
-                            height: 1.5,
+                  onBackButtonPressed: () => model.onWillPop(context),
+                  actions: <Widget>[
+                    Visibility(
+                      visible: !model.isPatching,
+                      child: CustomPopupMenu(
+                        onSelected: (value) => model.onMenuSelection(value),
+                        children: {
+                          if (!model.hasErrors)
+                            0: I18nText(
+                              'installerView.shareApkMenuOption',
+                              child: const Text(
+                                '',
+                                style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ),
+                          1: I18nText(
+                            'installerView.shareLogMenuOption',
+                            child: const Text(
+                              '',
+                              style: TextStyle(
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                          ),
+                        },
+                      ),
+                    ),
+                  ],
+                  bottom: PreferredSize(
+                      preferredSize: const Size(double.infinity, 1.0),
+                      child:
+                          GradientProgressIndicator(progress: model.progress!)),
+                ),
+                SliverPadding(
+                  padding: const EdgeInsets.all(20.0),
+                  sliver: SliverList(
+                    delegate: SliverChildListDelegate.fixed(
+                      <Widget>[
+                        CustomCard(
+                          child: Text(
+                            model.logs,
+                            style: GoogleFonts.jetBrainsMono(
+                              fontSize: 13,
+                              height: 1.5,
+                            ),
                           ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
                 ),
-              ),
-              SliverFillRemaining(
-                hasScrollBody: false,
-                child: Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Visibility(
-                    visible: !model.isPatching && !model.hasErrors,
-                    child: Padding(
-                      padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.end,
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: <Widget>[
-                          Visibility(
-                            visible: model.isInstalled,
-                            child: CustomMaterialButton(
-                              label: I18nText('installerView.openButton'),
-                              isExpanded: true,
-                              onPressed: () {
-                                model.openApp();
-                                model.cleanPatcher();
-                                Navigator.of(context).pop();
-                              },
-                            ),
-                          ),
-                          Visibility(
-                            visible: !model.isInstalled,
-                            child: CustomMaterialButton(
-                              isFilled: false,
-                              label:
-                                  I18nText('installerView.installRootButton'),
-                              isExpanded: true,
-                              onPressed: () => model.installResult(
-                                context,
-                                true,
+                SliverFillRemaining(
+                  hasScrollBody: false,
+                  child: Align(
+                    alignment: Alignment.bottomCenter,
+                    child: Visibility(
+                      visible: !model.isPatching && !model.hasErrors,
+                      child: Padding(
+                        padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Visibility(
+                              visible: model.isInstalled,
+                              child: CustomMaterialButton(
+                                label: I18nText('installerView.openButton'),
+                                isExpanded: true,
+                                onPressed: () {
+                                  model.openApp();
+                                  model.cleanPatcher();
+                                  Navigator.of(context).pop();
+                                },
                               ),
                             ),
-                          ),
-                          Visibility(
-                            visible: !model.isInstalled,
-                            child: const SizedBox(
-                              width: 16,
-                            ),
-                          ),
-                          Visibility(
-                            visible: !model.isInstalled,
-                            child: CustomMaterialButton(
-                              label: I18nText('installerView.installButton'),
-                              isExpanded: true,
-                              onPressed: () => model.installResult(
-                                context,
-                                false,
+                            Visibility(
+                              visible: !model.isInstalled && model.isRooted,
+                              child: CustomMaterialButton(
+                                isFilled: false,
+                                label:
+                                    I18nText('installerView.installRootButton'),
+                                isExpanded: true,
+                                onPressed: () => model.installResult(
+                                  context,
+                                  true,
+                                ),
                               ),
                             ),
-                          ),
-                        ],
+                            Visibility(
+                              visible: !model.isInstalled,
+                              child: const SizedBox(
+                                width: 16,
+                              ),
+                            ),
+                            Visibility(
+                              visible: !model.isInstalled,
+                              child: CustomMaterialButton(
+                                label: I18nText('installerView.installButton'),
+                                isExpanded: true,
+                                onPressed: () => model.installResult(
+                                  context,
+                                  false,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
                     ),
                   ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
         onWillPop: () => model.onWillPop(context),

lib/ui/views/installer/installer_viewmodel.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: use_build_context_synchronously
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -9,6 +10,7 @@ import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
+import 'package:revanced_manager/services/root_api.dart';
 import 'package:revanced_manager/services/toast.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -18,6 +20,7 @@ import 'package:wakelock/wakelock.dart';
 class InstallerViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
+  final RootAPI _rootAPI = RootAPI();
   final Toast _toast = locator<Toast>();
   final PatchedApplication _app = locator<PatcherViewModel>().selectedApp!;
   final List<Patch> _patches = locator<PatcherViewModel>().selectedPatches;
@@ -28,11 +31,13 @@ class InstallerViewModel extends BaseViewModel {
   double? progress = 0.0;
   String logs = '';
   String headerLogs = '';
+  bool isRooted = false;
   bool isPatching = true;
   bool isInstalled = false;
   bool hasErrors = false;
 
   Future<void> initialize(BuildContext context) async {
+    isRooted = await _rootAPI.isRooted();
     if (await Permission.ignoreBatteryOptimizations.isGranted) {
       try {
         FlutterBackground.initialize(

lib/ui/views/navigation/navigation_viewmodel.dart

@@ -32,7 +32,6 @@ class NavigationViewModel extends IndexTrackingViewModel {
       await prefs.setBool('useDarkTheme', isDark);
       await DynamicTheme.of(context)!.setTheme(isDark ? 1 : 0);
     }
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     SystemChrome.setSystemUIOverlayStyle(
       SystemUiOverlayStyle(
         systemNavigationBarColor: Colors.transparent,

lib/ui/views/patcher/patcher_viewmodel.dart

@@ -1,4 +1,3 @@
-import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:injectable/injectable.dart';
@@ -6,6 +5,7 @@ import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/app/app.router.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
+import 'package:revanced_manager/services/manager_api.dart';
 import 'package:revanced_manager/services/patcher_api.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 import 'package:stacked/stacked.dart';
@@ -14,6 +14,7 @@ import 'package:stacked_services/stacked_services.dart';
 @lazySingleton
 class PatcherViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
+  final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   PatchedApplication? selectedApp;
   List<Patch> selectedPatches = [];
@@ -39,13 +40,12 @@ class PatcherViewModel extends BaseViewModel {
   }
 
   Future<bool> isValidPatchConfig() async {
-    bool needsResourcePatching =
-        await _patcherAPI.needsResourcePatching(selectedPatches);
+    bool needsResourcePatching = await _patcherAPI.needsResourcePatching(
+      selectedPatches,
+    );
     if (needsResourcePatching && selectedApp != null) {
-      Application? app = await DeviceApps.getApp(selectedApp!.packageName);
-      if (app != null && app.isSplit) {
-        return false;
-      }
+      bool isSplit = await _managerAPI.isSplitApk(selectedApp!);
+      return !isSplit;
     }
     return true;
   }

lib/ui/widgets/patchesSelectorView/patch_item.dart

@@ -58,13 +58,28 @@ class _PatchItemState extends State<PatchItem> {
                         children: <Widget>[
                           Text(
                             widget.simpleName,
+                            maxLines: 2,
+                            overflow: TextOverflow.visible,
                             style: const TextStyle(
                               fontSize: 16,
                               fontWeight: FontWeight.w600,
                             ),
                           ),
                           const SizedBox(width: 4),
-                          Text(widget.version)
+                          Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 4,
+                              vertical: 2,
+                            ),
+                            decoration: BoxDecoration(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .background
+                                  .withOpacity(0.5),
+                              borderRadius: BorderRadius.circular(6),
+                            ),
+                            child: Text(widget.version),
+                          )
                         ],
                       ),
                       const SizedBox(height: 4),

lib/ui/widgets/shared/custom_material_button.dart

@@ -48,6 +48,7 @@ class CustomMaterialButton extends StatelessWidget {
   }
 }
 
+// ignore: must_be_immutable
 class TimerButton extends StatefulWidget {
   Widget label;
   bool isFilled;
@@ -119,7 +120,7 @@ class _TimerButtonState extends State<TimerButton> {
       onPressed: widget.isRunning ? null : widget.onTimerEnd,
       child: Text(
         widget.isRunning ? '${widget.seconds}' : 'Install',
-        style: TextStyle(
+        style: const TextStyle(
           fontSize: 16,
           fontWeight: FontWeight.w600,
         ),

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.21+21
+version: 0.0.23+23
 
 environment:
   sdk: ">=2.17.5 <3.0.0"
@@ -20,6 +20,7 @@ dependencies:
       ref: revanced-manager
   device_info_plus: ^4.1.2
   dio: ^4.0.6
+  dio_http2_adapter: ^2.0.0
   dio_http_cache_lts: ^0.4.1
   dynamic_color: ^1.5.4
   dynamic_themes: ^1.1.0