Compare commits

...

11 Commits

Author SHA1 Message Date
Alberto Ponces
6ac901f1d6 build: Bump version to v0.0.24 2022-09-24 13:50:44 +01:00
Alberto Ponces
587ba795bb Revert "fix: Prevent content from being overlapped by system navigation bar"
This reverts commit 4d82ff3011.
2022-09-24 13:49:46 +01:00
Alberto Ponces
6b66c7bbd0 build: Bump version to v0.0.23 2022-09-24 12:16:02 +01:00
Alberto Ponces
f398b6863a Merge branch 'flutter' of github.com:revanced/revanced-manager into flutter 2022-09-24 12:12:24 +01:00
Alberto Ponces
4d82ff3011 fix: Prevent content from being overlapped by system navigation bar 2022-09-24 12:06:36 +01:00
Alberto Ponces
2a0ea78d7f feat: Adds support for patching on x86 and x64 devices
Introduces new aapt2 binaries from revanced/aapt2
2022-09-24 12:05:36 +01:00
Aunali321
4722880647 feat: better patch version background. 2022-09-24 13:47:09 +05:30
Aunali321
32fabcfa3f fix: nav overlapping install buttons. 2022-09-24 12:53:46 +05:30
Alberto Ponces
e0c46e4268 fix: Show "Share log" menu option even if patching has errors 2022-09-23 17:22:39 +01:00
Alberto Ponces
d84230fa22 feat: Merge integrations if a patch or any of its dependencies need them 2022-09-23 17:20:19 +01:00
Alberto Ponces
9561153bfb feat: Hide "Install as Root" button if user does not have root access at all 2022-09-23 15:47:30 +01:00
13 changed files with 157 additions and 113 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -87,10 +87,21 @@ class PatcherAPI {
.toList(); .toList();
} }
bool dependencyNeedsIntegrations(String name) {
return name.contains('integrations') ||
_patches.any(
(patch) =>
patch.name == name &&
(patch.dependencies.any(
(dep) => dependencyNeedsIntegrations(dep),
)),
);
}
Future<bool> needsIntegrations(List<Patch> selectedPatches) async { Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
return selectedPatches.any( return selectedPatches.any(
(patch) => patch.dependencies.any( (patch) => patch.dependencies.any(
(dep) => dep.contains('integrations'), (dep) => dependencyNeedsIntegrations(dep),
), ),
); );
} }

View File

@@ -5,6 +5,15 @@ class RootAPI {
final String _postFsDataDirPath = '/data/adb/post-fs-data.d'; final String _postFsDataDirPath = '/data/adb/post-fs-data.d';
final String _serviceDDirPath = '/data/adb/service.d'; final String _serviceDDirPath = '/data/adb/service.d';
Future<bool> isRooted() async {
try {
bool? isRooted = await Root.isRootAvailable();
return isRooted != null && isRooted;
} on Exception {
return false;
}
}
Future<bool> hasRootPermissions() async { Future<bool> hasRootPermissions() async {
try { try {
bool? isRooted = await Root.isRootAvailable(); bool? isRooted = await Root.isRootAvailable();

View File

@@ -18,130 +18,134 @@ class InstallerView extends StatelessWidget {
onModelReady: (model) => model.initialize(context), onModelReady: (model) => model.initialize(context),
viewModelBuilder: () => InstallerViewModel(), viewModelBuilder: () => InstallerViewModel(),
builder: (context, model, child) => WillPopScope( builder: (context, model, child) => WillPopScope(
child: Scaffold( child: SafeArea(
body: CustomScrollView( top: false,
controller: model.scrollController, child: Scaffold(
slivers: <Widget>[ body: CustomScrollView(
CustomSliverAppBar( controller: model.scrollController,
title: Text( slivers: <Widget>[
model.headerLogs, CustomSliverAppBar(
style: GoogleFonts.inter( title: Text(
color: Theme.of(context).textTheme.headline6!.color, model.headerLogs,
), style: GoogleFonts.inter(
), color: Theme.of(context).textTheme.headline6!.color,
onBackButtonPressed: () => model.onWillPop(context),
actions: <Widget>[
Visibility(
visible: !model.isPatching && !model.hasErrors,
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,
),
),
),
},
), ),
), ),
], onBackButtonPressed: () => model.onWillPop(context),
bottom: PreferredSize( actions: <Widget>[
preferredSize: const Size(double.infinity, 1.0), Visibility(
child: visible: !model.isPatching,
GradientProgressIndicator(progress: model.progress!)), child: CustomPopupMenu(
), onSelected: (value) => model.onMenuSelection(value),
SliverPadding( children: {
padding: const EdgeInsets.all(20.0), if (!model.hasErrors)
sliver: SliverList( 0: I18nText(
delegate: SliverChildListDelegate.fixed( 'installerView.shareApkMenuOption',
<Widget>[ child: const Text(
CustomCard( '',
child: Text( style: TextStyle(
model.logs, fontWeight: FontWeight.bold,
style: GoogleFonts.jetBrainsMono( ),
fontSize: 13, ),
height: 1.5, ),
1: I18nText(
'installerView.shareLogMenuOption',
child: const Text(
'',
style: TextStyle(
fontWeight: FontWeight.bold,
),
),
),
},
),
),
],
bottom: PreferredSize(
preferredSize: const Size(double.infinity, 1.0),
child:
GradientProgressIndicator(progress: model.progress!)),
),
SliverPadding(
padding: const EdgeInsets.all(20.0),
sliver: SliverList(
delegate: SliverChildListDelegate.fixed(
<Widget>[
CustomCard(
child: Text(
model.logs,
style: GoogleFonts.jetBrainsMono(
fontSize: 13,
height: 1.5,
),
), ),
), ),
), ],
], ),
), ),
), ),
), SliverFillRemaining(
SliverFillRemaining( hasScrollBody: false,
hasScrollBody: false, child: Align(
child: Align( alignment: Alignment.bottomCenter,
alignment: Alignment.bottomCenter, child: Visibility(
child: Visibility( visible: !model.isPatching && !model.hasErrors,
visible: !model.isPatching && !model.hasErrors, child: Padding(
child: Padding( padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
padding: const EdgeInsets.all(20.0).copyWith(top: 0.0), child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ Visibility(
Visibility( visible: model.isInstalled,
visible: model.isInstalled, child: CustomMaterialButton(
child: CustomMaterialButton( label: I18nText('installerView.openButton'),
label: I18nText('installerView.openButton'), isExpanded: true,
isExpanded: true, onPressed: () {
onPressed: () { model.openApp();
model.openApp(); model.cleanPatcher();
model.cleanPatcher(); Navigator.of(context).pop();
Navigator.of(context).pop(); },
},
),
),
Visibility(
visible: !model.isInstalled,
child: CustomMaterialButton(
isFilled: false,
label:
I18nText('installerView.installRootButton'),
isExpanded: true,
onPressed: () => model.installResult(
context,
true,
), ),
), ),
), Visibility(
Visibility( visible: !model.isInstalled && model.isRooted,
visible: !model.isInstalled, child: CustomMaterialButton(
child: const SizedBox( isFilled: false,
width: 16, label:
), I18nText('installerView.installRootButton'),
), isExpanded: true,
Visibility( onPressed: () => model.installResult(
visible: !model.isInstalled, context,
child: CustomMaterialButton( true,
label: I18nText('installerView.installButton'), ),
isExpanded: true,
onPressed: () => model.installResult(
context,
false,
), ),
), ),
), Visibility(
], visible: !model.isInstalled,
child: const SizedBox(
width: 16,
),
),
Visibility(
visible: !model.isInstalled,
child: CustomMaterialButton(
label: I18nText('installerView.installButton'),
isExpanded: true,
onPressed: () => model.installResult(
context,
false,
),
),
),
],
),
), ),
), ),
), ),
), ),
), ],
], ),
), ),
), ),
onWillPop: () => model.onWillPop(context), onWillPop: () => model.onWillPop(context),

