diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml index bf785da056..87c8e4fb67 100644 --- a/.github/ISSUE_TEMPLATE/bug-issue.yml +++ b/.github/ISSUE_TEMPLATE/bug-issue.yml @@ -29,7 +29,7 @@ body: - type: textarea attributes: label: Steps to reproduce - description: Add the steps to reproduce this bug including your environment. + description: Add the steps to reproduce this bug, including your environment. placeholder: Step 1. Download some files. Step 2. ... validations: required: true @@ -74,20 +74,20 @@ body: - type: textarea attributes: label: Device logs (exported using Manager settings). - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks. render: shell validations: required: true - type: textarea attributes: - label: Installer logs (exported using Installer menu option) [unneeded if issue is not during patching]. - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + label: Installer logs (exported using Installer menu option) [unneeded if the issue is not during patching]. + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks. render: shell validations: required: false - type: textarea attributes: - label: Screenshots or videos + label: Screenshots or video description: Add screenshots or videos that show the bug here. placeholder: Drag and drop the screenshots/videos into this box. validations: @@ -105,16 +105,16 @@ body: validations: required: false - type: checkboxes - id: acknowledgements + id: acknowledgments attributes: - label: Acknowledgements + label: Acknowledgments description: Your issue will be closed if you haven't done these steps. options: - - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue. + - label: I have searched the existing issues; this is new and no duplicate or related to another open issue. required: true - label: I have written a short but informative title. required: true - - label: I filled out all of the requested information in this issue properly. + - label: I properly filled out all of the requested information in this issue. required: true - - label: The issue is related solely to the ReVanced Manager and not related to patching errors or patches + - label: The issue is solely related to ReVanced Manager and not caused by patches. required: true diff --git a/android/app/build.gradle b/android/app/build.gradle index 78ce029861..a752c0e132 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 4f64c73f67..76777308a3 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip -distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87 +distributionSha256Sum=a01b6587e15fe7ed120a0ee299c25982a1eee045abd6a9dd5e216b2f628ef9ac +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 0c61436fba..13163555f5 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -17,23 +17,33 @@ "homeView": { "refreshSuccess": "Refreshed successfully", "widgetTitle": "Dashboard", + "updatesSubtitle": "Updates", "patchedSubtitle": "Patched applications", + "updatesAvailable": "Updates available", "noUpdates": "No updates available", + "WIP": "Work in progress...", + "noInstallations": "No patched applications installed", "installed": "Installed", "installUpdate": "Continue to install the update?", + "updateDialogTitle": "Update Manager", "updateChangelogTitle": "Changelog", + "notificationTitle": "Update downloaded", "notificationText": "Tap to install the update", + "downloadingMessage": "Downloading update...", "downloadedMessage": "Update downloaded!", + "installingMessage": "Installing update...", + "errorDownloadMessage": "Unable to download update", "errorInstallMessage": "Unable to install update", + "noConnection": "No internet connection", "updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again." }, @@ -52,6 +62,7 @@ "patcherView": { "widgetTitle": "Patcher", "patchButton": "Patch", + "patchDialogText": "You have selected a resource patch and a split APK installation has been detected, so patching errors may occur.\nAre you sure you want to proceed?", "armv7WarningDialogText": "Patching on ARMv7 devices is not yet supported and might fail. Proceed anyways?", "splitApkWarningDialogText": "Patching a split APK is not yet supported and might fail. Proceed anyways?" @@ -60,8 +71,10 @@ "widgetTitle": "Select an application", "widgetTitleSelected": "Selected application", "widgetSubtitle": "No application selected", + "noAppsLabel": "No applications found", "notInstalled":"App not installed", + "currentVersion": "Current", "suggestedVersion": "Suggested", "allVersions": "All versions" @@ -69,6 +82,7 @@ "patchSelectorCard": { "widgetTitle": "Select patches", "widgetTitleSelected": "Selected patches", + "widgetSubtitle": "Select an application first", "widgetEmptySubtitle": "No patches selected" }, @@ -79,24 +93,33 @@ "appSelectorView": { "viewTitle": "Select an application", "searchBarHint": "Search applications", - "selectFromStorageButton": "Select from storage", + "storageButton": "Storage", + "selectFromStorageButton": "Select from storage", + "errorMessage": "Unable to use selected application", + "downloadToast": "Download function is not available yet", + "featureNotAvailable": "Feature not implemented", "featureNotAvailableText": "This application is a split APK and cannot be selected. Unfortunately, this feature is only available for rooted users at the moment. However, you can still install the application by selecting its APK files from your device's storage instead" }, "patchesSelectorView": { "viewTitle": "Select patches", "searchBarHint": "Search patches", + "doneButton": "Done", + "default": "Default", "defaultTooltip": "Select all default patches", + "none": "None", "noneTooltip": "Deselect all patches", + "loadPatchesSelection": "Load patches selection", "noSavedPatches": "No saved patches for the selected app.\nPress Done to save current selection.", "noPatchesFound": "No patches found for the selected app", + "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior." }, "patchItem": { @@ -109,11 +132,14 @@ "installRootButton": "Install as Root", "openButton": "Open", "shareButton": "Share file", + "notificationTitle": "ReVanced Manager is patching", "notificationText": "Tap to return to the installer", + "shareApkMenuOption": "Share APK", "exportApkMenuOption": "Export APK", "shareLogMenuOption": "Share log", + "installErrorDialogTitle": "Error", "installErrorDialogText1": "Root install is not possible with the current patches selection.\nRepatch your app or choose non-root install.", "installErrorDialogText2": "Non-root install is not possible with the current patches selection.\nRepatch your app or choose root install if you have your device rooted.", @@ -122,74 +148,95 @@ }, "settingsView": { "widgetTitle": "Settings", + "appearanceSectionTitle": "Appearance", "teamSectionTitle": "Team", "infoSectionTitle": "Info", "advancedSectionTitle": "Advanced", + "exportSectionTitle": "Import & export", "logsSectionTitle": "Logs", + "darkThemeLabel": "Dark mode", "darkThemeHint": "Welcome to the dark side", + "dynamicThemeLabel": "Material You", "dynamicThemeHint": "Enjoy an experience closer to your device", + "languageLabel": "Language", "englishOption": "English", + "sourcesLabel": "Sources", "sourcesLabelHint": "Configure your custom sources", - "hostRepositoryLabel": "Repository API", - "orgPatchesLabel": "Patches organization", - "sourcesPatchesLabel": "Patches source", - "orgIntegrationsLabel": "Integrations organization", "sourcesIntegrationsLabel": "Integrations source", "sourcesResetDialogTitle": "Reset", "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?", "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?", + + "apiURLLabel": "API URL", + "apiURLHint": "Configure your custom API URL", + "selectApiURL": "API URL", + "hostRepositoryLabel": "Repository API", + "orgPatchesLabel": "Patches organization", + "sourcesPatchesLabel": "Patches source", + "orgIntegrationsLabel": "Integrations organization", + "contributorsLabel": "Contributors", "contributorsHint": "A list of contributors of ReVanced", + "logsLabel": "Logs", "logsHint": "Share Manager's logs", - "apiURLLabel": "API URL", - "apiURLHint": "Configure your custom API URL", - "selectApiURL": "API URL", + "experimentalUniversalPatchesLabel": "Experimental universal patches support", "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower", "experimentalPatchesLabel": "Experimental patches support", "experimentalPatchesHint": "Enable usage of unsupported patches in any app version", "enabledExperimentalPatches": "Experimental patches support enabled", - "exportSectionTitle": "Import & export", + "aboutLabel": "About", "snackbarMessage": "Copied to clipboard", "restartAppForChanges": "Restart the app to apply changes", - "deleteKeystoreLabel": "Delete keystore", - "deleteKeystoreHint": "Delete the keystore used to sign the app", - "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?", - "deletedKeystore": "Keystore deleted", + "deleteTempDirLabel": "Delete temporary files", "deleteTempDirHint": "Delete unused temporary files", "deletedTempDir": "Temporary files deleted", + "exportPatchesLabel": "Export patches selection", "exportPatchesHint": "Export patches selection to a JSON file", "exportedPatches": "Patches selection exported", "noExportFileFound": "No patches selection to export", + "importPatchesLabel": "Import patches selection", "importPatchesHint": "Import patches selection from a JSON file", "importedPatches": "Patches selection imported", + "resetStoredPatchesLabel": "Reset patches", "resetStoredPatchesHint": "Reset the stored patches selection", + "resetStoredPatchesDialogText": "Are you sure you want to reset the stored patches selection?", "resetStoredPatches": "Patches selection has been reset", - "jsonSelectorErrorMessage": "Unable to use selected JSON file", + "deleteLogsLabel": "Delete logs", "deleteLogsHint": "Delete collected manager logs", "deletedLogs": "Logs deleted", + + "deleteKeystoreLabel": "Delete keystore", + "deleteKeystoreHint": "Delete the keystore used to sign the app", + "deleteKeystoreDialogText": "Are you sure you want to delete the keystore used to sign patched applications?", + "deletedKeystore": "Keystore deleted", + "exportKeystoreLabel": "Export keystore", "exportKeystoreHint": "Export keystore used to sign apps", "exportedKeystore": "Keystore exported", "noKeystoreExportFileFound": "No keystore to export", + "importKeystoreLabel": "Import keystore", "importKeystoreHint": "Import keystore used to sign apps", "importedKeystore": "Keystore imported", - "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file", + "selectKeystorePassword": "Keystore Password", - "selectKeystorePasswordHint": "Select keystore password used to sign the apk" + "selectKeystorePasswordHint": "Select keystore password used to sign the apk", + + "jsonSelectorErrorMessage": "Unable to use selected JSON file", + "keystoreSelectorErrorMessage": "Unable to use selected KEYSTORE file" }, "appInfoView": { "widgetTitle": "App info", @@ -197,18 +244,22 @@ "uninstallButton": "Uninstall", "patchButton": "Patch", "unpatchButton": "Unpatch", - "unpatchDialogText": "Are you sure you want to unpatch this app?", "rootDialogTitle": "Error", + + "unpatchDialogText": "Are you sure you want to unpatch this app?", "rootDialogText": "App was installed with superuser permissions, but currently ReVanced Manager has no permissions.\nPlease grant superuser permissions first.", + "packageNameLabel": "Package name", "originalPackageNameLabel": "Original package name", "installTypeLabel": "Installation type", "rootTypeLabel": "Root", "nonRootTypeLabel": "Non-root", "patchedDateLabel": "Patched date", - "patchedDateHint": "{date} at {time}", "appliedPatchesLabel": "Applied patches", + + "patchedDateHint": "{date} at {time}", "appliedPatchesHint": "{quantity} applied patches", + "updateNotImplemented": "This feature has not been implemented yet" }, "contributorsView": { diff --git a/docs/1_installation.md b/docs/1_installation.md index 45898582c4..b25e0758da 100644 --- a/docs/1_installation.md +++ b/docs/1_installation.md @@ -9,6 +9,6 @@ In order to use ReVanced on your Android device, ReVanced Manager must be instal ## ⏭️ What's next -The next page will guide you through patching an app. +The next page will guide you through using ReVanced Manager. Continue: [🪛 Usage](2_usage.md) diff --git a/lib/services/github_api.dart b/lib/services/github_api.dart index 973b9d0982..6202032815 100644 --- a/lib/services/github_api.dart +++ b/lib/services/github_api.dart @@ -1,6 +1,5 @@ import 'dart:convert'; import 'dart:io'; - import 'package:collection/collection.dart'; import 'package:dio/dio.dart'; import 'package:dio_cache_interceptor/dio_cache_interceptor.dart'; @@ -10,7 +9,6 @@ import 'package:injectable/injectable.dart'; import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/services/manager_api.dart'; - @lazySingleton class GithubAPI { late Dio _dio = Dio(); @@ -60,6 +58,22 @@ class GithubAPI { Future?> getLatestRelease( String repoName, + ) async { + try { + final response = await _dio.get( + '/repos/$repoName/releases', + ); + return response.data[0]; + } on Exception catch (e) { + if (kDebugMode) { + print(e); + } + return null; + } + } + + Future?> getLatestManagerRelease( + String repoName, ) async { try { final response = await _dio.get( @@ -67,12 +81,22 @@ class GithubAPI { ); final Map releases = response.data[0]; int updates = 0; - final String currentVersion = await ManagerAPI().getCurrentManagerVersion(); + final String currentVersion = + await ManagerAPI().getCurrentManagerVersion(); while (response.data[updates]['tag_name'] != 'v$currentVersion') { updates++; } - for(int i = 1; i < updates; i++){ - releases.update('body', (value) => value + '\n' + '# '+ response.data[i]['tag_name']+'\n' + response.data[i]['body']); + for (int i = 1; i < updates; i++) { + releases.update( + 'body', + (value) => + value + + '\n' + + '# ' + + response.data[i]['tag_name'] + + '\n' + + response.data[i]['body'], + ); } return releases; } on Exception catch (e) { diff --git a/lib/services/revanced_api.dart b/lib/services/revanced_api.dart index a8bec19c4a..bc3562bac5 100644 --- a/lib/services/revanced_api.dart +++ b/lib/services/revanced_api.dart @@ -140,7 +140,8 @@ class RevancedAPI { return null; } - StreamController managerUpdateProgress = StreamController.broadcast(); + StreamController managerUpdateProgress = + StreamController.broadcast(); void updateManagerDownloadProgress(int progress) { managerUpdateProgress.add(progress.toDouble()); diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 42ff13e773..e3ab0c4159 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -113,7 +113,9 @@ class _AppSelectorViewState extends State { ), installedVersion: app.versionName!, onTap: () => model.canSelectInstalled( - context, app.packageName), + context, + app.packageName, + ), ), ) .toList(), diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index b05f0e4da4..4ffdd86bc4 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -112,13 +112,15 @@ class HomeViewModel extends BaseViewModel { Future hasManagerUpdates() async { String currentVersion = await _managerAPI.getCurrentManagerVersion(); - _latestManagerVersion = await _managerAPI.getLatestManagerVersion(); // add v to current version if (!currentVersion.startsWith('v')) { currentVersion = 'v$currentVersion'; } + _latestManagerVersion = + await _managerAPI.getLatestManagerVersion() ?? currentVersion; + if (_latestManagerVersion != currentVersion) { return true; } @@ -271,7 +273,8 @@ class HomeViewModel extends BaseViewModel { label: I18nText('updateButton'), onPressed: () async { await AppInstaller.installApk( - downloadedApk!.path,); + downloadedApk!.path, + ); }, ), ), @@ -345,7 +348,7 @@ class HomeViewModel extends BaseViewModel { } Future?> getLatestManagerRelease() { - return _githubAPI.getLatestRelease(_managerAPI.defaultManagerRepo); + return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo); } Future getLatestPatcherReleaseTime() { diff --git a/lib/ui/views/navigation/navigation_view.dart b/lib/ui/views/navigation/navigation_view.dart index 2a78f9337c..d8fdd5c6b8 100644 --- a/lib/ui/views/navigation/navigation_view.dart +++ b/lib/ui/views/navigation/navigation_view.dart @@ -42,6 +42,7 @@ class NavigationView extends StatelessWidget { context, 'navigationView.dashboardTab', ), + tooltip: '', ), NavigationDestination( icon: model.isIndexSelected(1) @@ -51,6 +52,7 @@ class NavigationView extends StatelessWidget { context, 'navigationView.patcherTab', ), + tooltip: '', ), NavigationDestination( icon: model.isIndexSelected(2) @@ -60,6 +62,7 @@ class NavigationView extends StatelessWidget { context, 'navigationView.settingsTab', ), + tooltip: '', ), ], ), diff --git a/lib/ui/views/settings/settings_viewmodel.dart b/lib/ui/views/settings/settings_viewmodel.dart index 82c09ec1b0..3840dafbeb 100644 --- a/lib/ui/views/settings/settings_viewmodel.dart +++ b/lib/ui/views/settings/settings_viewmodel.dart @@ -17,8 +17,7 @@ import 'package:stacked/stacked.dart'; import 'package:stacked_services/stacked_services.dart'; class SettingsViewModel extends BaseViewModel { - final NavigationService _navigationService = - locator(); + final NavigationService _navigationService = locator(); final ManagerAPI _managerAPI = locator(); final Toast _toast = locator(); @@ -63,11 +62,8 @@ class SettingsViewModel extends BaseViewModel { try { final File outFile = File(_managerAPI.storedPatchesFile); if (outFile.existsSync()) { - final String dateTime = DateTime.now() - .toString() - .replaceAll(' ', '_') - .split('.') - .first; + final String dateTime = + DateTime.now().toString().replaceAll(' ', '_').split('.').first; await CRFileSaver.saveFileWithDialog( SaveFileDialogParams( sourceFilePath: outFile.path, @@ -87,8 +83,7 @@ class SettingsViewModel extends BaseViewModel { Future importPatches() async { try { - final FilePickerResult? result = - await FilePicker.platform.pickFiles( + final FilePickerResult? result = await FilePicker.platform.pickFiles( type: FileType.custom, allowedExtensions: ['json'], ); @@ -109,7 +104,7 @@ class SettingsViewModel extends BaseViewModel { } } - Future exportKeystore() async { + Future exportKeystore() async { try { final File outFile = File(_managerAPI.keystoreFile); if (outFile.existsSync()) { @@ -138,7 +133,7 @@ class SettingsViewModel extends BaseViewModel { if (result != null && result.files.single.path != null) { final File inFile = File(result.files.single.path!); inFile.copySync(_managerAPI.keystoreFile); - + _toast.showBottom('settingsView.importedKeystore'); } } on Exception catch (e) { diff --git a/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart b/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart index c1231b5902..51c51b7273 100644 --- a/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart +++ b/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart @@ -34,7 +34,8 @@ class AppSkeletonLoader extends StatelessWidget { style: SkeletonLineStyle( height: 20, width: screenWidth * 0.4, - borderRadius: const BorderRadius.all(Radius.circular(10)), + borderRadius: + const BorderRadius.all(Radius.circular(10)), ), ), ), @@ -45,7 +46,8 @@ class AppSkeletonLoader extends StatelessWidget { style: SkeletonLineStyle( height: 15, width: screenWidth * 0.6, - borderRadius: const BorderRadius.all(Radius.circular(10)), + borderRadius: + const BorderRadius.all(Radius.circular(10)), ), ), ), @@ -56,7 +58,8 @@ class AppSkeletonLoader extends StatelessWidget { style: SkeletonLineStyle( height: 15, width: screenWidth * 0.5, - borderRadius: const BorderRadius.all(Radius.circular(10)), + borderRadius: + const BorderRadius.all(Radius.circular(10)), ), ), ), diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart index fc1a97e1b6..70a49a1a96 100644 --- a/lib/ui/widgets/appSelectorView/installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart @@ -66,7 +66,7 @@ class _InstalledAppItemState extends State { context, 'installed', translationParams: { - 'version':'v${widget.installedVersion}' + 'version': 'v${widget.installedVersion}' }, ), ), @@ -75,8 +75,11 @@ class _InstalledAppItemState extends State { I18nText( 'suggested', translationParams: { - 'version' : widget.suggestedVersion.isEmpty - ? FlutterI18n.translate(context, 'appSelectorCard.allVersions') + 'version': widget.suggestedVersion.isEmpty + ? FlutterI18n.translate( + context, + 'appSelectorCard.allVersions', + ) : 'v${widget.suggestedVersion}', }, ), diff --git a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart index fa94eb2ba1..e932908b7d 100644 --- a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart @@ -60,8 +60,7 @@ class _NotInstalledAppItem extends State { child: Text( '', style: TextStyle( - color: - Theme.of(context).textTheme.titleLarge!.color, + color: Theme.of(context).textTheme.titleLarge!.color, ), ), ), @@ -70,8 +69,11 @@ class _NotInstalledAppItem extends State { I18nText( 'suggested', translationParams: { - 'version' : widget.suggestedVersion.isEmpty - ? FlutterI18n.translate(context, 'appSelectorCard.allVersions') + 'version': widget.suggestedVersion.isEmpty + ? FlutterI18n.translate( + context, + 'appSelectorCard.allVersions', + ) : 'v${widget.suggestedVersion}', }, ), diff --git a/lib/ui/widgets/homeView/update_confirmation_dialog.dart b/lib/ui/widgets/homeView/update_confirmation_dialog.dart index 108c5d78be..16a1f1be2c 100644 --- a/lib/ui/widgets/homeView/update_confirmation_dialog.dart +++ b/lib/ui/widgets/homeView/update_confirmation_dialog.dart @@ -45,8 +45,7 @@ class UpdateConfirmationDialog extends StatelessWidget { children: [ Expanded( child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ I18nText( 'homeView.updateDialogTitle', @@ -63,14 +62,12 @@ class UpdateConfirmationDialog extends StatelessWidget { children: [ Icon( Icons.new_releases_outlined, - color: Theme.of(context) - .colorScheme - .secondary, + color: + Theme.of(context).colorScheme.secondary, ), const SizedBox(width: 8.0), Text( - snapshot.data!['tag_name'] ?? - 'Unknown', + snapshot.data!['tag_name'] ?? 'Unknown', style: TextStyle( fontSize: 20, fontWeight: FontWeight.w500, @@ -96,8 +93,7 @@ class UpdateConfirmationDialog extends StatelessWidget { ), ), Padding( - padding: - const EdgeInsets.only(left: 24.0, bottom: 12.0), + padding: const EdgeInsets.only(left: 24.0, bottom: 12.0), child: I18nText( 'homeView.updateChangelogTitle', child: Text( @@ -113,12 +109,9 @@ class UpdateConfirmationDialog extends StatelessWidget { ), ), Container( - margin: - const EdgeInsets.symmetric(horizontal: 24.0), + margin: const EdgeInsets.symmetric(horizontal: 24.0), decoration: BoxDecoration( - color: Theme.of(context) - .colorScheme - .secondaryContainer, + color: Theme.of(context).colorScheme.secondaryContainer, borderRadius: BorderRadius.circular(12.0), ), child: Markdown( diff --git a/lib/ui/widgets/patchesSelectorView/patch_item.dart b/lib/ui/widgets/patchesSelectorView/patch_item.dart index 267fb1c325..294ba3eccc 100644 --- a/lib/ui/widgets/patchesSelectorView/patch_item.dart +++ b/lib/ui/widgets/patchesSelectorView/patch_item.dart @@ -42,7 +42,9 @@ class PatchItem extends StatefulWidget { class _PatchItemState extends State { @override Widget build(BuildContext context) { - widget.isSelected = widget.isSelected && (!widget.isUnsupported || widget._managerAPI.areExperimentalPatchesEnabled()); + widget.isSelected = widget.isSelected && + (!widget.isUnsupported || + widget._managerAPI.areExperimentalPatchesEnabled()); return Padding( padding: const EdgeInsets.symmetric(vertical: 4.0), child: Opacity( @@ -117,7 +119,7 @@ class _PatchItemState extends State { value: widget.isSelected, activeColor: Theme.of(context).colorScheme.primary, checkColor: - Theme.of(context).colorScheme.secondaryContainer, + Theme.of(context).colorScheme.secondaryContainer, side: BorderSide( width: 2.0, color: Theme.of(context).colorScheme.primary, @@ -128,14 +130,16 @@ class _PatchItemState extends State { !widget._managerAPI .areExperimentalPatchesEnabled()) { widget.isSelected = false; - widget.toast - .showBottom('patchItem.unsupportedPatchVersion'); + widget.toast.showBottom( + 'patchItem.unsupportedPatchVersion', + ); } else { widget.isSelected = newValue!; } if (widget.isUnsupported && widget.isSelected && - !selectedUnsupportedPatches.contains(widget.name)) { + !selectedUnsupportedPatches + .contains(widget.name)) { selectedUnsupportedPatches.add(widget.name); } }); diff --git a/lib/ui/widgets/settingsView/settings_experimental_patches.dart b/lib/ui/widgets/settingsView/settings_experimental_patches.dart index 79f5e7fe82..1b2e25422d 100644 --- a/lib/ui/widgets/settingsView/settings_experimental_patches.dart +++ b/lib/ui/widgets/settingsView/settings_experimental_patches.dart @@ -34,9 +34,11 @@ class _SExperimentalPatchesState extends State { setState(() { _settingsViewModel.useExperimentalPatches(value); }); - if(!value) { + if (!value) { for (final patch in selectedUnsupportedPatches) { - PatchesSelectorViewModel().selectedPatches.removeWhere((element) => patch == element.name); + PatchesSelectorViewModel() + .selectedPatches + .removeWhere((element) => patch == element.name); } selectedUnsupportedPatches.clear(); } diff --git a/lib/ui/widgets/settingsView/settings_export_section.dart b/lib/ui/widgets/settingsView/settings_export_section.dart index 0702f065b7..b2d65c9577 100644 --- a/lib/ui/widgets/settingsView/settings_export_section.dart +++ b/lib/ui/widgets/settingsView/settings_export_section.dart @@ -3,6 +3,7 @@ import 'package:flutter_i18n/widgets/I18nText.dart'; import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart'; import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart'; +import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; final _settingsViewModel = SettingsViewModel(); @@ -91,9 +92,36 @@ class SExportSection extends StatelessWidget { ), ), subtitle: I18nText('settingsView.resetStoredPatchesHint'), - onTap: () => _settingsViewModel.resetSelectedPatches(), + onTap: () => _showResetStoredPatchesDialog(context), ), ], ); } + + Future _showResetStoredPatchesDialog(context) { + return showDialog( + context: context, + builder: (context) => AlertDialog( + title: I18nText('warning'), + backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + content: I18nText( + 'settingsView.resetStoredPatchesDialogText', + ), + actions: [ + CustomMaterialButton( + isFilled: false, + label: I18nText('noButton'), + onPressed: () => Navigator.of(context).pop(), + ), + CustomMaterialButton( + label: I18nText('yesButton'), + onPressed: () => { + Navigator.of(context).pop(), + _settingsViewModel.resetSelectedPatches() + }, + ) + ], + ), + ); + } } diff --git a/pubspec.yaml b/pubspec.yaml index deee045645..a831f51b10 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager publish_to: 'none' -version: 1.3.8+100300008 +version: 1.3.9+100300009 environment: sdk: '>=3.0.0 <4.0.0'