feat: Add ReVanced API and implement cache on it and on Github API

lib/services/github_api.dart

@@ -1,11 +1,21 @@
+import 'dart:convert';
 import 'dart:io';
+// ignore: depend_on_referenced_packages
+import 'package:collection/collection.dart';
+import 'package:dio/dio.dart';
+import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:github/github.dart';
+import 'package:revanced_manager/models/patch.dart';
-import 'package:timeago/timeago.dart';
 
 class GithubAPI {
-  final GitHub _github = GitHub();
+  final String apiUrl = 'https://api.github.com';
-
+  final Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(
+    CacheConfig(
+      defaultMaxAge: const Duration(hours: 1),
+      defaultMaxStale: const Duration(days: 7),
+    ),
+  );
   final Map<String, String> repoAppPath = {
     'com.google.android.youtube': 'youtube',
     'com.google.android.apps.youtube.music': 'music',
@@ -16,31 +26,78 @@ class GithubAPI {
     'com.garzotto.pflotsh.ecmwf_a': 'ecmwf',
   };
 
-  Future<String?> latestReleaseVersion(String repoName) async {
+  void initialize() {
-    try {
+    _dio.interceptors.add(_dioCacheManager.interceptor);
-      var latestRelease = await _github.repositories.getLatestRelease(
-        RepositorySlug.full(repoName),
-      );
-      return latestRelease.tagName;
-    } on Exception {
-      return null;
-    }
   }
 
-  Future<File?> latestReleaseFile(String extension, String repoName) async {
+  Future<void> clearAllCache() async {
+    await _dioCacheManager.clearAll();
+  }
+
+  Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async {
     try {
-      var latestRelease = await _github.repositories.getLatestRelease(
+      var response = await _dio.get(
-        RepositorySlug.full(repoName),
+        '$apiUrl/repos/$repoName/releases/latest',
+        options: buildCacheOptions(const Duration(hours: 1)),
       );
-      String? url = latestRelease.assets
+      if (response.headers.value(DIO_CACHE_HEADER_KEY_DATA_SOURCE) != null) {
-          ?.firstWhere((asset) =>
+        print('1 - From cache');
-              asset.name != null &&
+      } else {
-              asset.name!.endsWith(extension) &&
+        print('1 - From net');
-              !asset.name!.contains('-sources') &&
+      }
-              !asset.name!.contains('-javadoc'))
+      return response.data;
-          .browserDownloadUrl;
+    } on Exception {
-      if (url != null) {
+      // ignore
-        return await DefaultCacheManager().getSingleFile(url);
+    }
+    return null;
+  }
+
+  Future<List<String>> getCommits(
+    String packageName,
+    String repoName,
+    DateTime since,
+  ) async {
+    String path =
+        'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
+    try {
+      var response = await _dio.get(
+        '$apiUrl/repos/$repoName/commits',
+        queryParameters: {
+          'path': path,
+          'per_page': 3,
+          'since': since.toIso8601String(),
+        },
+        options: buildCacheOptions(const Duration(hours: 1)),
+      );
+      if (response.headers.value(DIO_CACHE_HEADER_KEY_DATA_SOURCE) != null) {
+        print('2 - From cache');
+      } else {
+        print('2 - From net');
+      }
+      List<dynamic> commits = response.data;
+      return commits
+          .map((commit) =>
+              (commit['commit']['message'] as String).split('\n')[0])
+          .toList();
+    } on Exception {
+      // ignore
+    }
+    return List.empty();
+  }
+
+  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
+    try {
+      Map<String, dynamic>? release = await _getLatestRelease(repoName);
+      if (release != null) {
+        Map<String, dynamic>? asset =
+            (release['assets'] as List<dynamic>).firstWhereOrNull(
+          (asset) => (asset['name'] as String).endsWith(extension),
+        );
+        if (asset != null) {
+          return await DefaultCacheManager().getSingleFile(
+            asset['browser_download_url'],
+          );
+        }
       }
     } on Exception {
       return null;
@@ -48,37 +105,17 @@ class GithubAPI {
     return null;
   }
 
-  Future<String> latestCommitTime(String repoName) async {
+  Future<List<Patch>> getPatches(String repoName) async {
+    List<Patch> patches = [];
     try {
-      var repo = await _github.repositories.getRepository(
+      File? f = await getLatestReleaseFile('.json', repoName);
-        RepositorySlug.full(repoName),
+      if (f != null) {
-      );
+        List<dynamic> list = jsonDecode(f.readAsStringSync());
-      return repo.pushedAt != null
+        patches = list.map((patch) => Patch.fromJson(patch)).toList();
-          ? format(repo.pushedAt!, locale: 'en_short')
+      }
-          : '';
     } on Exception {
-      return '';
+      // ignore
     }
-  }
+    return patches;
-
-  Future<List<Contributor>> getContributors(String repoName) async {
-    return await (_github.repositories.listContributors(
-      RepositorySlug.full(repoName),
-    )).toList();
-  }
-
-  Future<List<RepositoryCommit>> getCommits(
-    String packageName,
-    String repoName,
-  ) async {
-    String path =
-        'src/main/kotlin/app/revanced/patches/${repoAppPath[packageName]}';
-    return await (PaginationHelper(_github)
-        .objects<Map<String, dynamic>, RepositoryCommit>(
-      'GET',
-      '/repos/$repoName/commits',
-      (i) => RepositoryCommit.fromJson(i),
-      params: <String, dynamic>{'path': path},
-    )).toList();
   }
 }

lib/services/manager_api.dart

@@ -1,16 +1,18 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:device_apps/device_apps.dart';
-import 'package:github/github.dart';
 import 'package:injectable/injectable.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
 import 'package:revanced_manager/services/github_api.dart';
+import 'package:revanced_manager/services/revanced_api.dart';
 import 'package:revanced_manager/services/root_api.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 @lazySingleton
 class ManagerAPI {
+  final RevancedAPI _revancedAPI = RevancedAPI();
   final GithubAPI _githubAPI = GithubAPI();
   final RootAPI _rootAPI = RootAPI();
   final String patcherRepo = 'revanced-patcher';
@@ -26,10 +28,6 @@ class ManagerAPI {
     _prefs = await SharedPreferences.getInstance();
   }
 
-  String getPatcherRepo() {
-    return defaultPatcherRepo;
-  }
-
   String getPatchesRepo() {
     return _prefs.getString('patchesRepo') ?? defaultPatchesRepo;
   }
@@ -52,46 +50,6 @@ class ManagerAPI {
     await _prefs.setString('integrationsRepo', value);
   }
 
-  String getCliRepo() {
-    return defaultCliRepo;
-  }
-
-  String getManagerRepo() {
-    return _prefs.getString('managerRepo') ?? defaultManagerRepo;
-  }
-
-  Future<void> setManagerRepo(String value) async {
-    if (value.isEmpty || value.startsWith('/') || value.endsWith('/')) {
-      value = defaultManagerRepo;
-    }
-    await _prefs.setString('managerRepo', value);
-  }
-
-  Future<File?> downloadPatches(String extension) async {
-    return await _githubAPI.latestReleaseFile(extension, getPatchesRepo());
-  }
-
-  Future<File?> downloadIntegrations(String extension) async {
-    return await _githubAPI.latestReleaseFile(extension, getIntegrationsRepo());
-  }
-
-  Future<File?> downloadManager(String extension) async {
-    return await _githubAPI.latestReleaseFile(extension, getManagerRepo());
-  }
-
-  Future<String?> getLatestPatchesVersion() async {
-    return await _githubAPI.latestReleaseVersion(getPatchesRepo());
-  }
-
-  Future<String?> getLatestManagerVersion() async {
-    return await _githubAPI.latestReleaseVersion(getManagerRepo());
-  }
-
-  Future<String> getCurrentManagerVersion() async {
-    PackageInfo packageInfo = await PackageInfo.fromPlatform();
-    return packageInfo.version;
-  }
-
   bool getUseDynamicTheme() {
     return _prefs.getBool('useDynamicTheme') ?? false;
   }
@@ -110,9 +68,7 @@ class ManagerAPI {
 
   List<PatchedApplication> getPatchedApps() {
     List<String> apps = _prefs.getStringList('patchedApps') ?? [];
-    return apps
+    return apps.map((a) => PatchedApplication.fromJson(jsonDecode(a))).toList();
-        .map((a) => PatchedApplication.fromJson(json.decode(a)))
-        .toList();
   }
 
   Future<void> setPatchedApps(List<PatchedApplication> patchedApps) async {
@@ -143,6 +99,71 @@ class ManagerAPI {
     await setPatchedApps(patchedApps);
   }
 
+  void clearAllData() {
+    _revancedAPI.clearAllCache();
+    _githubAPI.clearAllCache();
+  }
+
+  Future<Map<String, List<dynamic>>> getContributors() async {
+    return await _revancedAPI.getContributors();
+  }
+
+  Future<List<Patch>> getPatches() async {
+    if (getPatchesRepo() == defaultPatchesRepo) {
+      return await _revancedAPI.getPatches();
+    } else {
+      return await _githubAPI.getPatches(getPatchesRepo());
+    }
+  }
+
+  Future<File?> downloadPatches() async {
+    String repoName = getPatchesRepo();
+    if (repoName == defaultPatchesRepo) {
+      return await _revancedAPI.getLatestReleaseFile(
+        '.jar',
+        defaultPatchesRepo,
+      );
+    } else {
+      return await _githubAPI.getLatestReleaseFile('.jar', repoName);
+    }
+  }
+
+  Future<File?> downloadIntegrations() async {
+    String repoName = getIntegrationsRepo();
+    if (repoName == defaultIntegrationsRepo) {
+      return await _revancedAPI.getLatestReleaseFile(
+        '.apk',
+        defaultIntegrationsRepo,
+      );
+    } else {
+      return await _githubAPI.getLatestReleaseFile('.apk', repoName);
+    }
+  }
+
+  Future<File?> downloadManager() async {
+    return await _revancedAPI.getLatestReleaseFile('.apk', defaultManagerRepo);
+  }
+
+  Future<String?> getLatestPatcherReleaseTime() async {
+    return await _revancedAPI.getLatestReleaseTime('.gz', defaultPatcherRepo);
+  }
+
+  Future<String?> getLatestManagerReleaseTime() async {
+    return await _revancedAPI.getLatestReleaseTime('.apk', defaultManagerRepo);
+  }
+
+  Future<String?> getLatestManagerVersion() async {
+    return await _revancedAPI.getLatestReleaseVersion(
+      '.apk',
+      defaultManagerRepo,
+    );
+  }
+
+  Future<String> getCurrentManagerVersion() async {
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    return packageInfo.version;
+  }
+
   Future<void> reAssessSavedApps() async {
     List<PatchedApplication> patchedApps = getPatchedApps();
     List<PatchedApplication> toRemove = [];
@@ -183,40 +204,27 @@ class ManagerAPI {
   }
 
   Future<bool> hasAppUpdates(String packageName, DateTime patchDate) async {
-    List<RepositoryCommit> commits = await _githubAPI.getCommits(
+    List<String> commits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
+      patchDate,
     );
-    return commits.any((c) =>
+    return commits.isNotEmpty;
-        c.commit != null &&
-        c.commit!.author != null &&
-        c.commit!.author!.date != null &&
-        c.commit!.author!.date!.isAfter(patchDate));
   }
 
   Future<List<String>> getAppChangelog(
-    String packageName,
+      String packageName, DateTime patchDate) async {
-    DateTime patchDate,
+    List<String> newCommits = await _githubAPI.getCommits(
-  ) async {
-    List<RepositoryCommit> commits = await _githubAPI.getCommits(
       packageName,
       getPatchesRepo(),
+      patchDate,
     );
-    List<String> newCommits = commits
-        .where((c) =>
-            c.commit != null &&
-            c.commit!.author != null &&
-            c.commit!.author!.date != null &&
-            c.commit!.author!.date!.isAfter(patchDate) &&
-            c.commit!.message != null)
-        .map((c) => c.commit!.message!)
-        .toList();
     if (newCommits.isEmpty) {
-      newCommits = commits
+      newCommits = await _githubAPI.getCommits(
-          .where((c) => c.commit != null && c.commit!.message != null)
+        packageName,
-          .take(3)
+        getPatchesRepo(),
-          .map((c) => c.commit!.message!)
+        DateTime(2022, 3, 20, 21, 06, 01),
-          .toList();
+      );
     }
     return newCommits;
   }

lib/services/patcher_api.dart

@@ -1,6 +1,7 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:app_installer/app_installer.dart';
+// ignore: depend_on_referenced_packages
+import 'package:collection/collection.dart';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/services.dart';
 import 'package:injectable/injectable.dart';
@@ -39,11 +40,7 @@ class PatcherAPI {
   Future<void> _loadPatches() async {
     try {
       if (_patches.isEmpty) {
-        File? patchJsonFile = await _managerAPI.downloadPatches('.json');
+        _patches = await _managerAPI.getPatches();
-        if (patchJsonFile != null) {
-          List<dynamic> list = json.decode(patchJsonFile.readAsStringSync());
-          _patches = list.map((patch) => Patch.fromJson(patch)).toList();
-        }
       }
     } on Exception {
       _patches = List.empty();
@@ -52,7 +49,6 @@ class PatcherAPI {
 
   Future<List<ApplicationWithIcon>> getFilteredInstalledApps() async {
     List<ApplicationWithIcon> filteredApps = [];
-    await _loadPatches();
     for (Patch patch in _patches) {
       for (Package package in patch.compatiblePackages) {
         try {
@@ -73,7 +69,6 @@ class PatcherAPI {
   }
 
   Future<List<Patch>> getFilteredPatches(String packageName) async {
-    await _loadPatches();
     return _patches
         .where((patch) =>
             !patch.name.contains('settings') &&
@@ -82,7 +77,6 @@ class PatcherAPI {
   }
 
   Future<List<Patch>> getAppliedPatches(List<String> appliedPatches) async {
-    await _loadPatches();
     return _patches
         .where((patch) => appliedPatches.contains(patch.name))
         .toList();
@@ -104,20 +98,22 @@ class PatcherAPI {
     );
     if (includeSettings) {
       try {
-        Patch settingsPatch = _patches.firstWhere(
+        Patch? settingsPatch = _patches.firstWhereOrNull(
           (patch) =>
               patch.name.contains('settings') &&
               patch.compatiblePackages.any((pack) => pack.name == packageName),
         );
-        selectedPatches.add(settingsPatch);
+        if (settingsPatch != null) {
+          selectedPatches.add(settingsPatch);
+        }
       } catch (e) {
         // ignore
       }
     }
-    File? patchBundleFile = await _managerAPI.downloadPatches('.jar');
+    File? patchBundleFile = await _managerAPI.downloadPatches();
     File? integrationsFile;
     if (mergeIntegrations) {
-      integrationsFile = await _managerAPI.downloadIntegrations('.apk');
+      integrationsFile = await _managerAPI.downloadIntegrations();
     }
     if (patchBundleFile != null) {
       _tmpDir.createSync();

lib/services/revanced_api.dart

@@ -0,0 +1,138 @@
+import 'dart:io';
+// ignore: depend_on_referenced_packages
+import 'package:collection/collection.dart';
+import 'package:dio/dio.dart';
+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:timeago/timeago.dart';
+
+@lazySingleton
+class RevancedAPI {
+  final String apiUrl = 'https://revanced-releases-api.afterst0rm.xyz';
+  final Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
+  final Options _cacheOptions = buildCacheOptions(
+    const Duration(minutes: 10),
+    maxStale: const Duration(days: 7),
+  );
+
+  void initialize() {
+    _dio.interceptors.add(_dioCacheManager.interceptor);
+  }
+
+  Future<void> clearAllCache() async {
+    await _dioCacheManager.clearAll();
+  }
+
+  Future<Map<String, List<dynamic>>> getContributors() async {
+    Map<String, List<dynamic>> contributors = {};
+    try {
+      var response = await _dio.get(
+        '$apiUrl/contributors',
+        options: _cacheOptions,
+      );
+      if (response.headers.value(DIO_CACHE_HEADER_KEY_DATA_SOURCE) != null) {
+        print('3 - From cache');
+      } else {
+        print('3 - From net');
+      }
+      List<dynamic> repositories = response.data['repositories'];
+      for (Map<String, dynamic> repo in repositories) {
+        String name = repo['name'];
+        contributors[name] = repo['contributors'];
+      }
+    } on Exception {
+      // ignore
+    }
+    return contributors;
+  }
+
+  Future<List<Patch>> getPatches() async {
+    try {
+      var response = await _dio.get('$apiUrl/patches', options: _cacheOptions);
+      if (response.headers.value(DIO_CACHE_HEADER_KEY_DATA_SOURCE) != null) {
+        print('4 - From cache');
+      } else {
+        print('4 - From net');
+      }
+      List<dynamic> patches = response.data;
+      return patches.map((patch) => Patch.fromJson(patch)).toList();
+    } on Exception {
+      // ignore
+    }
+    return List.empty();
+  }
+
+  Future<Map<String, dynamic>?> _getLatestRelease(
+    String extension,
+    String repoName,
+  ) async {
+    try {
+      var response = await _dio.get('$apiUrl/tools', options: _cacheOptions);
+      if (response.headers.value(DIO_CACHE_HEADER_KEY_DATA_SOURCE) != null) {
+        print('5 - From cache');
+      } else {
+        print('5 - From net');
+      }
+      List<dynamic> tools = response.data['tools'];
+      return tools.firstWhereOrNull(
+        (t) =>
+            t['repository'] == repoName &&
+            (t['name'] as String).endsWith(extension),
+      );
+    } on Exception {
+      return null;
+    }
+  }
+
+  Future<String?> getLatestReleaseVersion(
+      String extension, String repoName) async {
+    try {
+      Map<String, dynamic>? release =
+          await _getLatestRelease(extension, repoName);
+      if (release != null) {
+        return release['version'];
+      }
+    } on Exception {
+      return null;
+    }
+    return null;
+  }
+
+  Future<File?> getLatestReleaseFile(String extension, String repoName) async {
+    try {
+      Map<String, dynamic>? release = await _getLatestRelease(
+        extension,
+        repoName,
+      );
+      if (release != null) {
+        String url = release['browser_download_url'];
+        return await DefaultCacheManager().getSingleFile(url);
+      }
+    } on Exception {
+      return null;
+    }
+    return null;
+  }
+
+  Future<String?> getLatestReleaseTime(
+    String extension,
+    String repoName,
+  ) async {
+    try {
+      Map<String, dynamic>? release = await _getLatestRelease(
+        extension,
+        repoName,
+      );
+      if (release != null) {
+        DateTime timestamp = DateTime.parse(release['timestamp'] as String);
+        return format(timestamp, locale: 'en_short');
+      }
+    } on Exception {
+      return null;
+    }
+    return null;
+  }
+}

lib/ui/views/contributors/contributors_viewmodel.dart

@@ -1,34 +1,24 @@
-import 'package:github/github.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/github_api.dart';
 import 'package:revanced_manager/services/manager_api.dart';
 import 'package:stacked/stacked.dart';
 
 class ContributorsViewModel extends BaseViewModel {
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
-  final GithubAPI _githubAPI = GithubAPI();
+  List<dynamic> patcherContributors = [];
-  List<Contributor> patcherContributors = [];
+  List<dynamic> patchesContributors = [];
-  List<Contributor> patchesContributors = [];
+  List<dynamic> integrationsContributors = [];
-  List<Contributor> integrationsContributors = [];
+  List<dynamic> cliContributors = [];
-  List<Contributor> cliContributors = [];
+  List<dynamic> managerContributors = [];
-  List<Contributor> managerContributors = [];
 
   Future<void> getContributors() async {
-    patcherContributors = await _githubAPI.getContributors(
+    Map<String, List<dynamic>> contributors =
-      _managerAPI.getPatcherRepo(),
+        await _managerAPI.getContributors();
-    );
+    patcherContributors = contributors[_managerAPI.defaultPatcherRepo] ?? [];
-    patchesContributors = await _githubAPI.getContributors(
+    patchesContributors = contributors[_managerAPI.getPatchesRepo()] ?? [];
-      _managerAPI.getPatchesRepo(),
+    integrationsContributors =
-    );
+        contributors[_managerAPI.getIntegrationsRepo()] ?? [];
-    integrationsContributors = await _githubAPI.getContributors(
+    cliContributors = contributors[_managerAPI.defaultCliRepo] ?? [];
-      _managerAPI.getIntegrationsRepo(),
+    managerContributors = contributors[_managerAPI.defaultManagerRepo] ?? [];
-    );
-    cliContributors = await _githubAPI.getContributors(
-      _managerAPI.getCliRepo(),
-    );
-    managerContributors = await _githubAPI.getContributors(
-      _managerAPI.getManagerRepo(),
-    );
     notifyListeners();
   }
 }

lib/ui/views/home/home_view.dart

@@ -20,73 +20,78 @@ class HomeView extends StatelessWidget {
       onModelReady: (model) => model.initialize(),
       viewModelBuilder: () => locator<HomeViewModel>(),
       builder: (context, model, child) => Scaffold(
-        body: CustomScrollView(
+        body: RefreshIndicator(
-          slivers: <Widget>[
+          color: Theme.of(context).colorScheme.secondary,
-            CustomSliverAppBar(
+          backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
-              title: I18nText(
+          onRefresh: () => model.forceRefresh(),
-                'homeView.widgetTitle',
+          child: CustomScrollView(
-                child: Text(
+            slivers: <Widget>[
-                  '',
+              CustomSliverAppBar(
-                  style: GoogleFonts.inter(
+                title: I18nText(
-                    color: Theme.of(context).textTheme.headline6!.color,
+                  'homeView.widgetTitle',
+                  child: Text(
+                    '',
+                    style: GoogleFonts.inter(
+                      color: Theme.of(context).textTheme.headline6!.color,
+                    ),
                   ),
                 ),
               ),
-            ),
+              SliverPadding(
-            SliverPadding(
+                padding: const EdgeInsets.symmetric(horizontal: 20.0),
-              padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                sliver: SliverList(
-              sliver: SliverList(
+                  delegate: SliverChildListDelegate.fixed(
-                delegate: SliverChildListDelegate.fixed(
+                    <Widget>[
-                  <Widget>[
+                      I18nText(
-                    I18nText(
+                        'homeView.updatesSubtitle',
-                      'homeView.updatesSubtitle',
+                        child: Text(
-                      child: Text(
+                          '',
-                        '',
+                          style: Theme.of(context).textTheme.headline6!,
-                        style: Theme.of(context).textTheme.headline6!,
-                      ),
-                    ),
-                    const SizedBox(height: 10),
-                    LatestCommitCard(
-                      onPressed: () =>
-                          model.showUpdateConfirmationDialog(context),
-                    ),
-                    const SizedBox(height: 23),
-                    I18nText(
-                      'homeView.patchedSubtitle',
-                      child: Text(
-                        '',
-                        style: Theme.of(context).textTheme.headline6!,
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Row(
-                      children: <Widget>[
-                        DashboardChip(
-                          label: I18nText('homeView.updatesAvailable'),
-                          isSelected: model.showUpdatableApps,
-                          onSelected: (value) {
-                            model.toggleUpdatableApps(true);
-                          },
                         ),
-                        const SizedBox(width: 10),
+                      ),
-                        DashboardChip(
+                      const SizedBox(height: 10),
-                          label: I18nText('homeView.installed'),
+                      LatestCommitCard(
-                          isSelected: !model.showUpdatableApps,
+                        onPressed: () =>
-                          onSelected: (value) {
+                            model.showUpdateConfirmationDialog(context),
-                            model.toggleUpdatableApps(false);
+                      ),
-                          },
+                      const SizedBox(height: 23),
-                        )
+                      I18nText(
-                      ],
+                        'homeView.patchedSubtitle',
-                    ),
+                        child: Text(
-                    const SizedBox(height: 14),
+                          '',
-                    model.showUpdatableApps
+                          style: Theme.of(context).textTheme.headline6!,
-                        ? AvailableUpdatesCard()
+                        ),
-                        : InstalledAppsCard(),
+                      ),
-                  ],
+                      const SizedBox(height: 8),
+                      Row(
+                        children: <Widget>[
+                          DashboardChip(
+                            label: I18nText('homeView.updatesAvailable'),
+                            isSelected: model.showUpdatableApps,
+                            onSelected: (value) {
+                              model.toggleUpdatableApps(true);
+                            },
+                          ),
+                          const SizedBox(width: 10),
+                          DashboardChip(
+                            label: I18nText('homeView.installed'),
+                            isSelected: !model.showUpdatableApps,
+                            onSelected: (value) {
+                              model.toggleUpdatableApps(false);
+                            },
+                          )
+                        ],
+                      ),
+                      const SizedBox(height: 14),
+                      model.showUpdatableApps
+                          ? AvailableUpdatesCard()
+                          : InstalledAppsCard(),
+                    ],
+                  ),
                 ),
               ),
-            ),
+            ],
-          ],
+          ),
         ),
       ),
     );

lib/ui/views/home/home_viewmodel.dart

@@ -23,8 +23,8 @@ class HomeViewModel extends BaseViewModel {
   final NavigationService _navigationService = locator<NavigationService>();
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
   final PatcherAPI _patcherAPI = locator<PatcherAPI>();
-  final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+  final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-      FlutterLocalNotificationsPlugin();
+  DateTime? _lastUpdate;
   bool showUpdatableApps = true;
   List<PatchedApplication> patchedInstalledApps = [];
   List<PatchedApplication> patchedUpdatableApps = [];
@@ -61,10 +61,7 @@ class HomeViewModel extends BaseViewModel {
   }
 
   void _getPatchedApps() {
-    patchedInstalledApps = _managerAPI
+    patchedInstalledApps = _managerAPI.getPatchedApps().toList();
-        .getPatchedApps()
-        .where((app) => app.hasUpdates == false)
-        .toList();
     patchedUpdatableApps = _managerAPI
         .getPatchedApps()
         .where((app) => app.hasUpdates == true)
@@ -98,7 +95,7 @@ class HomeViewModel extends BaseViewModel {
       toastLength: Toast.LENGTH_LONG,
       gravity: ToastGravity.CENTER,
     );
-    File? managerApk = await _managerAPI.downloadManager('.apk');
+    File? managerApk = await _managerAPI.downloadManager();
     if (managerApk != null) {
       flutterLocalNotificationsPlugin.show(
         0,
@@ -170,4 +167,21 @@ class HomeViewModel extends BaseViewModel {
       ),
     );
   }
+
+  Future<String?> getLatestPatcherReleaseTime() async {
+    return _managerAPI.getLatestPatcherReleaseTime();
+  }
+
+  Future<String?> getLatestManagerReleaseTime() async {
+    return _managerAPI.getLatestManagerReleaseTime();
+  }
+
+  Future<void> forceRefresh() async {
+    await Future.delayed(const Duration(seconds: 1));
+    if (_lastUpdate == null ||
+        _lastUpdate!.difference(DateTime.now()).inSeconds > 60) {
+      _managerAPI.clearAllData();
+    }
+    initialize();
+  }
 }

lib/ui/views/installer/installer_viewmodel.dart

@@ -46,10 +46,11 @@ class InstallerViewModel extends BaseViewModel {
         ),
       );
       await FlutterBackground.enableBackgroundExecution();
-    } finally {
+    } on Exception {
-      await handlePlatformChannelMethods();
+      // ignore
-      await runPatcher();
     }
+    await handlePlatformChannelMethods();
+    await runPatcher();
   }
 
   Future<dynamic> handlePlatformChannelMethods() async {
@@ -118,10 +119,13 @@ class InstallerViewModel extends BaseViewModel {
       update(1.0, 'Aborting...', 'No app or patches selected! Aborting');
     }
     try {
-      await FlutterBackground.disableBackgroundExecution();
+      if (FlutterBackground.isBackgroundExecutionEnabled) {
-    } finally {
+        await FlutterBackground.disableBackgroundExecution();
-      isPatching = false;
+      }
+    } on Exception {
+      // ignore
     }
+    isPatching = false;
   }
 
   void installResult(bool installAsRoot) async {

lib/ui/views/patches_selector/patches_selector_viewmodel.dart

@@ -1,3 +1,5 @@
+// ignore: depend_on_referenced_packages
+import 'package:collection/collection.dart';
 import 'package:revanced_manager/app/app.locator.dart';
 import 'package:revanced_manager/models/patch.dart';
 import 'package:revanced_manager/models/patched_application.dart';
@@ -71,9 +73,14 @@ class PatchesSelectorViewModel extends BaseViewModel {
 
   List<String> getSupportedVersions(Patch patch) {
     PatchedApplication app = locator<PatcherViewModel>().selectedApp!;
-    return patch.compatiblePackages
+    Package? package = patch.compatiblePackages.firstWhereOrNull(
-        .firstWhere((pack) => pack.name == app.packageName)
+      (pack) => pack.name == app.packageName,
-        .versions;
+    );
+    if (package != null) {
+      return package.versions;
+    } else {
+      return List.empty();
+    }
   }
 
   bool isPatchSupported(Patch patch) {

lib/ui/widgets/appInfoView/app_info_viewmodel.dart

@@ -7,6 +7,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/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';
 import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
@@ -73,7 +74,7 @@ class AppInfoViewModel extends BaseViewModel {
               label: I18nText('okButton'),
               onPressed: () {
                 uninstallApp(app);
-                locator<NavigationViewModel>().notifyListeners();
+                locator<HomeViewModel>().notifyListeners();
                 Navigator.of(context).pop();
                 Navigator.of(context).pop();
               },

lib/ui/widgets/appSelectorView/app_skeleton_loader.dart

@@ -30,7 +30,7 @@ class AppSkeletonLoader extends StatelessWidget {
                   children: [
                     Container(
                       color: Colors.white,
-                      height: 25,
+                      height: 34,
                       width: screenWidth * 0.4,
                       child: SkeletonParagraph(
                         style: const SkeletonParagraphStyle(
@@ -42,7 +42,7 @@ class AppSkeletonLoader extends StatelessWidget {
                     Container(
                       margin: const EdgeInsets.only(bottom: 4),
                       color: Colors.white,
-                      height: 25,
+                      height: 34,
                       width: screenWidth * 0.6,
                       child: SkeletonParagraph(
                         style: const SkeletonParagraphStyle(

lib/ui/widgets/contributorsView/contributors_card.dart

@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:github/github.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ContributorsCard extends StatefulWidget {
   final String title;
-  final List<Contributor> contributors;
+  final List<dynamic> contributors;
   final double height;
 
   const ContributorsCard({
@@ -52,9 +51,9 @@ class _ContributorsCardState extends State<ContributorsCard> {
                   borderRadius: BorderRadius.circular(100),
                   child: GestureDetector(
                     onTap: () => launchUrl(
-                        Uri.parse(widget.contributors[index].htmlUrl!)),
+                        Uri.parse(widget.contributors[index]['html_url'])),
                     child: Image.network(
-                      widget.contributors[index].avatarUrl!,
+                      widget.contributors[index]['avatar_url'],
                       height: 40,
                       width: 40,
                     ),

lib/ui/widgets/homeView/latest_commit_card.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/app/app.locator.dart';
-import 'package:revanced_manager/services/github_api.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/installerView/custom_material_button.dart';
 import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
@@ -20,8 +18,7 @@ class LatestCommitCard extends StatefulWidget {
 }
 
 class _LatestCommitCardState extends State<LatestCommitCard> {
-  final ManagerAPI _managerAPI = locator<ManagerAPI>();
+  final HomeViewModel model = locator<HomeViewModel>();
-  final GithubAPI _githubAPI = GithubAPI();
 
   @override
   Widget build(BuildContext context) {
@@ -35,10 +32,8 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
               Row(
                 children: <Widget>[
                   I18nText('latestCommitCard.patcherLabel'),
-                  FutureBuilder<String>(
+                  FutureBuilder<String?>(
-                    future: _githubAPI.latestCommitTime(
+                    future: model.getLatestPatcherReleaseTime(),
-                      _managerAPI.getPatcherRepo(),
-                    ),
                     builder: (context, snapshot) => Text(
                       snapshot.hasData && snapshot.data!.isNotEmpty
                           ? FlutterI18n.translate(
@@ -58,10 +53,8 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
               Row(
                 children: <Widget>[
                   I18nText('latestCommitCard.managerLabel'),
-                  FutureBuilder<String>(
+                  FutureBuilder<String?>(
-                    future: _githubAPI.latestCommitTime(
+                    future: model.getLatestManagerReleaseTime(),
-                      _managerAPI.getManagerRepo(),
-                    ),
                     builder: (context, snapshot) =>
                         snapshot.hasData && snapshot.data!.isNotEmpty
                             ? I18nText(

lib/ui/widgets/shared/application_item.dart

@@ -49,7 +49,7 @@ class ApplicationItem extends StatelessWidget {
                     fontWeight: FontWeight.w500,
                   ),
                 ),
-                Text(format(patchDate, locale: 'en_short')),
+                Text(format(patchDate)),
               ],
             ),
             const Spacer(),

pubspec.yaml

@@ -17,6 +17,8 @@ dependencies:
       url: https://github.com/ponces/flutter_plugin_device_apps
       ref: appinfo-from-storage
   device_info_plus: ^4.1.2
+  dio: ^4.0.6
+  dio_http_cache_lts: ^0.4.1
   dynamic_color: ^1.5.4
   dynamic_themes: ^1.1.0
   expandable: ^5.0.1
@@ -32,7 +34,6 @@ dependencies:
   fluttertoast: ^8.0.9
   font_awesome_flutter: ^10.1.0
   get_it: ^7.2.0
-  github: ^9.4.0
   google_fonts: ^3.0.1
   http: ^0.13.4
   injectable: ^1.5.3
@@ -40,6 +41,7 @@ dependencies:
   json_annotation: ^4.6.0
   package_info_plus: ^1.4.3+1
   path_provider: ^2.0.11
+  pull_to_refresh: ^2.0.0
   root: ^2.0.2
   share_extend: ^2.0.0
   shared_preferences: ^2.0.15