external/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2024-11-10 01:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

chore: Merge branch dev to main (#2118)

Browse source
This commit is contained in:
Benjamin 2024-08-11 09:00:47 -07:00 committed by GitHub
commit 5f388abf95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 75 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
lib/app/app.dart
View file

@ -1,49 +1,51 @@
import 'package:revanced_manager/services/download_manager.dart'; import 'package:revanced_manager/services/download_manager.dart';
import 'package:revanced_manager/services/github_api.dart'; import 'package:revanced_manager/services/github_api.dart';
import 'package:revanced_manager/services/manager_api.dart'; import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/patcher_api.dart'; import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/services/revanced_api.dart'; import 'package:revanced_manager/services/revanced_api.dart';
import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart'; import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart';
import 'package:revanced_manager/ui/views/contributors/contributors_view.dart'; import 'package:revanced_manager/ui/views/contributors/contributors_view.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/views/installer/installer_view.dart'; import 'package:revanced_manager/ui/views/installer/installer_view.dart';
import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_view.dart';
import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/ui/views/settings/settings_view.dart'; import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart';
import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart'; import 'package:revanced_manager/ui/views/settings/settings_view.dart';
import 'package:stacked/stacked_annotations.dart'; import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart';
import 'package:stacked_services/stacked_services.dart'; import 'package:stacked/stacked_annotations.dart';
import 'package:stacked_services/stacked_services.dart';
@StackedApp(
routes: [ @StackedApp(
MaterialRoute(page: NavigationView), routes: [
MaterialRoute(page: PatcherView), MaterialRoute(page: NavigationView),
MaterialRoute(page: AppSelectorView), MaterialRoute(page: PatcherView),
MaterialRoute(page: PatchesSelectorView), MaterialRoute(page: AppSelectorView),
MaterialRoute(page: PatchOptionsView), MaterialRoute(page: PatchesSelectorView),
MaterialRoute(page: InstallerView), MaterialRoute(page: PatchOptionsView),
MaterialRoute(page: SettingsView), MaterialRoute(page: InstallerView),
MaterialRoute(page: ContributorsView), MaterialRoute(page: SettingsView),
MaterialRoute(page: AppInfoView), MaterialRoute(page: ContributorsView),
], MaterialRoute(page: AppInfoView),
dependencies: [ ],
LazySingleton(classType: NavigationViewModel), dependencies: [
LazySingleton(classType: HomeViewModel), LazySingleton(classType: NavigationViewModel),
LazySingleton(classType: PatcherViewModel), LazySingleton(classType: HomeViewModel),
LazySingleton(classType: PatchOptionsViewModel), LazySingleton(classType: PatcherViewModel),
LazySingleton(classType: NavigationService), LazySingleton(classType: PatchOptionsViewModel),
LazySingleton(classType: ManagerAPI), LazySingleton(classType: InstallerViewModel),
LazySingleton(classType: PatcherAPI), LazySingleton(classType: NavigationService),
LazySingleton(classType: RevancedAPI), LazySingleton(classType: ManagerAPI),
LazySingleton(classType: GithubAPI), LazySingleton(classType: PatcherAPI),
LazySingleton(classType: DownloadManager), LazySingleton(classType: RevancedAPI),
LazySingleton(classType: Toast), LazySingleton(classType: GithubAPI),
], LazySingleton(classType: DownloadManager),
) LazySingleton(classType: Toast),
class AppSetup {} ],
)
class AppSetup {}

3
lib/ui/views/installer/installer_viewmodel.dart
View file

@ -195,7 +195,8 @@ class InstallerViewModel extends BaseViewModel {
} else { } else {
_app.patchedFilePath = _patcherAPI.outFile!.path; _app.patchedFilePath = _patcherAPI.outFile!.path;
} }
locator<HomeViewModel>().initialize(context); final homeViewModel = locator<HomeViewModel>();
_managerAPI.reAssessPatchedApps().then((_) => homeViewModel.getPatchedApps());
} on Exception catch (e) { } on Exception catch (e) {
update( update(
-100.0, -100.0,

8
lib/ui/views/patcher/patcher_viewmodel.dart
View file

@ -55,9 +55,11 @@ class PatcherViewModel extends BaseViewModel {
context: context, context: context,
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: Text(t.notice), title: Text(t.notice),
content: Text( content: SingleChildScrollView(
t.patcherView.removedPatchesWarningDialogText( child: Text(
patches: removedPatches.join('\n'), t.patcherView.removedPatchesWarningDialogText(
patches: removedPatches.join('\n'),
),
), ),
), ),
actions: <Widget>[ actions: <Widget>[

1
lib/ui/widgets/appInfoView/app_info_viewmodel.dart
View file

@ -27,6 +27,7 @@ class AppInfoViewModel extends BaseViewModel {
BuildContext context, BuildContext context,
PatchedApplication app, PatchedApplication app,
) async { ) async {
locator<PatcherViewModel>().selectedApp = app;
locator<InstallerViewModel>().installTypeDialog(context); locator<InstallerViewModel>().installTypeDialog(context);
} }

3
lib/ui/widgets/settingsView/settings_last_patched_app.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:revanced_manager/gen/strings.g.dart'; import 'package:revanced_manager/gen/strings.g.dart';
import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart';
class SLastPatchedApp extends StatefulWidget { class SLastPatchedApp extends StatefulWidget {
const SLastPatchedApp({super.key}); const SLastPatchedApp({super.key});
@ -16,7 +17,7 @@ class _SLastPatchedAppState
extends State<SLastPatchedApp> { extends State<SLastPatchedApp> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SwitchListTile( return HapticSwitchListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 20.0), contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
title: Text( title: Text(
t.settingsView.lastPatchedAppLabel, t.settingsView.lastPatchedAppLabel,

42
pubspec.lock
View file

@ -5,23 +5,23 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: _fe_analyzer_shared name: _fe_analyzer_shared
sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "68.0.0" version: "72.0.0"
_macros: _macros:
dependency: transitive dependency: transitive
description: dart description: dart
source: sdk source: sdk
version: "0.1.5" version: "0.3.2"
analyzer: analyzer:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: analyzer name: analyzer
sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "6.5.0" version: "6.7.0"
animations: animations:
dependency: "direct main" dependency: "direct main"
description: description:
@ -319,14 +319,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.0.0" version: "7.0.0"
file_picker:
dependency: "direct main"
description:
name: file_picker
sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258"
url: "https://pub.dev"
source: hosted
version: "8.0.6"
fixnum: fixnum:
dependency: transitive dependency: transitive
description: description:
@ -410,14 +402,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.3" version: "0.7.3"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de"
url: "https://pub.dev"
source: hosted
version: "2.0.21"
flutter_test: flutter_test:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -657,10 +641,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: macros name: macros
sha256: a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239 sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.1.0-main.5" version: "0.1.2-main.4"
markdown: markdown:
dependency: transitive dependency: transitive
description: description:
@ -689,10 +673,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.14.0" version: "1.15.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -1185,10 +1169,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.1" version: "0.7.2"
timeago: timeago:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1313,10 +1297,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.2.2" version: "14.2.4"
wakelock_plus: wakelock_plus:
dependency: "direct main" dependency: "direct main"
description: description:

2
pubspec.yaml
View file

@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager
publish_to: 'none' publish_to: 'none'
version: 1.21.1+101800028 version: 1.21.2-dev.3+101800031
environment: environment:
sdk: '>=3.0.0 <4.0.0' sdk: '>=3.0.0 <4.0.0'