From 295c5a74ea30c9f7dec81f5b61906671dda0a72b Mon Sep 17 00:00:00 2001 From: aAbed <39409020+TheAabedKhan@users.noreply.github.com> Date: Tue, 6 Aug 2024 06:31:01 +0545 Subject: [PATCH 1/7] fix: Unable to scroll in the removed patches dialog (#2113) --- lib/ui/views/patcher/patcher_viewmodel.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index f49ec75b..68d86520 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -55,9 +55,11 @@ class PatcherViewModel extends BaseViewModel { context: context, builder: (context) => AlertDialog( title: Text(t.notice), - content: Text( - t.patcherView.removedPatchesWarningDialogText( - patches: removedPatches.join('\n'), + content: SingleChildScrollView( + child: Text( + t.patcherView.removedPatchesWarningDialogText( + patches: removedPatches.join('\n'), + ), ), ), actions: [ From ceb9d66f1773e7a3d60c9aa014bf4552cfd1df74 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 6 Aug 2024 00:55:10 +0000 Subject: [PATCH 2/7] chore(release): 1.21.2-dev.1 [skip ci] ## [1.21.2-dev.1](https://github.com/ReVanced/revanced-manager/compare/v1.21.1...v1.21.2-dev.1) (2024-08-06) ### Bug Fixes * Unable to scroll in the removed patches dialog ([#2113](https://github.com/ReVanced/revanced-manager/issues/2113)) ([295c5a7](https://github.com/ReVanced/revanced-manager/commit/295c5a74ea30c9f7dec81f5b61906671dda0a72b)) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 66fc7f11..ed99f41d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager publish_to: 'none' -version: 1.21.1+101800028 +version: 1.21.2-dev.1+101800029 environment: sdk: '>=3.0.0 <4.0.0' From 427928e542ed0741f4fdd19c800fb85b83f9a301 Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sun, 11 Aug 2024 08:31:18 -0700 Subject: [PATCH 3/7] fix: Don't crash installation when saving last APK is disabled (#2128) --- .../views/installer/installer_viewmodel.dart | 3 +- pubspec.lock | 42 ++++++------------- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index 2b197ad5..81dea726 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -195,7 +195,8 @@ class InstallerViewModel extends BaseViewModel { } else { _app.patchedFilePath = _patcherAPI.outFile!.path; } - locator().initialize(context); + final homeViewModel = locator(); + _managerAPI.reAssessPatchedApps().then((_) => homeViewModel.getPatchedApps()); } on Exception catch (e) { update( -100.0, diff --git a/pubspec.lock b/pubspec.lock index d008c2d4..db880f64 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "68.0.0" + version: "72.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.1.5" + version: "0.3.2" analyzer: dependency: "direct dev" description: name: analyzer - sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.7.0" animations: dependency: "direct main" description: @@ -319,14 +319,6 @@ packages: url: "https://pub.dev" source: hosted 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: dependency: transitive description: @@ -410,14 +402,6 @@ packages: url: "https://pub.dev" source: hosted 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: dependency: transitive description: flutter @@ -657,10 +641,10 @@ packages: dependency: transitive description: name: macros - sha256: a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239 + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" url: "https://pub.dev" source: hosted - version: "0.1.0-main.5" + version: "0.1.2-main.4" markdown: dependency: transitive description: @@ -689,10 +673,10 @@ packages: dependency: transitive description: name: meta - sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.14.0" + version: "1.15.0" mime: dependency: transitive description: @@ -1185,10 +1169,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" timeago: dependency: "direct main" description: @@ -1313,10 +1297,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.2" + version: "14.2.4" wakelock_plus: dependency: "direct main" description: From 0499d2b08a6824479495e9262d5b639527dc6ad9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 11 Aug 2024 15:39:29 +0000 Subject: [PATCH 4/7] chore(release): 1.21.2-dev.2 [skip ci] ## [1.21.2-dev.2](https://github.com/ReVanced/revanced-manager/compare/v1.21.2-dev.1...v1.21.2-dev.2) (2024-08-11) ### Bug Fixes * Don't crash installation when saving last APK is disabled ([#2128](https://github.com/ReVanced/revanced-manager/issues/2128)) ([427928e](https://github.com/ReVanced/revanced-manager/commit/427928e542ed0741f4fdd19c800fb85b83f9a301)) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ed99f41d..1a2c22d4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager publish_to: 'none' -version: 1.21.2-dev.1+101800029 +version: 1.21.2-dev.2+101800030 environment: sdk: '>=3.0.0 <4.0.0' From cb722f2634086ac9735c0e08ea0f5ee85aae3fbb Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sun, 11 Aug 2024 08:51:02 -0700 Subject: [PATCH 5/7] fix: Don't crash when installing the last patched APK (#2131) --- lib/app/app.dart | 100 +++++++++--------- .../appInfoView/app_info_viewmodel.dart | 1 + 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/lib/app/app.dart b/lib/app/app.dart index 462ee00b..905f275b 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -1,49 +1,51 @@ -import 'package:revanced_manager/services/download_manager.dart'; -import 'package:revanced_manager/services/github_api.dart'; -import 'package:revanced_manager/services/manager_api.dart'; -import 'package:revanced_manager/services/patcher_api.dart'; -import 'package:revanced_manager/services/revanced_api.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/contributors/contributors_view.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/navigation/navigation_view.dart'; -import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; -import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; -import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; -import 'package:revanced_manager/ui/views/settings/settings_view.dart'; -import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart'; -import 'package:stacked/stacked_annotations.dart'; -import 'package:stacked_services/stacked_services.dart'; - -@StackedApp( - routes: [ - MaterialRoute(page: NavigationView), - MaterialRoute(page: PatcherView), - MaterialRoute(page: AppSelectorView), - MaterialRoute(page: PatchesSelectorView), - MaterialRoute(page: PatchOptionsView), - MaterialRoute(page: InstallerView), - MaterialRoute(page: SettingsView), - MaterialRoute(page: ContributorsView), - MaterialRoute(page: AppInfoView), - ], - dependencies: [ - LazySingleton(classType: NavigationViewModel), - LazySingleton(classType: HomeViewModel), - LazySingleton(classType: PatcherViewModel), - LazySingleton(classType: PatchOptionsViewModel), - LazySingleton(classType: NavigationService), - LazySingleton(classType: ManagerAPI), - LazySingleton(classType: PatcherAPI), - LazySingleton(classType: RevancedAPI), - LazySingleton(classType: GithubAPI), - LazySingleton(classType: DownloadManager), - LazySingleton(classType: Toast), - ], -) -class AppSetup {} +import 'package:revanced_manager/services/download_manager.dart'; +import 'package:revanced_manager/services/github_api.dart'; +import 'package:revanced_manager/services/manager_api.dart'; +import 'package:revanced_manager/services/patcher_api.dart'; +import 'package:revanced_manager/services/revanced_api.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/contributors/contributors_view.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_viewmodel.dart'; +import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; +import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; +import 'package:revanced_manager/ui/views/settings/settings_view.dart'; +import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart'; +import 'package:stacked/stacked_annotations.dart'; +import 'package:stacked_services/stacked_services.dart'; + +@StackedApp( + routes: [ + MaterialRoute(page: NavigationView), + MaterialRoute(page: PatcherView), + MaterialRoute(page: AppSelectorView), + MaterialRoute(page: PatchesSelectorView), + MaterialRoute(page: PatchOptionsView), + MaterialRoute(page: InstallerView), + MaterialRoute(page: SettingsView), + MaterialRoute(page: ContributorsView), + MaterialRoute(page: AppInfoView), + ], + dependencies: [ + LazySingleton(classType: NavigationViewModel), + LazySingleton(classType: HomeViewModel), + LazySingleton(classType: PatcherViewModel), + LazySingleton(classType: PatchOptionsViewModel), + LazySingleton(classType: InstallerViewModel), + LazySingleton(classType: NavigationService), + LazySingleton(classType: ManagerAPI), + LazySingleton(classType: PatcherAPI), + LazySingleton(classType: RevancedAPI), + LazySingleton(classType: GithubAPI), + LazySingleton(classType: DownloadManager), + LazySingleton(classType: Toast), + ], +) +class AppSetup {} diff --git a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart index 2f67a6c0..d549d28d 100644 --- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart +++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart @@ -27,6 +27,7 @@ class AppInfoViewModel extends BaseViewModel { BuildContext context, PatchedApplication app, ) async { + locator().selectedApp = app; locator().installTypeDialog(context); } From e063b3d1020284bdc473dff8cdd9493017447b7d Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sun, 11 Aug 2024 08:51:18 -0700 Subject: [PATCH 6/7] fix: Add haptics to save last APK switch (#2133) --- lib/ui/widgets/settingsView/settings_last_patched_app.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ui/widgets/settingsView/settings_last_patched_app.dart b/lib/ui/widgets/settingsView/settings_last_patched_app.dart index 087182b2..b4795f65 100644 --- a/lib/ui/widgets/settingsView/settings_last_patched_app.dart +++ b/lib/ui/widgets/settingsView/settings_last_patched_app.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:revanced_manager/gen/strings.g.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 { const SLastPatchedApp({super.key}); @@ -16,7 +17,7 @@ class _SLastPatchedAppState extends State { @override Widget build(BuildContext context) { - return SwitchListTile( + return HapticSwitchListTile( contentPadding: const EdgeInsets.symmetric(horizontal: 20.0), title: Text( t.settingsView.lastPatchedAppLabel, From 7acdb8e66050057c5fa9c57350dc8f83ccd9ea38 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 11 Aug 2024 15:59:16 +0000 Subject: [PATCH 7/7] chore(release): 1.21.2-dev.3 [skip ci] ## [1.21.2-dev.3](https://github.com/ReVanced/revanced-manager/compare/v1.21.2-dev.2...v1.21.2-dev.3) (2024-08-11) ### Bug Fixes * Add haptics to save last APK switch ([#2133](https://github.com/ReVanced/revanced-manager/issues/2133)) ([e063b3d](https://github.com/ReVanced/revanced-manager/commit/e063b3d1020284bdc473dff8cdd9493017447b7d)) * Don't crash when installing the last patched APK ([#2131](https://github.com/ReVanced/revanced-manager/issues/2131)) ([cb722f2](https://github.com/ReVanced/revanced-manager/commit/cb722f2634086ac9735c0e08ea0f5ee85aae3fbb)) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 1a2c22d4..7e3baa75 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager publish_to: 'none' -version: 1.21.2-dev.2+101800030 +version: 1.21.2-dev.3+101800031 environment: sdk: '>=3.0.0 <4.0.0'