build: Bump version to v0.0.32

README.md

@@ -5,16 +5,26 @@ The official ReVanced Manager based on Flutter.
 ## 🔽 Download
 To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
 
-## 🔴 Issues
-For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose). 
-
-## 💭 Discussion
-If you wish to discuss the Manager, a thread has been made under the [#chat](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
+## 📝 Prerequisites
+1. Android 8 or higher
+2. Does not work on some armv7 devices
+3. [Vanced MicroG](https://github.com/TeamVanced/VancedMicroG/releases) required for YouTube and YouTube Music (Only for non-root)
 
 ## ⚠️ Disclaimer
-*Please note that even though we're releasing the Manager, it is an ALPHA version. Meaning there's a big chance that the Manager might not work at all for you.*
+*Please note that even though we're releasing the Manager, it is an ALPHA version. There's a big chance that the Manager might not work at all for you.*
 
-## Prerequisites
-1. Android 8 or higher.
-2. Does not work on armv7
-3. For YouTube and YouTube Music - Vanced MicroG(Only for non-root).
+## 🔴 Issues
+For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
+
+## 💭 Discussion
+If you wish to discuss the Manager, a thread has been made under the [#development](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
+
+
+## 🛠️ Building Manager from source
+1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
+2. Clone the repository locally
+3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-documentation/wiki/Building-from-source)
+4. Open the project in terminal
+5. Run `flutter pub get` in terminal
+6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)
+7. To build release apk run `flutter build apk`

android/app/build.gradle

@@ -76,4 +76,9 @@ dependencies {
     // Signing & aligning
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
     implementation("com.android.tools.build:apksig:7.2.2")
+
+    // MicroG cronet
+    implementation("org.microg:cronet-common:$cronetVersion")
+    implementation("org.microg:cronet-native:$cronetVersion")
+
 }

android/build.gradle

@@ -1,4 +1,5 @@
 buildscript {
+    ext.cronetVersion = '102.5005.125'
     ext.kotlin_version = '1.7.10'
     repositories {
         google()

assets/i18n/en_US.json

@@ -142,13 +142,15 @@
         "rootDialogTitle": "Error",
         "rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
         "packageNameLabel": "Package Name",
+        "originalPackageNameLabel": "Original Package Name",
         "installTypeLabel": "Installation Type",
         "rootTypeLabel": "Root",
         "nonRootTypeLabel": "Non-root",
         "patchedDateLabel": "Patched Date",
         "patchedDateHint": "{date} at {time}",
         "appliedPatchesLabel": "Applied Patches",
-        "appliedPatchesHint": "{quantity} applied patches"
+        "appliedPatchesHint": "{quantity} applied patches",
+        "updateNotImplemented": "Update functionality not implemented yet"
     },
     "contributorsView": {
         "widgetTitle": "Contributors",

lib/models/patched_application.dart

@@ -8,6 +8,7 @@ part 'patched_application.g.dart';
 class PatchedApplication {
   String name;
   String packageName;
+  String originalPackageName;
   String version;
   final String apkFilePath;
   @JsonKey(
@@ -25,6 +26,7 @@ class PatchedApplication {
   PatchedApplication({
     required this.name,
     required this.packageName,
+    required this.originalPackageName,
     required this.version,
     required this.apkFilePath,
     required this.icon,

lib/services/github_api.dart

@@ -7,12 +7,11 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:injectable/injectable.dart';
 import 'package:native_dio_client/native_dio_client.dart';
 import 'package:revanced_manager/models/patch.dart';
+import 'package:revanced_manager/utils/check_for_gms.dart';
 
 @lazySingleton
 class GithubAPI {
-  final Dio _dio = Dio(
-    BaseOptions(baseUrl: 'https://api.github.com'),
-  )..httpClientAdapter = NativeAdapter();
+  late Dio _dio = Dio();
   final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
   final Options _cacheOptions = buildCacheOptions(
     const Duration(hours: 6),
@@ -20,16 +19,30 @@ class GithubAPI {
   );
   final Map<String, String> repoAppPath = {
     'com.google.android.youtube': 'youtube',
-    'app.revanced.android.youtube': 'youtube',
     'com.google.android.apps.youtube.music': 'music',
     'com.twitter.android': 'twitter',
     'com.reddit.frontpage': 'reddit',
     'com.zhiliaoapp.musically': 'tiktok',
     'de.dwd.warnapp': 'warnwetter',
     'com.garzotto.pflotsh.ecmwf_a': 'ecmwf',
+    'com.spotify.music': 'spotify',
   };
 
-  void initialize() {
+  void initialize() async {
+    bool isGMSInstalled = await checkForGMS();
+
+    if (!isGMSInstalled) {
+      _dio = Dio(BaseOptions(
+        baseUrl: 'https://api.github.com',
+      ));
+      print('GitHub API: Using default engine + $isGMSInstalled');
+    } else {
+      _dio = Dio(BaseOptions(
+        baseUrl: 'https://api.github.com',
+      ))
+        ..httpClientAdapter = NativeAdapter();
+      print('ReVanced API: Using CronetEngine + $isGMSInstalled');
+    }
     _dio.interceptors.add(_dioCacheManager.interceptor);
   }
 

lib/services/manager_api.dart

@@ -213,6 +213,7 @@ class ManagerAPI {
               PatchedApplication(
                 name: application.appName,
                 packageName: application.packageName,
+                originalPackageName: application.packageName,
                 version: application.versionName!,
                 apkFilePath: application.apkFilePath,
                 icon: application.icon,
@@ -241,6 +242,7 @@ class ManagerAPI {
             PatchedApplication(
               name: application.appName,
               packageName: application.packageName,
+              originalPackageName: application.packageName,
               version: application.versionName!,
               apkFilePath: application.apkFilePath,
               icon: application.icon,
@@ -261,8 +263,10 @@ class ManagerAPI {
     List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
     patchedApps.removeWhere((a) => toRemove.contains(a));
     for (PatchedApplication app in patchedApps) {
-      app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
-      app.changelog = await getAppChangelog(app.packageName, app.patchDate);
+      app.hasUpdates =
+          await hasAppUpdates(app.originalPackageName, app.patchDate);
+      app.changelog =
+          await getAppChangelog(app.originalPackageName, app.patchDate);
       if (!app.hasUpdates) {
         String? currentInstalledVersion =
             (await DeviceApps.getApp(app.packageName))?.versionName;

lib/services/patcher_api.dart

@@ -18,6 +18,7 @@ class PatcherAPI {
       MethodChannel('app.revanced.manager.flutter/patcher');
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final RootAPI _rootAPI = RootAPI();
+  late Directory _dataDir;
   late Directory _tmpDir;
   late File _keyStoreFile;
   List<Patch> _patches = [];
@@ -26,8 +27,9 @@ class PatcherAPI {
   Future<void> initialize() async {
     await _loadPatches();
     Directory appCache = await getTemporaryDirectory();
+    _dataDir = await getExternalStorageDirectory() ?? appCache;
     _tmpDir = Directory('${appCache.path}/patcher');
-    _keyStoreFile = File('${appCache.path}/revanced-manager.keystore');
+    _keyStoreFile = File('${_dataDir.path}/revanced-manager.keystore');
     cleanPatcher();
   }
 
@@ -70,14 +72,10 @@ class PatcherAPI {
   }
 
   Future<List<Patch>> getFilteredPatches(String packageName) async {
-    String newPackageName = packageName.replaceFirst(
-      'app.revanced.',
-      'com.google.',
-    );
     return _patches
         .where((patch) =>
             !patch.name.contains('settings') &&
-            patch.compatiblePackages.any((pack) => pack.name == newPackageName))
+            patch.compatiblePackages.any((pack) => pack.name == packageName))
         .toList();
   }
 
@@ -163,6 +161,7 @@ class PatcherAPI {
       integrationsFile = await _managerAPI.downloadIntegrations();
     }
     if (patchBundleFile != null) {
+      _dataDir.createSync();
       _tmpDir.createSync();
       Directory workDir = _tmpDir.createTempSync('tmp-');
       File inputFile = File('${workDir.path}/base.apk');

lib/services/revanced_api.dart

@@ -6,6 +6,7 @@ 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:revanced_manager/utils/check_for_gms.dart';
 import 'package:timeago/timeago.dart';
 
 @lazySingleton
@@ -18,10 +19,20 @@ class RevancedAPI {
   );
 
   Future<void> initialize(String apiUrl) async {
-    _dio = Dio(BaseOptions(
-      baseUrl: apiUrl,
-    ))
-      ..httpClientAdapter = NativeAdapter();
+    bool isGMSInstalled = await checkForGMS();
+
+    if (!isGMSInstalled) {
+      _dio = Dio(BaseOptions(
+        baseUrl: apiUrl,
+      ));
+      print('ReVanced API: Using default engine + $isGMSInstalled');
+    } else {
+      _dio = Dio(BaseOptions(
+        baseUrl: apiUrl,
+      ))
+        ..httpClientAdapter = NativeAdapter();
+      print('ReVanced API: Using CronetEngine + $isGMSInstalled');
+    }
     _dio.interceptors.add(_dioCacheManager.interceptor);
   }
 

lib/ui/views/app_selector/app_selector_viewmodel.dart

@@ -26,6 +26,7 @@ class AppSelectorViewModel extends BaseViewModel {
     locator<PatcherViewModel>().selectedApp = PatchedApplication(
       name: application.appName,
       packageName: application.packageName,
+      originalPackageName: application.packageName,
       version: application.versionName!,
       apkFilePath: application.apkFilePath,
       icon: application.icon,
@@ -51,6 +52,7 @@ class AppSelectorViewModel extends BaseViewModel {
           locator<PatcherViewModel>().selectedApp = PatchedApplication(
             name: application.appName,
             packageName: application.packageName,
+            originalPackageName: application.packageName,
             version: application.versionName!,
             apkFilePath: result.files.single.path!,
             icon: application.icon,

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -17,7 +17,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   Future<void> initialize() async {
     patches.addAll(await _patcherAPI.getFilteredPatches(
-      locator<PatcherViewModel>().selectedApp!.packageName,
+      locator<PatcherViewModel>().selectedApp!.originalPackageName,
     ));
     patches.sort((a, b) => a.name.compareTo(b.name));
     notifyListeners();
@@ -74,8 +74,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
             query.isEmpty ||
             query.length < 2 ||
             patch.name.toLowerCase().contains(query.toLowerCase()) ||
-            patch.getSimpleName().toLowerCase().contains(query.toLowerCase())
-         )
+            patch.getSimpleName().toLowerCase().contains(query.toLowerCase()))
         .toList();
   }
 

lib/ui/widgets/appInfoView/app_info_view.dart

@@ -160,8 +160,9 @@ class AppInfoView extends StatelessWidget {
                                   child: InkWell(
                                     borderRadius: BorderRadius.circular(16.0),
                                     onTap: () {
-                                      model.navigateToPatcher(app);
-                                      Navigator.of(context).pop();
+                                      model.updateNotImplemented(context);
+                                      // model.navigateToPatcher(app);
+                                      // Navigator.of(context).pop();
                                     },
                                     child: Column(
                                       mainAxisAlignment:
@@ -260,6 +261,22 @@ class AppInfoView extends StatelessWidget {
                       subtitle: Text(app.packageName),
                     ),
                     const SizedBox(height: 4),
+                    ListTile(
+                      contentPadding:
+                          const EdgeInsets.symmetric(horizontal: 20.0),
+                      title: I18nText(
+                        'appInfoView.originalPackageNameLabel',
+                        child: const Text(
+                          '',
+                          style: TextStyle(
+                            fontSize: 20,
+                            fontWeight: FontWeight.w500,
+                          ),
+                        ),
+                      ),
+                      subtitle: Text(app.originalPackageName),
+                    ),
+                    const SizedBox(height: 4),
                     ListTile(
                       contentPadding:
                           const EdgeInsets.symmetric(horizontal: 20.0),

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -8,6 +8,7 @@ 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/home/home_viewmodel.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
@@ -19,6 +20,7 @@ class AppInfoViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
   final RootAPI _rootAPI = RootAPI();
+  final Toast _toast = locator<Toast>();
 
   Future<void> uninstallApp(
     BuildContext context,
@@ -51,6 +53,10 @@ class AppInfoViewModel extends BaseViewModel {
     locator<NavigationViewModel>().setIndex(1);
   }
 
+  void updateNotImplemented(BuildContext context) {
+    _toast.show('appInfoView.updateNotImplemented');
+  }
+
   Future<void> showUninstallDialog(
     BuildContext context,
     PatchedApplication app,
@@ -127,7 +133,8 @@ class AppInfoViewModel extends BaseViewModel {
       builder: (context) => AlertDialog(
         title: I18nText('appInfoView.appliedPatchesLabel'),
         backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-        content: Text(getAppliedPatchesString(app.appliedPatches)),
+        content: SingleChildScrollView(
+            child: Text(getAppliedPatchesString(app.appliedPatches))),
         actions: <Widget>[
           CustomMaterialButton(
             label: I18nText('okButton'),

lib/ui/widgets/homeView/available_updates_card.dart

@@ -45,15 +45,17 @@ class AvailableUpdatesCard extends StatelessWidget {
             physics: const NeverScrollableScrollPhysics(),
             children: apps
                 .map((app) => ApplicationItem(
-                      icon: app.icon,
-                      name: app.name,
-                      patchDate: app.patchDate,
-                      changelog: app.changelog,
-                      isUpdatableApp: true,
-                      onPressed: () =>
-                          locator<HomeViewModel>().navigateToPatcher(
-                        app,
-                      ),
+                    icon: app.icon,
+                    name: app.name,
+                    patchDate: app.patchDate,
+                    changelog: app.changelog,
+                    isUpdatableApp: true,
+                    //TODO: Find a better way to do update functionality
+                    onPressed: () {}
+                    // () =>
+                    //     locator<HomeViewModel>().navigateToPatcher(
+                    //   app,
+                    // ),
                     ))
                 .toList(),
           );

lib/ui/widgets/shared/application_item.dart

@@ -51,93 +51,93 @@ class _ApplicationItemState extends State<ApplicationItem>
   Widget build(BuildContext context) {
     ExpandableController expController = ExpandableController();
     return Container(
-      margin: const EdgeInsets.only(bottom: 16.0),
-      child: CustomCard(
-        onTap: () {
-                expController.toggle();
-                _animationController.isCompleted
-                    ? _animationController.reverse()
-                    : _animationController.forward();
-        },
-        child: ExpandablePanel(
-          controller: expController,
-          theme: const ExpandableThemeData(
-            inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
-            tapBodyToCollapse: false,
-            tapBodyToExpand: false,
-            tapHeaderToExpand: false,
-            hasIcon: false,
-            animationDuration: Duration(milliseconds: 450),
-          ),
-          header: Row(
-                children: <Widget>[
-                  SizedBox(
-                    width: 40,
-                    child: Image.memory(widget.icon, height: 40, width: 40),
-                  ),
-                  const SizedBox(width: 4),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 15.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        Text(
-                          widget.name.length > 12
-                              ? '${widget.name.substring(0, 12)}...'
-                              : widget.name,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        ),
-                        Text(format(widget.patchDate)),
-                      ],
-                    ),
-                  ),
-                  const Spacer(),
-                  RotationTransition(
-                    turns: Tween(begin: 0.0, end: 0.50)
-                        .animate(_animationController),
-                    child: const Padding(
-                      padding: EdgeInsets.all(8.0),
-                      child: Icon(Icons.arrow_drop_down),
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    crossAxisAlignment: CrossAxisAlignment.end,
+        margin: const EdgeInsets.only(bottom: 16.0),
+        child: CustomCard(
+          onTap: () {
+            expController.toggle();
+            _animationController.isCompleted
+                ? _animationController.reverse()
+                : _animationController.forward();
+          },
+          child: ExpandablePanel(
+            controller: expController,
+            theme: const ExpandableThemeData(
+              inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
+              tapBodyToCollapse: false,
+              tapBodyToExpand: false,
+              tapHeaderToExpand: false,
+              hasIcon: false,
+              animationDuration: Duration(milliseconds: 450),
+            ),
+            header: Row(
+              children: <Widget>[
+                SizedBox(
+                  width: 40,
+                  child: Image.memory(widget.icon, height: 40, width: 40),
+                ),
+                const SizedBox(width: 4),
+                Padding(
+                  padding: const EdgeInsets.only(left: 15.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
-                      CustomMaterialButton(
-                        label: widget.isUpdatableApp
-                            ? I18nText('applicationItem.patchButton')
-                            : I18nText('applicationItem.infoButton'),
-                        onPressed: widget.onPressed,
+                      Text(
+                        widget.name.length > 12
+                            ? '${widget.name.substring(0, 12)}...'
+                            : widget.name,
+                        style: const TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                        ),
                       ),
+                      Text(format(widget.patchDate)),
                     ],
                   ),
-                ],
-              ),
-          collapsed: const SizedBox(),
-          expanded: Padding(
-            padding: const EdgeInsets.only(top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                I18nText(
-                  'applicationItem.changelogLabel',
-                  child: const Text(
-                    '',
-                    style: TextStyle(fontWeight: FontWeight.w700),
+                ),
+                const Spacer(),
+                RotationTransition(
+                  turns: Tween(begin: 0.0, end: 0.50)
+                      .animate(_animationController),
+                  child: const Padding(
+                    padding: EdgeInsets.all(8.0),
+                    child: Icon(Icons.arrow_drop_down),
                   ),
                 ),
-                const SizedBox(height: 4),
-                Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
+                const SizedBox(width: 8),
+                Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: <Widget>[
+                    CustomMaterialButton(
+                      label: widget.isUpdatableApp
+                          ? I18nText('applicationItem.infoButton')
+                          : I18nText('applicationItem.infoButton'),
+                      onPressed: widget.onPressed,
+                    ),
+                  ],
+                ),
               ],
             ),
+            collapsed: const SizedBox(),
+            expanded: Padding(
+              padding: const EdgeInsets.only(
+                  top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  I18nText(
+                    'applicationItem.changelogLabel',
+                    child: const Text(
+                      '',
+                      style: TextStyle(fontWeight: FontWeight.w700),
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
+                ],
+              ),
+            ),
           ),
-        ),
-      )
-    );
+        ));
   }
 }

lib/utils/check_for_gms.dart

@@ -0,0 +1,10 @@
+// Check for google mobile services on device
+
+import 'package:device_apps/device_apps.dart';
+
+Future<bool> checkForGMS() async {
+  bool isGMSInstalled = true;
+  isGMSInstalled = await DeviceApps.isAppInstalled('com.google.android.gms') ||
+      await DeviceApps.isAppInstalled('com.android.vending');
+  return isGMSInstalled;
+}

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
 
 publish_to: 'none'
 
-version: 0.0.30+30
+version: 0.0.32+32
 
 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_brotli_transformer: ^1.0.1
   dio_http_cache_lts: ^0.4.1
   dynamic_color: ^1.5.4
   dynamic_themes: ^1.1.0