external/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2024-11-10 01:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: Only show share and install options if patching was successful

Browse source
This commit is contained in:
Alberto Ponces 2022-09-12 14:20:25 +01:00
parent a3c14e0a51
commit 3bb5e70d1c
10 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ui/views/home/home_viewmodel.dart
View file

@ -166,7 +166,7 @@ class HomeViewModel extends BaseViewModel {
title: I18nText('homeView.updateDialogTitle'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: I18nText('homeView.updateDialogText'),
actions: [
actions: <Widget>[
CustomMaterialButton(
isFilled: false,
label: I18nText('cancelButton'),

4
lib/ui/views/installer/installer_view.dart
View file

@ -30,7 +30,7 @@ class InstallerView extends StatelessWidget {
),
actions: <Widget>[
Visibility(
visible: !model.isPatching,
visible: !model.isPatching && model.hasErrors,
child: CustomPopupMenu(
onSelected: (value) => model.onMenuSelection(value),
children: {
@ -89,7 +89,7 @@ class InstallerView extends StatelessWidget {
child: Align(
alignment: Alignment.bottomCenter,
child: Visibility(
visible: !model.isPatching,
visible: !model.isPatching && !model.hasErrors,
child: Padding(
padding: const EdgeInsets.all(20.0).copyWith(top: 0.0),
child: Row(

6
lib/ui/views/installer/installer_viewmodel.dart
View file

@ -26,6 +26,7 @@ class InstallerViewModel extends BaseViewModel {
String headerLogs = '';
bool isPatching = true;
bool isInstalled = false;
bool hasErrors = false;
Future<void> initialize(BuildContext context) async {
try {
@ -79,6 +80,7 @@ class InstallerViewModel extends BaseViewModel {
if (progress == 0.0) {
logs = '';
isInstalled = false;
hasErrors = false;
}
if (header.isNotEmpty) {
headerLogs = header;
@ -115,9 +117,11 @@ class InstallerViewModel extends BaseViewModel {
update(0.0, '', 'Creating working directory');
await _patcherAPI.runPatcher(_app.packageName, apkFilePath, _patches);
} on Exception {
hasErrors = true;
update(1.0, 'Aborting...', 'An error occurred! Aborting');
}
} else {
hasErrors = true;
update(1.0, 'Aborting...', 'No app or patches selected! Aborting');
}
try {
@ -144,8 +148,6 @@ class InstallerViewModel extends BaseViewModel {
_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');
}
}

4
lib/ui/views/patches_selector/patches_selector_view.dart
View file

@ -88,7 +88,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
tapHeaderToExpand: true,
),
header: Column(
children: [
children: <Widget>[
GestureDetector(
onLongPress: () =>
expController.toggle(),
@ -138,7 +138,7 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
BorderRadius.circular(12),
),
child: Column(
children: [
children: <Widget>[
Text(
"Patch options",
style: GoogleFonts.inter(

6
lib/ui/views/settings/settings_viewmodel.dart
View file

@ -100,7 +100,7 @@ class SettingsViewModel extends BaseViewModel {
context: context,
builder: (context) => AlertDialog(
title: Row(
children: [
children: <Widget>[
I18nText('settingsView.sourcesLabel'),
const Spacer(),
IconButton(
@ -160,7 +160,7 @@ class SettingsViewModel extends BaseViewModel {
],
),
),
actions: [
actions: <Widget>[
CustomMaterialButton(
isFilled: false,
label: I18nText('cancelButton'),
@ -196,7 +196,7 @@ class SettingsViewModel extends BaseViewModel {
title: I18nText('settingsView.sourcesResetDialogTitle'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: I18nText('settingsView.sourcesResetDialogText'),
actions: [
actions: <Widget>[
CustomMaterialButton(
isFilled: false,
label: I18nText('cancelButton'),

8
lib/ui/widgets/appInfoView/app_info_view.dart
View file

@ -64,12 +64,12 @@ class AppInfoView extends StatelessWidget {
child: IntrinsicHeight(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
children: <Widget>[
InkWell(
onTap: () => model.openApp(app),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Icon(
Icons.open_in_new_outlined,
color:
@ -99,7 +99,7 @@ class AppInfoView extends StatelessWidget {
model.showUninstallAlertDialog(context, app),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Icon(
Icons.delete_outline,
color:
@ -131,7 +131,7 @@ class AppInfoView extends StatelessWidget {
},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
children: <Widget>[
Icon(
Icons.build_outlined,
color:

6
lib/ui/widgets/appInfoView/app_info_viewmodel.dart
View file

@ -49,7 +49,7 @@ class AppInfoViewModel extends BaseViewModel {
title: I18nText('appInfoView.rootDialogTitle'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: I18nText('appInfoView.rootDialogText'),
actions: [
actions: <Widget>[
CustomMaterialButton(
label: I18nText('okButton'),
onPressed: () => Navigator.of(context).pop(),
@ -64,7 +64,7 @@ class AppInfoViewModel extends BaseViewModel {
title: I18nText('appInfoView.uninstallDialogTitle'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: I18nText('appInfoView.uninstallDialogText'),
actions: [
actions: <Widget>[
CustomMaterialButton(
isFilled: false,
label: I18nText('cancelButton'),
@ -105,7 +105,7 @@ class AppInfoViewModel extends BaseViewModel {
title: I18nText('appInfoView.appliedPatchesLabel'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: Text(getAppliedPatchesString(app.appliedPatches)),
actions: [
actions: <Widget>[
CustomMaterialButton(
label: I18nText('okButton'),
onPressed: () => Navigator.of(context).pop(),

4
lib/ui/widgets/appSelectorView/app_skeleton_loader.dart
View file

@ -15,7 +15,7 @@ class AppSkeletonLoader extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 8.0),
child: SkeletonItem(
child: Row(
children: [
children: <Widget>[
SkeletonAvatar(
style: SkeletonAvatarStyle(
width: screenWidth * 0.15,
@ -27,7 +27,7 @@ class AppSkeletonLoader extends StatelessWidget {
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
Container(
color: Colors.white,
height: 34,

2
lib/ui/widgets/patchesSelectorView/patch_item.dart
View file

@ -154,7 +154,7 @@ class _PatchItemState extends State<PatchItem> {
'\u2022 ${widget.supportedPackageVersions.join('\n\u2022 ')}',
},
),
actions: [
actions: <Widget>[
CustomMaterialButton(
label: I18nText('okButton'),
onPressed: () => Navigator.of(context).pop(),

2
lib/ui/widgets/patchesSelectorView/patch_options_fields.dart
View file

@ -38,7 +38,7 @@ class OptionsFilePicker extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 4.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
children: <Widget>[
I18nText(
optionName,
child: Text(