vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 2 Wiki Activity

Add detailed subscription info

Browse Source
This commit is contained in:
problematicconsumer
2024-02-18 14:34:54 +03:30
parent 5c31574cb3
commit c402a9e292
2 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/translations/strings_en.i18n.json
View File

@@ -56,7 +56,11 @@
"remainingDuration": "${duration} Days Remaining", "remainingDuration": "${duration} Days Remaining",
"remainingTrafficSemanticLabel": "${consumed} of ${total} traffic consumed.", "remainingTrafficSemanticLabel": "${consumed} of ${total} traffic consumed.",
"expired": "Expired", "expired": "Expired",
"noTraffic": "Out of Quota" "noTraffic": "Out of Quota",
"upload": "Upload",
"download": "Download",
"total": "Total Traffic",
"expireDate": "Expire Date"
}, },
"sortBy": { "sortBy": {
"lastUpdate": "Recently updated", "lastUpdate": "Recently updated",

70
lib/features/profile/details/profile_details_page.dart
View File

@@ -1,6 +1,7 @@
import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:fluentui_system_icons/fluentui_system_icons.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fpdart/fpdart.dart'; import 'package:fpdart/fpdart.dart';
import 'package:gap/gap.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/model/failures.dart'; import 'package:hiddify/core/model/failures.dart';
@@ -203,12 +204,69 @@ class ProfileDetailsPage extends HookConsumerWidget with PresLogger {
}, },
), ),
], ],
if (state.isEditing) if (state.isEditing) ...[
ListTile( ListTile(
title: Text(t.profile.detailsForm.lastUpdate), title: Text(t.profile.detailsForm.lastUpdate),
leading:
const Icon(FluentIcons.history_24_regular),
subtitle: Text(state.profile.lastUpdate.format()), subtitle: Text(state.profile.lastUpdate.format()),
dense: true, dense: true,
), ),
],
if (state.profile
case RemoteProfileEntity(:final subInfo?)) ...[
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 18,
vertical: 8,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
style:
Theme.of(context).textTheme.bodySmall,
TextSpan(
children: [
_buildSubProp(
FluentIcons.arrow_upload_16_regular,
subInfo.upload.size(),
t.profile.subscription.upload,
),
const TextSpan(text: " "),
_buildSubProp(
FluentIcons.arrow_download_16_regular,
subInfo.download.size(),
t.profile.subscription.download,
),
const TextSpan(text: " "),
_buildSubProp(
FluentIcons
.arrow_bidirectional_up_down_16_regular,
subInfo.total.size(),
t.profile.subscription.total,
),
],
),
),
const Gap(12),
Text.rich(
style:
Theme.of(context).textTheme.bodySmall,
TextSpan(
children: [
_buildSubProp(
FluentIcons.clock_dismiss_20_regular,
subInfo.expire.format(),
t.profile.subscription.expireDate,
),
],
),
),
],
),
),
],
], ],
), ),
), ),
@@ -283,4 +341,14 @@ class ProfileDetailsPage extends HookConsumerWidget with PresLogger {
return const Scaffold(); return const Scaffold();
} }
} }
InlineSpan _buildSubProp(IconData icon, String text, String semanticLabel) {
return TextSpan(
children: [
WidgetSpan(child: Icon(icon, size: 16, semanticLabel: semanticLabel)),
const TextSpan(text: " "),
TextSpan(text: text),
],
);
}
} }