ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: Improve experience of rooted patched app installations (#59)

Browse Source
This commit is contained in:
Alberto Ponces 2022-09-06 14:40:49 +01:00 committed by GitHub
parent 9e178ba584
commit 27ef74b561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 203 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/i18n/en.json
View File

@ -3,6 +3,8 @@
"cancelButton": "Cancel",
"enabledLabel": "Enabled",
"disabledLabel": "Disabled",
"yesLabel": "Yes",
"noLabel": "No",
"main": {
"dashboardTab": "Dashboard",
"patcherTab": "Patcher",
@ -79,10 +81,13 @@
"installerView": {
"widgetTitle": "Installer",
"installButton": "Install",
"installRootButton": "Install as Root",
"openButton": "Open",
"shareButton": "Share file",
"notificationTitle": "ReVanced Manager is patching",
"notificationText": "Tap to return to the installer"
"notificationText": "Tap to return to the installer",
"shareApkMenuOption": "Share APK",
"shareLogMenuOption": "Share log"
},
"settingsView": {
"widgetTitle": "Settings",
@ -97,20 +102,11 @@
"languageLabel": "Language",
"englishOption": "English",
"frenchOption": "French",
"rootModeLabel": "Root Mode",
"rootModeHint": "Do you want to patch applications as rooted?",
"contributorsLabel": "Contributors",
"contributorsHint": "A list of contributors of ReVanced",
"aboutLabel": "About",
"versionLabel": "Version"
},
"rootCheckerView": {
"widgetTitle": "Is your device rooted?",
"widgetDescription": "Don't know what this means or prefer to use non-root version? Just click on the button below!",
"grantPermission": "Grant Root Permission",
"grantedPermission": "Magisk permission granted: {isRooted}",
"nonRootButton": "Nonroot"
},
"appInfoView": {
"widgetTitle": "App Info",
"openButton": "Open",
@ -120,7 +116,9 @@
"alertDialogText": "Are you sure you want to uninstall this app?",
"errorDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
"packageNameLabel": "Package Name",
"rootModeLabel": "Root Mode",
"installTypeLabel": "Installation Type",
"rootTypeLabel": "Root",
"nonRootTypeLabel": "Non-root",
"patchedDateLabel": "Patched Date",
"patchedDateHint": "{date} at {time}",
"appliedPatchesLabel": "Applied Patches",

1
assets/images/magisk.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" viewBox="0 0 24 24"><path d="M5.974,13.795c0.859,0.36,0.403-0.902,1.934-2.048c0.862-0.646,3.412-2.486,2.871-2.105V9.641c-2.766,1.951-5.64,1.714-6.959-2.528C3.586,6.361,3.08,12.582,5.974,13.795z"/><path d="M2.565 12.358c-.39-.546.967 3.514 4.365 3.563 2.49.036 2.78-2.408 4.44-2.482.501-.022.608-.808.63-1.067-.004-.045-.005-.077-.005-.077s.009-.009.012-.012c-.001-.001-.715-.774-1.617-.517l-.001.001c-1.522.434-2.113 2.523-3.649 2.781-.318.053-.675.148-1.092.128C4.867 14.639 3.881 14.204 2.565 12.358zM18.016 13.795c2.893-1.212 2.387-7.434 2.154-6.682-1.319 4.242-4.193 4.48-6.959 2.528-.54-.381 2.009 1.459 2.871 2.105v.001C17.613 12.893 17.156 14.155 18.016 13.795z"/><path d="M12 12.372c.02.248.123 1.056.631 1.079 1.66.074 1.95 2.518 4.44 2.482 3.399-.049 4.755-4.109 4.365-3.563-1.317 1.846-2.302 2.281-3.082 2.318-.417.02-.774-.075-1.092-.128-1.536-.258-2.127-2.347-3.649-2.781l-.001-.001c-.861-.245-1.543.44-1.605.505h0C12.006 12.283 12.004 12.321 12 12.372zM20.065 5.341c-1.179 2.963-5.641 1.848-6.067 3.718-.084.367.756 1.233 2.373 1.167C19.711 10.089 20.327 4.68 20.065 5.341zM7.838.604c-.694.068-2.451 1.104-2.13 1.533 1.701 2.276 2.746 4.356 4.713 5.949.264.214-1.179-2.193-1.239-3.547L9.181 4.539C9.115 3.056 8.532.536 7.838.604zM7.618 10.225c1.618.066 2.457-.8 2.373-1.167-.426-1.87-4.889-.755-6.067-3.718C3.662 4.68 4.278 10.089 7.618 10.225z"/><path d="M4.167 4.47c.122 1.021 1.21 1.987 2.663 2.38 1.554.421 3.37 1.384 3.37 1.384-2.188-1.361-1.725-1.19-2.941-2.46C6.141 4.607 5.29 2.273 5.29 2.273S4.077 3.709 4.167 4.47zM11.862 3.168c.14-1.681-.899-2.714-1.281-3.023C10.2-.164 9.469.073 8.59.363c.995.674 1.494 1.476 1.632 2.574-.209 2.539 1.17 3.775 1.332 8.077v.001C11.854 11.13 11.723 4.849 11.862 3.168zM13.199 14.527c-1.279 1.746-2.356-.069-2.356-.069S11 15.379 10.809 17.41C10.57 19.956 11.791 24 11.791 24s1.665-4.052 1.374-6.67C12.926 15.178 13.273 14.426 13.199 14.527zM17.992 16.162c.208-.343-1.194 1.337-2.582.137-.962-.832-1.127-1.085-1.875-1.808-.252-.244.28 1.014.428 2.151l-.001.001c.208 1.591-.023 2.462-.324 4.164C13.487 21.668 16.743 18.218 17.992 16.162zM16.73 5.774c-1.215 1.27-.754 1.099-2.941 2.46 0 0 1.816-.964 3.37-1.384 1.452-.393 2.542-1.359 2.663-2.38.09-.76-1.123-2.197-1.123-2.197S17.848 4.607 16.73 5.774zM10.409 14.619l-.001-.001c-.748.723-.914.976-1.875 1.808-1.387 1.2-2.79-.48-2.582-.137 1.249 2.057 4.506 5.506 4.354 4.645-.301-1.703-.532-2.574-.324-4.164C10.13 15.633 10.662 14.375 10.409 14.619zM13.407.147c-.382.309-1.42 1.342-1.281 3.023.139 1.681.007 7.962.309 7.846.162-4.302 1.54-5.538 1.332-8.077V2.937c.139-1.098.639-1.9 1.632-2.574C14.52.074 13.788-.162 13.407.147zM16.151.605c-.694-.068-1.277 2.453-1.343 3.936-.06 1.354-1.504 3.761-1.239 3.547l-.001-.001c1.966-1.594 3.012-3.673 4.713-5.949C18.603 1.709 16.846.673 16.151.605z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

2
lib/app/app.dart
View File

@ -9,7 +9,6 @@ import 'package:revanced_manager/ui/views/navigation/navigation_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/root_checker/root_checker_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';
@ -24,7 +23,6 @@ import 'package:stacked_services/stacked_services.dart';
MaterialRoute(page: InstallerView),
MaterialRoute(page: SettingsView),
MaterialRoute(page: ContributorsView),
MaterialRoute(page: RootCheckerView),
MaterialRoute(page: AppInfoView),
],
dependencies: [

27
lib/main.dart
View File

@ -7,7 +7,6 @@ import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
import 'package:revanced_manager/ui/views/root_checker/root_checker_view.dart';
import 'package:stacked_themes/stacked_themes.dart';
Future main() async {
@ -15,6 +14,7 @@ Future main() async {
await setupLocator();
WidgetsFlutterBinding.ensureInitialized();
await locator<ManagerAPI>().initialize();
await locator<PatcherAPI>().initialize();
runApp(const MyApp());
}
@ -25,20 +25,7 @@ class MyApp extends StatelessWidget {
Widget build(BuildContext context) {
return DynamicThemeBuilder(
title: 'ReVanced Manager',
home: FutureBuilder<Widget>(
future: _init(context),
builder: (context, snapshot) {
if (snapshot.hasData) {
return snapshot.data!;
} else {
return Center(
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.secondary,
),
);
}
},
),
home: const NavigationView(),
localizationsDelegates: [
FlutterI18nDelegate(
translationLoader: FileTranslationLoader(
@ -51,14 +38,4 @@ class MyApp extends StatelessWidget {
],
);
}
Future<Widget> _init(BuildContext context) async {
await locator<ManagerAPI>().initialize();
await locator<PatcherAPI>().initialize();
bool? isRooted = locator<ManagerAPI>().isRooted();
if (isRooted != null) {
return const NavigationView();
}
return const RootCheckerView();
}
}

2
lib/models/patched_application.dart
View File

@ -16,7 +16,7 @@ class PatchedApplication {
)
Uint8List icon;
DateTime patchDate;
final bool isRooted;
bool isRooted;
bool hasUpdates;
List<String> appliedPatches;
List<String> changelog;

15
lib/services/manager_api.dart
View File

@ -65,14 +65,6 @@ class ManagerAPI {
await _prefs.setBool('useDarkTheme', value);
}
bool? isRooted() {
return _prefs.getBool('isRooted');
}
Future<void> setIsRooted(bool value) async {
await _prefs.setBool('isRooted', value);
}
List<PatchedApplication> getPatchedApps() {
List<String> apps = _prefs.getStringList('patchedApps') ?? [];
return apps
@ -109,11 +101,10 @@ class ManagerAPI {
}
Future<void> reAssessSavedApps() async {
bool isRooted = this.isRooted() ?? false;
List<PatchedApplication> patchedApps = getPatchedApps();
List<PatchedApplication> toRemove = [];
for (PatchedApplication app in patchedApps) {
bool isRemove = await isAppUninstalled(app, isRooted);
bool isRemove = await isAppUninstalled(app);
if (isRemove) {
toRemove.add(app);
} else {
@ -139,9 +130,9 @@ class ManagerAPI {
await setPatchedApps(patchedApps);
}
Future<bool> isAppUninstalled(PatchedApplication app, bool isRooted) async {
Future<bool> isAppUninstalled(PatchedApplication app) async {
bool existsRoot = false;
if (isRooted) {
if (app.isRooted) {
existsRoot = await _rootAPI.isAppInstalled(app.packageName);
}
bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);

30
lib/services/patcher_api.dart
View File

@ -147,11 +147,16 @@ class PatcherAPI {
if (_outFile != null) {
try {
if (patchedApp.isRooted) {
return _rootAPI.installApp(
patchedApp.packageName,
patchedApp.apkFilePath,
_outFile!.path,
);
bool hasRootPermissions = await _rootAPI.hasRootPermissions();
if (hasRootPermissions) {
return _rootAPI.installApp(
patchedApp.packageName,
patchedApp.apkFilePath,
_outFile!.path,
);
} else {
return false;
}
} else {
await AppInstaller.installApk(_outFile!.path);
return await DeviceApps.isAppInstalled(patchedApp.packageName);
@ -163,14 +168,15 @@ class PatcherAPI {
return false;
}
bool sharePatchedFile(String appName, String version) {
void sharePatchedFile(String appName, String version) {
if (_outFile != null) {
String prefix = appName.toLowerCase().replaceAll(' ', '-');
File share = _outFile!.renameSync('$prefix-revanced_v$version.apk');
String newName = '$prefix-revanced_v$version.apk';
int lastSeparator = _outFile!.path.lastIndexOf('/');
File share = _outFile!.renameSync(
_outFile!.path.substring(0, lastSeparator + 1) + newName,
);
ShareExtend.share(share.path, 'file');
return true;
} else {
return false;
}
}
@ -186,4 +192,8 @@ class PatcherAPI {
await _rootAPI.deleteApp(patchedApp.packageName, patchedApp.apkFilePath);
}
}
void shareLog(String logs) {
ShareExtend.share(logs, 'text');
}
}

5
lib/services/root_api.dart
View File

@ -5,6 +5,11 @@ class RootAPI {
final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
final String _serviceDDirPath = '/data/adb/service.d';
Future<bool> hasRootPermissions() async {
bool? isRooted = await Root.isRooted();
return isRooted != null && isRooted;
}
Future<bool> isAppInstalled(String packageName) async {
if (packageName.isNotEmpty) {
String? res = await Root.exec(

6
lib/ui/views/app_selector/app_selector_viewmodel.dart
View File

@ -6,23 +6,19 @@ import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:revanced_manager/app/app.locator.dart';
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/ui/views/patcher/patcher_viewmodel.dart';
import 'package:stacked/stacked.dart';
class AppSelectorViewModel extends BaseViewModel {
final ManagerAPI _managerAPI = locator<ManagerAPI>();
final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final List<ApplicationWithIcon> apps = [];
bool noApps = false;
bool _isRooted = false;
Future<void> initialize() async {
apps.addAll(await _patcherAPI.getFilteredInstalledApps());
apps.sort((a, b) => a.appName.compareTo(b.appName));
noApps = apps.isEmpty;
_isRooted = _managerAPI.isRooted() ?? false;
notifyListeners();
}
@ -34,7 +30,7 @@ class AppSelectorViewModel extends BaseViewModel {
apkFilePath: application.apkFilePath,
icon: application.icon,
patchDate: DateTime.now(),
isRooted: _isRooted,
isRooted: false,
);
locator<PatcherViewModel>().selectedPatches.clear();
locator<PatcherViewModel>().notifyListeners();

79
lib/ui/views/installer/installer_view.dart
View File

@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/installerView/custom_material_button.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_popup_menu.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
import 'package:stacked/stacked.dart';
@ -27,6 +28,34 @@ class InstallerView extends StatelessWidget {
color: Theme.of(context).textTheme.headline6!.color,
),
),
actions: <Widget>[
Visibility(
visible: !model.isPatching,
child: CustomPopupMenu(
onSelected: (value) => model.onMenuSelection(value),
children: {
0: I18nText(
'installerView.shareApkMenuOption',
child: const Text(
'',
style: TextStyle(
fontWeight: FontWeight.bold,
),
),
),
1: I18nText(
'installerView.shareLogMenuOption',
child: const Text(
'',
style: TextStyle(
fontWeight: FontWeight.bold,
),
),
),
},
),
),
],
bottom: PreferredSize(
preferredSize: const Size(double.infinity, 1.0),
child: LinearProgressIndicator(
@ -60,26 +89,42 @@ class InstallerView extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
CustomMaterialButton(
label: I18nText('installerView.shareButton'),
isFilled: false,
onPressed: () => model.shareResult(),
),
const SizedBox(width: 16),
CustomMaterialButton(
label: model.isInstalled
? I18nText('installerView.openButton')
: I18nText('installerView.installButton'),
isExpanded: true,
onPressed: () {
if (model.isInstalled) {
Visibility(
visible: model.isInstalled,
child: CustomMaterialButton(
label: I18nText('installerView.openButton'),
isExpanded: true,
onPressed: () {
model.openApp();
model.cleanPatcher();
Navigator.of(context).pop();
} else {
model.installResult();
}
},
},
),
),
Visibility(
visible: !model.isInstalled,
child: CustomMaterialButton(
isFilled: false,
label:
I18nText('installerView.installButton'),
isExpanded: true,
onPressed: () => model.installResult(false),
),
),
Visibility(
visible: !model.isInstalled,
child: const SizedBox(
width: 16,
),
),
Visibility(
visible: !model.isInstalled,
child: CustomMaterialButton(
label: I18nText(
'installerView.installRootButton'),
isExpanded: true,
onPressed: () => model.installResult(true),
),
),
],
),

70
lib/ui/views/installer/installer_viewmodel.dart
View File

@ -14,7 +14,7 @@ import 'package:stacked/stacked.dart';
class InstallerViewModel extends BaseViewModel {
final ManagerAPI _managerAPI = locator<ManagerAPI>();
final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final PatchedApplication? _app = locator<PatcherViewModel>().selectedApp;
final PatchedApplication _app = locator<PatcherViewModel>().selectedApp!;
final List<Patch> _patches = locator<PatcherViewModel>().selectedPatches;
static const _installerChannel = MethodChannel(
'app.revanced.manager/installer',
@ -98,19 +98,19 @@ class InstallerViewModel extends BaseViewModel {
Future<void> runPatcher() async {
update(0.0, 'Initializing...', 'Initializing installer');
if (_app != null && _patches.isNotEmpty) {
String apkFilePath = _app!.apkFilePath;
if (_patches.isNotEmpty) {
String apkFilePath = _app.apkFilePath;
try {
if (_app!.isRooted) {
if (_app.isRooted) {
update(0.0, '', 'Checking if an old patched version exists');
bool oldExists = await _patcherAPI.checkOldPatch(_app!);
bool oldExists = await _patcherAPI.checkOldPatch(_app);
if (oldExists) {
update(0.0, '', 'Deleting old patched version');
await _patcherAPI.deleteOldPatch(_app!);
await _patcherAPI.deleteOldPatch(_app);
}
}
update(0.0, '', 'Creating working directory');
await _patcherAPI.runPatcher(_app!.packageName, apkFilePath, _patches);
await _patcherAPI.runPatcher(_app.packageName, apkFilePath, _patches);
} on Exception {
update(1.0, 'Aborting...', 'An error occurred! Aborting');
}
@ -124,31 +124,32 @@ class InstallerViewModel extends BaseViewModel {
}
}
void installResult() async {
if (_app != null) {
update(
1.0,
'Installing...',
_app!.isRooted
? 'Installing patched file using root method'
: 'Installing patched file using nonroot method',
);
isInstalled = await _patcherAPI.installPatchedFile(_app!);
if (isInstalled) {
update(1.0, 'Installed!', 'Installed!');
_app!.patchDate = DateTime.now();
_app!.appliedPatches = _patches.map((p) => p.name).toList();
await _managerAPI.savePatchedApp(_app!);
} else {
update(1.0, 'Aborting...', 'An error occurred! Aborting');
}
void installResult(bool installAsRoot) async {
_app.isRooted = installAsRoot;
update(
1.0,
'Installing...',
_app.isRooted
? 'Installing patched file using root method'
: 'Installing patched file using nonroot method',
);
isInstalled = await _patcherAPI.installPatchedFile(_app);
if (isInstalled) {
update(1.0, 'Installed!', 'Installed!');
_app.patchDate = DateTime.now();
_app.appliedPatches = _patches.map((p) => p.name).toList();
await _managerAPI.savePatchedApp(_app);
} else {
update(1.0, 'Aborting...', 'An error occurred! Aborting');
}
}
void shareResult() {
if (_app != null) {
_patcherAPI.sharePatchedFile(_app!.name, _app!.version);
}
_patcherAPI.sharePatchedFile(_app.name, _app.version);
}
void shareLog() {
_patcherAPI.shareLog(logs);
}
Future<void> cleanPatcher() async {
@ -159,8 +160,17 @@ class InstallerViewModel extends BaseViewModel {
}
void openApp() {
if (_app != null) {
DeviceApps.openApp(_app!.packageName);
DeviceApps.openApp(_app.packageName);
}
void onMenuSelection(int value) {
switch (value) {
case 0:
shareResult();
break;
case 1:
shareLog();
break;
}
}
}

71
lib/ui/views/root_checker/root_checker_view.dart
View File

@ -1,71 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:revanced_manager/ui/views/root_checker/root_checker_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/rootCheckerView/magisk_button.dart';
import 'package:stacked/stacked.dart';
class RootCheckerView extends StatelessWidget {
const RootCheckerView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return ViewModelBuilder<RootCheckerViewModel>.reactive(
onModelReady: (model) => model.initialize(),
viewModelBuilder: () => RootCheckerViewModel(),
builder: (context, model, child) => Scaffold(
floatingActionButton: FloatingActionButton.extended(
label: I18nText('rootCheckerView.nonRootButton'),
icon: const Icon(Icons.keyboard_arrow_right),
onPressed: () => model.navigateAsNonRoot(),
),
body: Container(
height: double.infinity,
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 28.0),
child: Column(
children: <Widget>[
const SizedBox(height: 120),
I18nText(
'rootCheckerView.widgetTitle',
child: Text(
'',
style: GoogleFonts.jetBrainsMono(
fontSize: 24,
),
),
),
const SizedBox(height: 24),
I18nText(
'rootCheckerView.widgetDescription',
child: const Text(
'',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 17,
letterSpacing: 1.1,
),
),
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
MagiskButton(
onPressed: () => model.navigateAsRoot(),
),
I18nText(
'rootCheckerView.grantedPermission',
translationParams: {
'isRooted': model.isRooted.toString(),
},
),
],
),
),
],
),
),
),
);
}
}

36
lib/ui/views/root_checker/root_checker_viewmodel.dart
View File

@ -1,36 +0,0 @@
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/app/app.router.dart';
import 'package:revanced_manager/services/manager_api.dart';
import 'package:stacked/stacked.dart';
import 'package:root/root.dart';
import 'package:stacked_services/stacked_services.dart';
class RootCheckerViewModel extends BaseViewModel {
final NavigationService _navigationService = locator<NavigationService>();
final ManagerAPI _managerAPI = locator<ManagerAPI>();
bool isRooted = false;
void initialize() {
isRooted = _managerAPI.isRooted() ?? false;
}
Future<void> navigateAsRoot() async {
bool? res = await Root.isRooted();
isRooted = res != null && res == true;
if (isRooted) {
await navigateToHome();
} else {
notifyListeners();
}
}
Future<void> navigateAsNonRoot() async {
isRooted = false;
await navigateToHome();
}
Future<void> navigateToHome() async {
_managerAPI.setIsRooted(isRooted);
_navigationService.navigateTo(Routes.navigationView);
}
}

15
lib/ui/views/settings/settings_view.dart
View File

@ -113,21 +113,6 @@ class SettingsView extends StatelessWidget {
SettingsSection(
title: 'settingsView.patcherSectionTitle',
children: <Widget>[
ListTile(
contentPadding: EdgeInsets.zero,
title: I18nText(
'settingsView.rootModeLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.rootModeHint'),
onTap: () => model.navigateToRootChecker(),
),
SourcesWidget(
title: 'settingsView.sourcesLabel',
organizationController: organizationController,

4
lib/ui/views/settings/settings_viewmodel.dart
View File

@ -18,10 +18,6 @@ class SettingsViewModel extends BaseViewModel {
notifyListeners();
}
void navigateToRootChecker() {
_navigationService.navigateTo(Routes.rootCheckerView);
}
void navigateToContributors() {
_navigationService.navigateTo(Routes.contributorsView);
}

14
lib/ui/widgets/appInfoView/app_info_view.dart
View File

@ -1,4 +1,3 @@
import 'package:device_apps/device_apps.dart';
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:google_fonts/google_fonts.dart';
@ -19,7 +18,6 @@ class AppInfoView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ViewModelBuilder<AppInfoViewModel>.reactive(
onModelReady: (model) => model.initialize(),
viewModelBuilder: () => AppInfoViewModel(),
builder: (context, model, child) => Scaffold(
body: CustomScrollView(
@ -68,9 +66,7 @@ class AppInfoView extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
InkWell(
onTap: () => DeviceApps.openApp(
app.packageName,
),
onTap: () => model.openApp(app),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@ -180,7 +176,7 @@ class AppInfoView extends StatelessWidget {
ListTile(
contentPadding: EdgeInsets.zero,
title: I18nText(
'appInfoView.rootModeLabel',
'appInfoView.installTypeLabel',
child: const Text(
'',
style: TextStyle(
@ -189,9 +185,9 @@ class AppInfoView extends StatelessWidget {
),
),
),
subtitle: model.isRooted
? I18nText('enabledLabel')
: I18nText('disabledLabel'),
subtitle: app.isRooted
? I18nText('appInfoView.rootTypeLabel')
: I18nText('appInfoView.nonRootTypeLabel'),
),
const SizedBox(height: 4),
ListTile(

12
lib/ui/widgets/appInfoView/app_info_viewmodel.dart
View File

@ -17,11 +17,6 @@ class AppInfoViewModel extends BaseViewModel {
final ManagerAPI _managerAPI = locator<ManagerAPI>();
final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final RootAPI _rootAPI = RootAPI();
bool isRooted = false;
void initialize() {
isRooted = _managerAPI.isRooted() ?? false;
}
void uninstallApp(PatchedApplication app) {
if (app.isRooted) {
@ -45,7 +40,8 @@ class AppInfoViewModel extends BaseViewModel {
BuildContext context,
PatchedApplication app,
) async {
if (app.isRooted && !isRooted) {
bool hasRootPermissions = await _rootAPI.hasRootPermissions();
if (app.isRooted && !hasRootPermissions) {
return showDialog(
context: context,
builder: (context) => AlertDialog(
@ -129,4 +125,8 @@ class AppInfoViewModel extends BaseViewModel {
.toList();
return '\u2022 ${names.join('\n\u2022 ')}';
}
void openApp(PatchedApplication app) {
DeviceApps.openApp(app.packageName);
}
}

11
lib/ui/widgets/installerView/custom_material_button.dart
View File

@ -23,7 +23,16 @@ class CustomMaterialButton extends StatelessWidget {
? const EdgeInsets.symmetric(horizontal: 24, vertical: 12)
: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
),
shape: MaterialStateProperty.all(const StadiumBorder()),
shape: MaterialStateProperty.all(
StadiumBorder(
side: isFilled
? BorderSide.none
: BorderSide(
width: 1,
color: Theme.of(context).colorScheme.primary,
),
),
),
backgroundColor: MaterialStateProperty.all(
isFilled ? Theme.of(context).colorScheme.primary : Colors.transparent,
),

42
lib/ui/widgets/rootCheckerView/magisk_button.dart
View File

@ -1,42 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:flutter_svg/flutter_svg.dart';
class MagiskButton extends StatelessWidget {
final Function() onPressed;
const MagiskButton({
Key? key,
required this.onPressed,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
GestureDetector(
onTap: onPressed,
child: CircleAvatar(
radius: 32,
backgroundColor: Theme.of(context).colorScheme.primary,
child: SvgPicture.asset(
'assets/images/magisk.svg',
color: Theme.of(context).colorScheme.surface,
height: 40,
width: 40,
),
),
),
const SizedBox(height: 8),
I18nText(
'rootCheckerView.grantPermission',
child: const Text(
'',
style: TextStyle(fontSize: 15),
),
),
],
);
}
}

36
lib/ui/widgets/shared/custom_popup_menu.dart Normal file
View File

@ -0,0 +1,36 @@
import 'package:flutter/material.dart';
class CustomPopupMenu extends StatelessWidget {
final Function(dynamic) onSelected;
final Map<int, Widget> children;
const CustomPopupMenu({
Key? key,
required this.onSelected,
required this.children,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Theme(
data: Theme.of(context).copyWith(useMaterial3: false),
child: PopupMenuButton<int>(
onSelected: onSelected,
itemBuilder: (context) => children.entries
.map(
(entry) => PopupMenuItem<int>(
padding: const EdgeInsets.all(16.0).copyWith(right: 20),
value: entry.key,
child: entry.value,
),
)
.toList(),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(24),
),
color: Theme.of(context).colorScheme.secondaryContainer,
position: PopupMenuPosition.under,
),
);
}
}

3
lib/ui/widgets/shared/custom_sliver_app_bar.dart
View File

@ -2,11 +2,13 @@ import 'package:flutter/material.dart';
class CustomSliverAppBar extends StatelessWidget {
final Widget title;
final List<Widget>? actions;
final PreferredSizeWidget? bottom;
const CustomSliverAppBar({
Key? key,
required this.title,
this.actions,
this.bottom,
}) : super(key: key);
@ -30,6 +32,7 @@ class CustomSliverAppBar extends StatelessWidget {
),
title: title,
),
actions: actions,
bottom: bottom,
);
}

1
pubspec.yaml
View File

@ -63,5 +63,4 @@ dev_dependencies:
flutter:
uses-material-design: true
assets:
- assets/images/
- assets/i18n/