View File

@@ -1,3 +1,4 @@
// ignore_for_file: use_build_context_synchronously
import 'package:device_apps/device_apps.dart'; import 'package:device_apps/device_apps.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@@ -9,6 +10,7 @@ import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/models/patched_application.dart'; import 'package:revanced_manager/models/patched_application.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/root_api.dart';
import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@@ -18,6 +20,7 @@ import 'package:wakelock/wakelock.dart';
class InstallerViewModel extends BaseViewModel { class InstallerViewModel extends BaseViewModel {
final ManagerAPI _managerAPI = locator<ManagerAPI>(); final ManagerAPI _managerAPI = locator<ManagerAPI>();
final PatcherAPI _patcherAPI = locator<PatcherAPI>(); final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final RootAPI _rootAPI = RootAPI();
final Toast _toast = locator<Toast>(); final Toast _toast = locator<Toast>();
final PatchedApplication _app = locator<PatcherViewModel>().selectedApp!; final PatchedApplication _app = locator<PatcherViewModel>().selectedApp!;
final List<Patch> _patches = locator<PatcherViewModel>().selectedPatches; final List<Patch> _patches = locator<PatcherViewModel>().selectedPatches;
@@ -28,11 +31,13 @@ class InstallerViewModel extends BaseViewModel {
double? progress = 0.0; double? progress = 0.0;
String logs = ''; String logs = '';
String headerLogs = ''; String headerLogs = '';
bool isRooted = false;
bool isPatching = true; bool isPatching = true;
bool isInstalled = false; bool isInstalled = false;
bool hasErrors = false; bool hasErrors = false;
Future<void> initialize(BuildContext context) async { Future<void> initialize(BuildContext context) async {
isRooted = await _rootAPI.isRooted();
if (await Permission.ignoreBatteryOptimizations.isGranted) { if (await Permission.ignoreBatteryOptimizations.isGranted) {
try { try {
FlutterBackground.initialize( FlutterBackground.initialize(

View File

@@ -58,13 +58,28 @@ class _PatchItemState extends State<PatchItem> {
children: <Widget>[ children: <Widget>[
Text( Text(
widget.simpleName, widget.simpleName,
maxLines: 2,
overflow: TextOverflow.visible,
style: const TextStyle( style: const TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text(widget.version) Container(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 2,
),
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.background
.withOpacity(0.5),
borderRadius: BorderRadius.circular(6),
),
child: Text(widget.version),
)
], ],
), ),
const SizedBox(height: 4), const SizedBox(height: 4),

View File

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
publish_to: 'none' publish_to: 'none'
version: 0.0.22+22 version: 0.0.24+24
environment: environment:
sdk: ">=2.17.5 <3.0.0" sdk: ">=2.17.5 <3.0.0"