Skip to content

chore: Merge branch dev to main #2468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Jun 27, 2025
Merged

chore: Merge branch dev to main #2468

merged 39 commits into from
Jun 27, 2025

Conversation

revanced-bot
Copy link

This pull request will Merge branch dev to main.

validcube and others added 4 commits April 4, 2025 22:59
## [1.24.1-dev.1](v1.24.0...v1.24.1-dev.1) (2025-04-04)

### Bug Fixes

* Crash using when Integer type in Patch Options ([#2453](#2453)) ([05575cc](05575cc))
Technical commit message: fix: Unable to Share Logs due to CCE in FileProvider

Signed-off-by: Pun Butrach <[email protected]>
## [1.24.1-dev.2](v1.24.1-dev.1...v1.24.1-dev.2) (2025-04-09)

### Bug Fixes

* Unable to Share Logs due to missing ProGuard rules ([#2474](#2474)) ([915ec0e](915ec0e))
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 1 out of 3 changed files in this pull request and generated no comments.

Files not reviewed (2)
  • android/app/proguard-rules.pro: Language not supported
  • lib/ui/widgets/patchesSelectorView/patch_options_fields.dart: Language not supported

@validcube validcube linked an issue Apr 10, 2025 that may be closed by this pull request
4 tasks
Copy link
Member

@validcube validcube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interim review

  • When patch is unsupported, log now output TAG (PatchCompatibilityCheck) so that it will be easier to find/which file is responsible for the log.
  • Clean-up weird ahh spaces
  • Better proguard comment
  • Fix gradle directory

Copy link
Member

@validcube validcube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allow Flutter cache on PR (this shouldn't affect us much)

@validcube validcube requested a review from Copilot April 14, 2025 12:01
## [1.24.1-dev.5](v1.24.1-dev.4...v1.24.1-dev.5) (2025-04-17)

### Bug Fixes

* Use device locale when no preference is set ([#2483](#2483)) ([f79aa9e](f79aa9e))
@validcube validcube requested a review from Copilot April 17, 2025 14:28
Copilot

This comment was marked as outdated.

TheAabedKhan and others added 5 commits May 5, 2025 15:54
# [1.25.0-dev.1](v1.24.1-dev.5...v1.25.0-dev.1) (2025-05-05)

### Bug Fixes

* Fix installation being cancelled at installation by not prematurely deleting patched APK  ([#2490](#2490)) ([dedcb3c](dedcb3c))
* Use device locale for app language (Default to English) ([#2488](#2488)) ([3074766](3074766))

### Features

* Add toggle to use pre-releases ([#2485](#2485)) ([89b48ce](89b48ce))
kitadai31 and others added 8 commits May 31, 2025 14:22
This is workaround to entirely disabling Flutter Impeller in favour of Skia.

Signed-off-by: Pun Butrach <[email protected]>
Signed-off-by: Pun Butrach <[email protected]>
Signed-off-by: Pun Butrach <[email protected]>
Co-authored-by: Crowdin Bot <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Pun Butrach <[email protected]>
@validcube validcube linked an issue Jun 14, 2025 that may be closed by this pull request
4 tasks
validcube and others added 2 commits June 26, 2025 12:40
# [1.25.0-dev.2](v1.25.0-dev.1...v1.25.0-dev.2) (2025-06-26)

### Bug Fixes

* "Save patched app" attempts to copy APK when patching fails ([#2565](#2565)) ([bdb0317](bdb0317))
* Nearly all rare cases of GPU renderer issues, and allow building on manager again ([#2602](#2602)) ([21ceada](21ceada))
* Obscure Flutter Impeller renderer bugs ([a5e909c](a5e909c))
@validcube validcube requested review from validcube and Copilot June 26, 2025 11:34
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges the dev branch into main and includes a version bump and dependency updates in pubspec.yaml, new prerelease settings and related UI/viewmodel logic, adjustments to patch option handling, and extensive localization updates.

  • Updated version and dependency constraints in pubspec.yaml
  • New prerelease functionality added in settings view and viewmodel
  • Minor refactorings and logging improvements in various modules, plus multiple localization improvements

Reviewed Changes

Copilot reviewed 65 out of 68 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
pubspec.yaml Version bump and updated dependency constraints.
lib/utils/check_for_supported_patch.dart Adjusted supported patch option types and added debug logging.
lib/ui/widgets/settings_use_prereleases.dart Introduced a new widget for enabling prerelease options.
lib/ui/widgets/patchesSelectorView/patch_options_fields.dart Converted patch option value to a string explicitly.
lib/ui/views/settings/settings_viewmodel.dart Added prereleases support methods and dialog for settings.
lib/ui/views/installer/installer_viewmodel.dart Refactored runPatcher invocation and adjusted progress update values.
lib/ui/views/home/home_viewmodel.dart Modified connectivity check formatting and navigation argument style.
lib/services/revanced_api.dart, manager_api.dart, github_api.dart Updated API calls to include prerelease flags, and removed unused code.
assets/i18n/* Multiple localization files updated with improved translations.
Comments suppressed due to low confidence (1)

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart:88

  • [nitpick] Ensure that converting 'value' to a string using toString() does not inadvertently alter its intended behavior if 'value' is already a string; confirm that the conversion is intentional for handling non-string types.
                value: value.toString(),

@@ -38,6 +39,9 @@ bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
}
for (final String optionType in requiredOptionsType) {
if (!supportedOptionsType.contains(optionType)) {
if (kDebugMode) {
print('PatchCompatibilityCheck: ${patch.name} has unsupported required patch option type: $requiredOptionsType');
Copy link
Preview

Copilot AI Jun 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider logging the specific unsupported option type (i.e. 'optionType') rather than the entire list 'requiredOptionsType' to provide clearer debugging information.

Suggested change
print('PatchCompatibilityCheck: ${patch.name} has unsupported required patch option type: $requiredOptionsType');
print('PatchCompatibilityCheck: ${patch.name} has unsupported required patch option type: $optionType');

Copilot uses AI. Check for mistakes.

@validcube
Copy link
Member

@Ushie Should I hold off this PR for Patcher v22 or release this now?

@validcube
Copy link
Member

Pull Request Overview

This PR merges the dev branch into main and includes a version bump and dependency updates in pubspec.yaml, new prerelease settings and related UI/viewmodel logic, adjustments to patch option handling, and extensive localization updates.

  • Updated version and dependency constraints in pubspec.yaml
  • New prerelease functionality added in settings view and viewmodel
  • Minor refactorings and logging improvements in various modules, plus multiple localization improvements

Reviewed Changes

Copilot reviewed 65 out of 68 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
pubspec.yaml Version bump and updated dependency constraints.
lib/utils/check_for_supported_patch.dart Adjusted supported patch option types and added debug logging.
lib/ui/widgets/settings_use_prereleases.dart Introduced a new widget for enabling prerelease options.
lib/ui/widgets/patchesSelectorView/patch_options_fields.dart Converted patch option value to a string explicitly.
lib/ui/views/settings/settings_viewmodel.dart Added prereleases support methods and dialog for settings.
lib/ui/views/installer/installer_viewmodel.dart Refactored runPatcher invocation and adjusted progress update values.
lib/ui/views/home/home_viewmodel.dart Modified connectivity check formatting and navigation argument style.
lib/services/revanced_api.dart, manager_api.dart, github_api.dart Updated API calls to include prerelease flags, and removed unused code.
assets/i18n/* Multiple localization files updated with improved translations.
Comments suppressed due to low confidence (1)

lib/ui/widgets/patchesSelectorView/patch_options_fields.dart:88

  • [nitpick] Ensure that converting 'value' to a string using toString() does not inadvertently alter its intended behavior if 'value' is already a string; confirm that the conversion is intentional for handling non-string types.
                value: value.toString(),

Copilot low confidence nitpick is a very valid concern. Will check.

@Ushie Ushie merged commit c45d579 into main Jun 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment