From f01b8e47aac4131b97a52a2e91db34f3fb51173d Mon Sep 17 00:00:00 2001 From: Yaros Date: Fri, 9 Jun 2023 12:34:55 +0200 Subject: [PATCH 1/8] fix: aborting message changed (#928) Change aborting message from "aborting..." to "aborted..." ---------------------- Co-authored-by: Ushie Co-authored-by: Ushie --- .../kotlin/app/revanced/manager/flutter/MainActivity.kt | 4 ++-- lib/ui/views/installer/installer_viewmodel.dart | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt index 7ff82900..9654a781 100644 --- a/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt +++ b/android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt @@ -271,8 +271,8 @@ class MainActivity : FlutterActivity() { "update", mapOf( "progress" to -100.0, - "header" to "Aborting...", - "log" to "An error occurred! Aborting\nError:\n$stack" + "header" to "Aborted...", + "log" to "An error occurred! Aborted\nError:\n$stack" ) ) } diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index c1523dab..63631df0 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -135,15 +135,15 @@ class InstallerViewModel extends BaseViewModel { } on Exception catch (e) { update( -100.0, - 'Aborting...', - 'An error occurred! Aborting\nError:\n$e', + 'Aborted...', + 'An error occurred! Aborted\nError:\n$e', ); if (kDebugMode) { print(e); } } } else { - update(-100.0, 'Aborting...', 'No app or patches selected! Aborting'); + update(-100.0, 'Aborted...', 'No app or patches selected! Aborted'); } if (FlutterBackground.isBackgroundExecutionEnabled) { try { From a8e019482f1f91e04ad339f73afefb4d94ae74b1 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 10 Jun 2023 23:41:36 +0200 Subject: [PATCH 2/8] ci: add workflow to update documentation repository --- .github/workflows/update-documentation.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/update-documentation.yml diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml new file mode 100644 index 00000000..77097e2f --- /dev/null +++ b/.github/workflows/update-documentation.yml @@ -0,0 +1,19 @@ +name: Update documentation + +on: + push: + paths: + - docs/** + +jobs: + trigger: + runs-on: ubuntu-latest + name: Dispatch event to documentation repository + if: github.ref == 'refs/heads/main' + steps: + - uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN }} + repository: revanced/revanced-documentation + event-type: update-documentation + client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}' From 0079e74d77b9334b2dee4573712d7049524523c7 Mon Sep 17 00:00:00 2001 From: Aabed Khan <39409020+TheAabedKhan@users.noreply.github.com> Date: Mon, 12 Jun 2023 05:50:02 +0545 Subject: [PATCH 3/8] feat: clarify suggested version in app list (#934) Co-authored-by: Aunali321 <48486084+Aunali321@users.noreply.github.com> --- assets/i18n/en_US.json | 2 + .../views/app_selector/app_selector_view.dart | 1 + .../appSelectorView/installed_app_item.dart | 43 +++++++++++++------ .../not_installed_app_item.dart | 4 +- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 03b28c54..ae4e5360 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -4,6 +4,8 @@ "updateButton": "Update", "enabledLabel": "Enabled", "disabledLabel": "Disabled", + "installed":"Installed: {version}", + "suggested":"Suggested: {version}", "yesButton": "Yes", "noButton": "No", "warning": "Warning", diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 3404b08e..2f6ddda2 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -111,6 +111,7 @@ class _AppSelectorViewState extends State { model.getSuggestedVersion( app.packageName, ), + installedVersion: app.versionName!, onTap: () => model.canSelectInstalled(context, app.packageName), ), ) diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart index 27bed6cd..80266e3f 100644 --- a/lib/ui/widgets/appSelectorView/installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart @@ -1,6 +1,7 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; +import 'package:flutter_i18n/flutter_i18n.dart'; class InstalledAppItem extends StatefulWidget { const InstalledAppItem({ @@ -10,6 +11,7 @@ class InstalledAppItem extends StatefulWidget { required this.icon, required this.patchesCount, required this.suggestedVersion, + required this.installedVersion, this.onTap, }) : super(key: key); final String name; @@ -17,6 +19,7 @@ class InstalledAppItem extends StatefulWidget { final Uint8List icon; final int patchesCount; final String suggestedVersion; + final String installedVersion; final Function()? onTap; @override @@ -48,25 +51,37 @@ class _InstalledAppItemState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - widget.name, - maxLines: 2, - overflow: TextOverflow.visible, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - const SizedBox(height: 4), - Text(widget.pkgName), Row( children: [ Text( - widget.suggestedVersion.isEmpty - ? 'All versions' - : widget.suggestedVersion, + widget.name, + maxLines: 2, + overflow: TextOverflow.visible, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), ), const SizedBox(width: 4), + I18nText(widget.installedVersion.isEmpty + ? 'All versions' + : 'v${widget.installedVersion}'), + ], + ), + Text(widget.pkgName), + Row( + children: [ + I18nText( + FlutterI18n.translate( + context, + 'suggested', + translationParams: { + 'version': widget.suggestedVersion.isEmpty + ? 'All versions' + : 'v${widget.suggestedVersion}' + }, + ), + const SizedBox(width: 4), Text( widget.patchesCount == 1 ? '• ${widget.patchesCount} patch' diff --git a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart index f6062af9..8c1ae1fc 100644 --- a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart @@ -59,9 +59,7 @@ class _NotInstalledAppItem extends State { Row( children: [ Text( - widget.suggestedVersion.isEmpty - ? 'All versions' - : widget.suggestedVersion, + 'Suggested: ${widget.suggestedVersion.isEmpty ? 'All versions' : 'v${widget.suggestedVersion}'}', ), const SizedBox(width: 4), Text( From 185460c054834d6bf0f78ca7abe747acb53dde9d Mon Sep 17 00:00:00 2001 From: Aabed Khan <39409020+TheAabedKhan@users.noreply.github.com> Date: Mon, 12 Jun 2023 06:06:33 +0545 Subject: [PATCH 4/8] chore(fastlane): update description (#933) Co-authored-by: Ushie --- fastlane/metadata/android/en-US/full_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 91196788..673becbc 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1 +1 @@ -The ReVanced Manager is an Android application that allows you to modify any Dalvik Android application to add, remove and/or modify existing functionality. It dissassembles the APK locally on your device, makes the required changes using ReVanced Patcher and then assembles it back into an APK again. \ No newline at end of file +ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications From 20ffef39a358273cc12cd79d2b19f3675b98b9c6 Mon Sep 17 00:00:00 2001 From: Aabed Khan <39409020+TheAabedKhan@users.noreply.github.com> Date: Mon, 12 Jun 2023 06:10:53 +0545 Subject: [PATCH 5/8] fix: update button being shown as clickable on launch (#932) --- lib/ui/views/home/home_viewmodel.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index 090ac30e..12757159 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -113,7 +113,8 @@ 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'; From 1ad906fedc854d75f2cc7c7fbed0b67872a6931a Mon Sep 17 00:00:00 2001 From: Aunali321 Date: Mon, 12 Jun 2023 06:01:57 +0530 Subject: [PATCH 6/8] refactor: improve code --- lib/ui/views/home/home_viewmodel.dart | 3 +-- lib/ui/views/installer/installer_view.dart | 3 ++- .../widgets/appSelectorView/installed_app_item.dart | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index 12757159..edcc357d 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -22,7 +22,6 @@ import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/widgets/homeView/update_confirmation_dialog.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; -import 'package:revanced_manager/utils/about_info.dart'; import 'package:stacked/stacked.dart'; import 'package:stacked_services/stacked_services.dart'; @@ -114,7 +113,7 @@ 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'; diff --git a/lib/ui/views/installer/installer_view.dart b/lib/ui/views/installer/installer_view.dart index 2ba73779..7663a5bb 100644 --- a/lib/ui/views/installer/installer_view.dart +++ b/lib/ui/views/installer/installer_view.dart @@ -157,7 +157,8 @@ class InstallerView extends StatelessWidget { SliverFillRemaining( hasScrollBody: false, child: SizedBox( - height: MediaQuery.of(context).viewPadding.bottom), + height: MediaQuery.of(context).viewPadding.bottom, + ), ), ], ), diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart index 80266e3f..59226e05 100644 --- a/lib/ui/widgets/appSelectorView/installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart @@ -1,7 +1,8 @@ import 'dart:typed_data'; + import 'package:flutter/material.dart'; -import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; import 'package:flutter_i18n/flutter_i18n.dart'; +import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; class InstalledAppItem extends StatefulWidget { const InstalledAppItem({ @@ -63,9 +64,11 @@ class _InstalledAppItemState extends State { ), ), const SizedBox(width: 4), - I18nText(widget.installedVersion.isEmpty - ? 'All versions' - : 'v${widget.installedVersion}'), + I18nText( + widget.installedVersion.isEmpty + ? 'All versions' + : 'v${widget.installedVersion}', + ), ], ), Text(widget.pkgName), @@ -81,6 +84,7 @@ class _InstalledAppItemState extends State { : 'v${widget.suggestedVersion}' }, ), + ), const SizedBox(width: 4), Text( widget.patchesCount == 1 From cac1525da0ec751e8e25522d2c41a6ceda9ab854 Mon Sep 17 00:00:00 2001 From: Aunali321 Date: Mon, 12 Jun 2023 06:02:16 +0530 Subject: [PATCH 7/8] build: bump patcher --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a56f574a..d0da346d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -71,7 +71,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // ReVanced - implementation "app.revanced:revanced-patcher:9.0.0" + implementation "app.revanced:revanced-patcher:11.0.0" // Signing & aligning implementation("org.bouncycastle:bcpkix-jdk15on:1.70") From 1f64ea37bd2d6635533d5a40be432470da021ad0 Mon Sep 17 00:00:00 2001 From: Aunali321 Date: Mon, 12 Jun 2023 06:59:43 +0530 Subject: [PATCH 8/8] fix: using wrong string --- lib/ui/views/app_selector/app_selector_view.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 2f6ddda2..42ff13e7 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -78,7 +78,7 @@ class _AppSelectorViewState extends State { child: model.noApps ? Center( child: I18nText( - 'appSelectorView.noAppsLabel', + 'appSelectorCard.noAppsLabel', child: Text( '', style: TextStyle( @@ -112,7 +112,8 @@ class _AppSelectorViewState extends State { app.packageName, ), installedVersion: app.versionName!, - onTap: () => model.canSelectInstalled(context, app.packageName), + onTap: () => model.canSelectInstalled( + context, app.packageName), ), ) .toList(),