diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json index 2f5393e7..94eb62b2 100644 --- a/assets/i18n/en_US.json +++ b/assets/i18n/en_US.json @@ -57,7 +57,7 @@ "widgetSubtitle": "No application selected", "noAppsLabel": "No applications found", "currentVersion": "Current", - "recommendedVersion": "Suggested", + "suggestedVersion": "Suggested", "anyVersion": "any" }, "patchSelectorCard": { @@ -91,7 +91,7 @@ "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 unrecommended patches and can cause unwanted behavior." + "selectAllPatchesWarningContent": "You are about to select all patches, that includes non-suggested patches and can cause unwanted behavior." }, "patchItem": { "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nSupported versions:\n{supportedVersions}", diff --git a/lib/services/patcher_api.dart b/lib/services/patcher_api.dart index a4d80280..026fdb5c 100644 --- a/lib/services/patcher_api.dart +++ b/lib/services/patcher_api.dart @@ -310,7 +310,7 @@ class PatcherAPI { ShareExtend.share(log.path, 'file'); } - String getRecommendedVersion(String packageName) { + String getSuggestedVersion(String packageName) { final Map versions = {}; for (final Patch patch in _patches) { final Package? package = patch.compatiblePackages.firstWhereOrNull( diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index 2509eb9a..a70a51ff 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -104,8 +104,8 @@ class _AppSelectorViewState extends State { icon: app.icon, patchesCount: model.patchesCount(app.packageName), - recommendedVersion: - model.getRecommendedVersion( + suggestedVersion: + model.getSuggestedVersion( app.packageName, ), onTap: () { @@ -127,8 +127,8 @@ class _AppSelectorViewState extends State { (app) => NotInstalledAppItem( name: app, patchesCount: model.patchesCount(app), - recommendedVersion: - model.getRecommendedVersion(app), + suggestedVersion: + model.getSuggestedVersion(app), onTap: () { model.showDownloadToast(); }, diff --git a/lib/ui/views/app_selector/app_selector_viewmodel.dart b/lib/ui/views/app_selector/app_selector_viewmodel.dart index d40756e7..47e5249b 100644 --- a/lib/ui/views/app_selector/app_selector_viewmodel.dart +++ b/lib/ui/views/app_selector/app_selector_viewmodel.dart @@ -61,8 +61,8 @@ class AppSelectorViewModel extends BaseViewModel { return allApps; } - String getRecommendedVersion(String packageName) { - return _patcherAPI.getRecommendedVersion(packageName); + String getSuggestedVersion(String packageName) { + return _patcherAPI.getSuggestedVersion(packageName); } Future selectApp(ApplicationWithIcon application) async { diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index ebfa104e..316b2391 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -130,24 +130,24 @@ class PatcherViewModel extends BaseViewModel { return text; } - String getRecommendedVersionString(BuildContext context) { - String recommendedVersion = - _patcherAPI.getRecommendedVersion(selectedApp!.packageName); - if (recommendedVersion.isEmpty) { - recommendedVersion = FlutterI18n.translate( + String getSuggestedVersionString(BuildContext context) { + String suggestedVersion = + _patcherAPI.getSuggestedVersion(selectedApp!.packageName); + if (suggestedVersion.isEmpty) { + suggestedVersion = FlutterI18n.translate( context, 'appSelectorCard.anyVersion', ); } else { - recommendedVersion = 'v$recommendedVersion'; + suggestedVersion = 'v$suggestedVersion'; } return '${FlutterI18n.translate( context, 'appSelectorCard.currentVersion', )}: v${selectedApp!.version}\n${FlutterI18n.translate( context, - 'appSelectorCard.recommendedVersion', - )}: $recommendedVersion'; + 'appSelectorCard.suggestedVersion', + )}: $suggestedVersion'; } Future loadLastSelectedPatches() async { diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart index 5d15d92e..27bed6cd 100644 --- a/lib/ui/widgets/appSelectorView/installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart @@ -9,14 +9,14 @@ class InstalledAppItem extends StatefulWidget { required this.pkgName, required this.icon, required this.patchesCount, - required this.recommendedVersion, + required this.suggestedVersion, this.onTap, }) : super(key: key); final String name; final String pkgName; final Uint8List icon; final int patchesCount; - final String recommendedVersion; + final String suggestedVersion; final Function()? onTap; @override @@ -62,9 +62,9 @@ class _InstalledAppItemState extends State { Row( children: [ Text( - widget.recommendedVersion.isEmpty + widget.suggestedVersion.isEmpty ? 'All versions' - : widget.recommendedVersion, + : widget.suggestedVersion, ), const SizedBox(width: 4), Text( diff --git a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart index 807a31a1..f6062af9 100644 --- a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart @@ -6,12 +6,12 @@ class NotInstalledAppItem extends StatefulWidget { Key? key, required this.name, required this.patchesCount, - required this.recommendedVersion, + required this.suggestedVersion, this.onTap, }) : super(key: key); final String name; final int patchesCount; - final String recommendedVersion; + final String suggestedVersion; final Function()? onTap; @override @@ -59,9 +59,9 @@ class _NotInstalledAppItem extends State { Row( children: [ Text( - widget.recommendedVersion.isEmpty + widget.suggestedVersion.isEmpty ? 'All versions' - : widget.recommendedVersion, + : widget.suggestedVersion, ), const SizedBox(width: 4), Text( diff --git a/lib/ui/widgets/patcherView/app_selector_card.dart b/lib/ui/widgets/patcherView/app_selector_card.dart index 7c52d186..ceeb64e9 100644 --- a/lib/ui/widgets/patcherView/app_selector_card.dart +++ b/lib/ui/widgets/patcherView/app_selector_card.dart @@ -63,7 +63,7 @@ class AppSelectorCard extends StatelessWidget { const SizedBox(height: 4), Text( locator() - .getRecommendedVersionString(context), + .getSuggestedVersionString(context), ), ], ),