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

Co-authored-by: Aunali321 <48486084+Aunali321@users.noreply.github.com>
This commit is contained in:
Aabed Khan 2023-06-12 05:50:02 +05:45 committed by GitHub
parent a8e019482f
commit 0079e74d77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 17 deletions

View File

@ -4,6 +4,8 @@
"updateButton": "Update", "updateButton": "Update",
"enabledLabel": "Enabled", "enabledLabel": "Enabled",
"disabledLabel": "Disabled", "disabledLabel": "Disabled",
"installed":"Installed: {version}",
"suggested":"Suggested: {version}",
"yesButton": "Yes", "yesButton": "Yes",
"noButton": "No", "noButton": "No",
"warning": "Warning", "warning": "Warning",

View File

@ -111,6 +111,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
model.getSuggestedVersion( model.getSuggestedVersion(
app.packageName, app.packageName,
), ),
installedVersion: app.versionName!,
onTap: () => model.canSelectInstalled(context, app.packageName), onTap: () => model.canSelectInstalled(context, app.packageName),
), ),
) )

View File

@ -1,6 +1,7 @@
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
import 'package:flutter_i18n/flutter_i18n.dart';
class InstalledAppItem extends StatefulWidget { class InstalledAppItem extends StatefulWidget {
const InstalledAppItem({ const InstalledAppItem({
@ -10,6 +11,7 @@ class InstalledAppItem extends StatefulWidget {
required this.icon, required this.icon,
required this.patchesCount, required this.patchesCount,
required this.suggestedVersion, required this.suggestedVersion,
required this.installedVersion,
this.onTap, this.onTap,
}) : super(key: key); }) : super(key: key);
final String name; final String name;
@ -17,6 +19,7 @@ class InstalledAppItem extends StatefulWidget {
final Uint8List icon; final Uint8List icon;
final int patchesCount; final int patchesCount;
final String suggestedVersion; final String suggestedVersion;
final String installedVersion;
final Function()? onTap; final Function()? onTap;
@override @override
@ -48,6 +51,8 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row(
children: [
Text( Text(
widget.name, widget.name,
maxLines: 2, maxLines: 2,
@ -57,14 +62,24 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
const SizedBox(height: 4), const SizedBox(width: 4),
I18nText(widget.installedVersion.isEmpty
? 'All versions'
: 'v${widget.installedVersion}'),
],
),
Text(widget.pkgName), Text(widget.pkgName),
Row( Row(
children: [ children: [
Text( I18nText(
widget.suggestedVersion.isEmpty FlutterI18n.translate(
context,
'suggested',
translationParams: {
'version': widget.suggestedVersion.isEmpty
? 'All versions' ? 'All versions'
: widget.suggestedVersion, : 'v${widget.suggestedVersion}'
},
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(

View File

@ -59,9 +59,7 @@ class _NotInstalledAppItem extends State<NotInstalledAppItem> {
Row( Row(
children: [ children: [
Text( Text(
widget.suggestedVersion.isEmpty 'Suggested: ${widget.suggestedVersion.isEmpty ? 'All versions' : 'v${widget.suggestedVersion}'}',
? 'All versions'
: widget.suggestedVersion,
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Text( Text(