mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2026-01-12 22:17:43 +00:00
Compare commits
11 Commits
v1.21.0-de
...
v1.21.2-de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0499d2b08a | ||
|
|
427928e542 | ||
|
|
ceb9d66f17 | ||
|
|
295c5a74ea | ||
|
|
400df69528 | ||
|
|
5bc7b135d5 | ||
|
|
6dce353d78 | ||
|
|
e707e51719 | ||
|
|
1cea9600a2 | ||
|
|
d81808ad7b | ||
|
|
ea9654edec |
@@ -38,8 +38,6 @@ class ManagerAPI {
|
||||
bool releaseBuild = false;
|
||||
bool suggestedAppVersionSelected = true;
|
||||
bool isDynamicThemeAvailable = false;
|
||||
bool isScopedStorageAvailable = false;
|
||||
int sdkVersion = 0;
|
||||
String storedPatchesFile = '/selected-patches.json';
|
||||
String keystoreFile =
|
||||
'/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore';
|
||||
@@ -57,13 +55,8 @@ class ManagerAPI {
|
||||
Future<void> initialize() async {
|
||||
_prefs = await SharedPreferences.getInstance();
|
||||
isRooted = await _rootAPI.isRooted();
|
||||
if (sdkVersion == 0) {
|
||||
sdkVersion = await getSdkVersion();
|
||||
}
|
||||
isDynamicThemeAvailable =
|
||||
sdkVersion >= 31; // ANDROID_12_SDK_VERSION = 31
|
||||
isScopedStorageAvailable =
|
||||
sdkVersion >= 30; // ANDROID_11_SDK_VERSION = 30
|
||||
(await getSdkVersion()) >= 31; // ANDROID_12_SDK_VERSION = 31
|
||||
storedPatchesFile =
|
||||
(await getApplicationDocumentsDirectory()).path + storedPatchesFile;
|
||||
if (kReleaseMode) {
|
||||
|
||||
@@ -195,7 +195,8 @@ class InstallerViewModel extends BaseViewModel {
|
||||
} else {
|
||||
_app.patchedFilePath = _patcherAPI.outFile!.path;
|
||||
}
|
||||
locator<HomeViewModel>().initialize(context);
|
||||
final homeViewModel = locator<HomeViewModel>();
|
||||
_managerAPI.reAssessPatchedApps().then((_) => homeViewModel.getPatchedApps());
|
||||
} on Exception catch (e) {
|
||||
update(
|
||||
-100.0,
|
||||
|
||||
@@ -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: <Widget>[
|
||||
|
||||
@@ -147,7 +147,6 @@ class AppInfoViewModel extends BaseViewModel {
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text(t.appInfoView.removeAppDialogTitle),
|
||||
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
|
||||
content: Text(t.appInfoView.removeAppDialogText),
|
||||
actions: <Widget>[
|
||||
TextButton(
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
import 'package:file_picker/file_picker.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
import 'package:revanced_manager/app/app.locator.dart';
|
||||
import 'package:flutter_file_dialog/flutter_file_dialog.dart';
|
||||
import 'package:revanced_manager/gen/strings.g.dart';
|
||||
import 'package:revanced_manager/models/patch.dart';
|
||||
import 'package:revanced_manager/services/manager_api.dart';
|
||||
import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart';
|
||||
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
|
||||
|
||||
@@ -401,7 +398,6 @@ class TextFieldForPatchOption extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
|
||||
final ManagerAPI _managerAPI = locator<ManagerAPI>();
|
||||
final TextEditingController controller = TextEditingController();
|
||||
String? selectedKey;
|
||||
String? defaultValue;
|
||||
@@ -528,49 +524,29 @@ class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
|
||||
];
|
||||
},
|
||||
onSelected: (String selection) async {
|
||||
// manageExternalStorage permission is required for file/folder selection
|
||||
// otherwise, the app will not complain, but the patches will error out
|
||||
// the same way as if the user selected an empty file/folder.
|
||||
// Android 11 and above requires the manageExternalStorage permission
|
||||
final Map<String, dynamic> availableActions = {
|
||||
t.patchOptionsView.selectFilePath: () async {
|
||||
if (_managerAPI.isScopedStorageAvailable) {
|
||||
final permission =
|
||||
await Permission.manageExternalStorage.request();
|
||||
if (!permission.isGranted) {
|
||||
return;
|
||||
}
|
||||
switch (selection) {
|
||||
case 'file':
|
||||
final String? result = await FlutterFileDialog.pickFile();
|
||||
if (result != null) {
|
||||
controller.text = result;
|
||||
widget.onChanged(controller.text);
|
||||
}
|
||||
final FilePickerResult? result =
|
||||
await FilePicker.platform.pickFiles();
|
||||
if (result == null) {
|
||||
return;
|
||||
break;
|
||||
case 'folder':
|
||||
final DirectoryLocation? result =
|
||||
await FlutterFileDialog.pickDirectory();
|
||||
if (result != null) {
|
||||
controller.text = result.toString();
|
||||
widget.onChanged(controller.text);
|
||||
}
|
||||
controller.text = result.files.single.path!;
|
||||
widget.onChanged(controller.text);
|
||||
},
|
||||
t.patchOptionsView.selectFolder: () async {
|
||||
if (_managerAPI.isScopedStorageAvailable) {
|
||||
final permission =
|
||||
await Permission.manageExternalStorage.request();
|
||||
if (!permission.isGranted) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
final String? result =
|
||||
await FilePicker.platform.getDirectoryPath();
|
||||
if (result == null) {
|
||||
return;
|
||||
}
|
||||
controller.text = result;
|
||||
widget.onChanged(controller.text);
|
||||
},
|
||||
t.remove: () {
|
||||
break;
|
||||
case 'remove':
|
||||
widget.removeValue!();
|
||||
},
|
||||
};
|
||||
if (availableActions.containsKey(selection)) {
|
||||
await availableActions[selection]!();
|
||||
break;
|
||||
case 'null':
|
||||
controller.text = '';
|
||||
widget.onChanged(null);
|
||||
break;
|
||||
}
|
||||
},
|
||||
),
|
||||
|
||||
42
pubspec.lock
42
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:
|
||||
|
||||
@@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager
|
||||
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.21.0-dev.9+101800025
|
||||
version: 1.21.2-dev.2+101800030
|
||||
|
||||
environment:
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
@@ -23,7 +23,6 @@ dependencies:
|
||||
dynamic_color: ^1.7.0
|
||||
dynamic_themes: ^1.1.0
|
||||
expandable: ^5.0.1
|
||||
file_picker: ^8.0.3
|
||||
flutter:
|
||||
sdk: flutter
|
||||
flutter_background:
|
||||
|
||||
Reference in New Issue
Block a user