mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2026-01-23 03:01:02 +00:00
feat: Improve experience of rooted patched app installations (#59)
This commit is contained in:
@@ -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: [
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ class PatchedApplication {
|
||||
)
|
||||
Uint8List icon;
|
||||
DateTime patchDate;
|
||||
final bool isRooted;
|
||||
bool isRooted;
|
||||
bool hasUpdates;
|
||||
List<String> appliedPatches;
|
||||
List<String> changelog;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,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,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();
|
||||
|
||||
@@ -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),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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(),
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
@@ -18,10 +18,6 @@ class SettingsViewModel extends BaseViewModel {
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void navigateToRootChecker() {
|
||||
_navigationService.navigateTo(Routes.rootCheckerView);
|
||||
}
|
||||
|
||||
void navigateToContributors() {
|
||||
_navigationService.navigateTo(Routes.contributorsView);
|
||||
}
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
|
||||
@@ -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
36
lib/ui/widgets/shared/custom_popup_menu.dart
Normal 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,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user