mirror of
https://github.com/revanced/revanced-manager.git
synced 2025-05-03 15:24:25 +02:00
feat: clarify suggested version in app list (#934)
Co-authored-by: Aunali321 <48486084+Aunali321@users.noreply.github.com>
This commit is contained in:
parent
a8e019482f
commit
0079e74d77
@ -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",
|
||||||
|
@ -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),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -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,25 +51,37 @@ class _InstalledAppItemState extends State<InstalledAppItem> {
|
|||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: <Widget>[
|
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(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
widget.suggestedVersion.isEmpty
|
widget.name,
|
||||||
? 'All versions'
|
maxLines: 2,
|
||||||
: widget.suggestedVersion,
|
overflow: TextOverflow.visible,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontSize: 16,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(width: 4),
|
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(
|
Text(
|
||||||
widget.patchesCount == 1
|
widget.patchesCount == 1
|
||||||
? '• ${widget.patchesCount} patch'
|
? '• ${widget.patchesCount} patch'
|
||||||
|
@ -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(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user