feat: clarify suggested version in app list (#934)

Co-authored-by: Aunali321 <48486084+Aunali321@users.noreply.github.com>
ReVanced · Jun 12, 2023 · 0079e74 · 0079e74
1 parent a8e0194
commit 0079e74
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git 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
@@ -111,6 +111,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                           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
@@ -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,13 +11,15 @@ class InstalledAppItem extends StatefulWidget {
     required this.icon,
     required this.patchesCount,
     required this.suggestedVersion,
+    required this.installedVersion,
     this.onTap,
   }) : super(key: key);
   final String name;
   final String pkgName;
   final Uint8List icon;
   final int patchesCount;
   final String suggestedVersion;
+  final String installedVersion;
   final Function()? onTap;
 
   @override
@@ -48,25 +51,37 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  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
@@ -59,9 +59,7 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
                   Row(
                     children: [
                       Text(
-                        widget.suggestedVersion.isEmpty
-                            ? 'All versions'
-                            : widget.suggestedVersion,
+                        'Suggested: ${widget.suggestedVersion.isEmpty ? 'All versions' : 'v${widget.suggestedVersion}'}',
                       ),
                       const SizedBox(width: 4),
                       Text(