💄 Optimized leveling page

This commit is contained in:
LittleSheep 2025-07-02 22:17:25 +08:00
parent 53c2445ba9
commit 9fc9b87608
4 changed files with 78 additions and 86 deletions

View File

@ -46,7 +46,7 @@
"delete": "Delete", "delete": "Delete",
"deletePublisher": "Delete Publisher", "deletePublisher": "Delete Publisher",
"deletePublisherHint": "Are you sure to delete this publisher? This will also deleted all the post and collections under this publisher.", "deletePublisherHint": "Are you sure to delete this publisher? This will also deleted all the post and collections under this publisher.",
"somethingWentWrong": "Something went wrong...", "somethingWentWrong": "Something went wrong",
"deletePost": "Delete Post", "deletePost": "Delete Post",
"safetyReport": "Report", "safetyReport": "Report",
"safetyReportTitle": "Safety Report", "safetyReportTitle": "Safety Report",
@ -538,8 +538,6 @@
"paymentError": "Payment failed: {error}", "paymentError": "Payment failed: {error}",
"usePinInstead": "Use PIN Code", "usePinInstead": "Use PIN Code",
"levelProgress": "Level Progress", "levelProgress": "Level Progress",
"unlockedFeatures": "Unlocked Features",
"unlockedFeaturesDescription": "Features unlocked at your current level will be displayed here.",
"stellarMembership": "Stellar Membership", "stellarMembership": "Stellar Membership",
"upgradeYourPlan": "Upgrade Your Plan", "upgradeYourPlan": "Upgrade Your Plan",
"chooseYourPlan": "Choose Your Plan", "chooseYourPlan": "Choose Your Plan",
@ -549,18 +547,9 @@
"membershipTierNova": "Nova", "membershipTierNova": "Nova",
"membershipTierSupernova": "Supernova", "membershipTierSupernova": "Supernova",
"membershipTierUnknown": "Unknown", "membershipTierUnknown": "Unknown",
"membershipPriceStellar": "10 NS$ per month", "membershipPriceStellar": "1200 NSP per month, level 3+ required",
"membershipPriceNova": "20 NS$ per month", "membershipPriceNova": "2400 NSP per month, level 6+ required",
"membershipPriceSupernova": "30 NS$ per month", "membershipPriceSupernova": "3600 NSP per month, level 9+ required",
"membershipFeatureBasic": "Basic features",
"membershipFeaturePrioritySupport": "Priority support",
"membershipFeatureAdFree": "Ad-free experience",
"membershipFeatureAllPrimary": "All Primary features",
"membershipFeatureAdvancedCustomization": "Advanced customization",
"membershipFeatureEarlyAccess": "Early access",
"membershipFeatureAllNova": "All Nova features",
"membershipFeatureExclusiveContent": "Exclusive content",
"membershipFeatureVipSupport": "VIP support",
"membershipCurrentBadge": "CURRENT", "membershipCurrentBadge": "CURRENT",
"restorePurchase": "Restore Purchase", "restorePurchase": "Restore Purchase",
"restorePurchaseDescription": "Enter your payment provider and order ID to restore your purchase.", "restorePurchaseDescription": "Enter your payment provider and order ID to restore your purchase.",
@ -678,5 +667,9 @@
"learnMore": "Learn More", "learnMore": "Learn More",
"discoverWebArticles": "Articles from external sites", "discoverWebArticles": "Articles from external sites",
"webArticlesStand": "Article Stand", "webArticlesStand": "Article Stand",
"about": "About" "about": "About",
"membershipCancel": "Cancel Membership",
"membershipCancelConfirm": "Are you sure to cancel your membership?",
"membershipCancelHint": "Are you sure to cancel your membership? You will not be charged again. Your membership will remain active until the end of the current billing period. And you will not able to resubscribe until the end of the current subscription ends.",
"membershipCancelSuccess": "Your membership has been successfully canceled."
} }

View File

@ -46,7 +46,7 @@
"delete": "删除", "delete": "删除",
"deletePublisher": "删除发布者", "deletePublisher": "删除发布者",
"deletePublisherHint": "确定要删除此发布者吗?这也会删除此发布者下的所有帖子和收藏。", "deletePublisherHint": "确定要删除此发布者吗?这也会删除此发布者下的所有帖子和收藏。",
"somethingWentWrong": "发生了一些错误……", "somethingWentWrong": "发生了一些错误",
"deletePost": "删除帖子", "deletePost": "删除帖子",
"deletePostHint": "确定要删除这篇帖子吗?", "deletePostHint": "确定要删除这篇帖子吗?",
"copyLink": "复制链接", "copyLink": "复制链接",
@ -490,8 +490,6 @@
"paymentError": "付款失败: {error}", "paymentError": "付款失败: {error}",
"usePinInstead": "使用 PIN 码", "usePinInstead": "使用 PIN 码",
"levelProgress": "等级进度", "levelProgress": "等级进度",
"unlockedFeatures": "已解锁的功能",
"unlockedFeaturesDescription": "在您当前级别上解锁的功能将显示在这里。",
"stellarMembership": "恒星计划", "stellarMembership": "恒星计划",
"upgradeYourPlan": "升级您的计划", "upgradeYourPlan": "升级您的计划",
"chooseYourPlan": "选择你的方案", "chooseYourPlan": "选择你的方案",
@ -501,9 +499,9 @@
"membershipTierNova": "新星", "membershipTierNova": "新星",
"membershipTierSupernova": "超新星", "membershipTierSupernova": "超新星",
"membershipTierUnknown": "未知", "membershipTierUnknown": "未知",
"membershipPriceStellar": "每月 10 金点", "membershipPriceStellar": "每月 1200 源点,至少需要 3 级",
"membershipPriceNova": "每月 20 金点", "membershipPriceNova": "每月 2400 源点,至少需要 6 级",
"membershipPriceSupernova": "每月 30 金点", "membershipPriceSupernova": "每月 3600 源点,至少需要 9 级",
"membershipFeatureBasic": "基础功能", "membershipFeatureBasic": "基础功能",
"membershipFeaturePrioritySupport": "优先支持", "membershipFeaturePrioritySupport": "优先支持",
"membershipFeatureAdFree": "无广告", "membershipFeatureAdFree": "无广告",

View File

@ -1,4 +1,7 @@
import 'dart:io';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
@ -14,7 +17,9 @@ import 'package:island/widgets/alert.dart';
import 'package:island/widgets/app_scaffold.dart'; import 'package:island/widgets/app_scaffold.dart';
import 'package:island/widgets/payment/payment_overlay.dart'; import 'package:island/widgets/payment/payment_overlay.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:styled_widget/styled_widget.dart';
part 'leveling.g.dart'; part 'leveling.g.dart';
@ -84,35 +89,6 @@ class LevelingScreen extends HookConsumerWidget {
// Membership section // Membership section
_buildMembershipSection(context, ref, stellarSubscription), _buildMembershipSection(context, ref, stellarSubscription),
const Gap(16), const Gap(16),
// Unlocked features section
Container(
width: double.infinity,
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surfaceContainerHigh,
borderRadius: BorderRadius.circular(12),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'unlockedFeatures'.tr(),
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
const Gap(8),
Text(
'unlockedFeaturesDescription'.tr(),
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
],
),
),
], ],
), ),
), ),
@ -292,6 +268,31 @@ class LevelingScreen extends HookConsumerWidget {
) { ) {
final isActive = membership?.isActive ?? false; final isActive = membership?.isActive ?? false;
Future<void> membershipCancel() async {
if (!isActive || membership == null) return;
final confirm = await showConfirmAlert(
'membershipCancelHint'.tr(),
'membershipCancelConfirm'.tr(),
);
if (!confirm || !context.mounted) return;
try {
showLoadingModal(context);
final client = ref.watch(apiClientProvider);
await client.post('/subscriptions/${membership.identifier}/cancel');
ref.invalidate(accountStellarSubscriptionProvider);
ref.read(userInfoProvider.notifier).fetchUser();
if (context.mounted) {
hideLoadingModal(context);
showSnackBar('membershipCancelSuccess'.tr());
}
} catch (err) {
if (context.mounted) hideLoadingModal(context);
showErrorAlert(err);
}
}
return Container( return Container(
width: double.infinity, width: double.infinity,
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
@ -307,7 +308,7 @@ class LevelingScreen extends HookConsumerWidget {
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Row( Row(
children: [ children: [
@ -327,27 +328,42 @@ class LevelingScreen extends HookConsumerWidget {
if (isActive) ...[ if (isActive) ...[
_buildCurrentMembershipCard(context, membership!), _buildCurrentMembershipCard(context, membership!),
const Gap(16), const Gap(12),
FilledButton.icon(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all(
Theme.of(context).colorScheme.error,
),
foregroundColor: WidgetStateProperty.all(
Theme.of(context).colorScheme.onError,
),
),
onPressed: membershipCancel,
icon: const Icon(Symbols.cancel),
label: Text('membershipCancel'.tr()),
),
], ],
Text( if (!isActive) ...[
isActive ? 'upgradeYourPlan'.tr() : 'chooseYourPlan'.tr(), Text(
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600), 'chooseYourPlan'.tr(),
), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
const Gap(12), ),
const Gap(12),
_buildMembershipTiers(context, ref, membership), _buildMembershipTiers(context, ref, membership),
const Gap(12), ],
// Restore Purchase Button // Restore Purchase Button
OutlinedButton.icon( // As you know Apple platform need IAP
onPressed: () => _showRestorePurchaseSheet(context, ref), if (kIsWeb || !(Platform.isIOS || Platform.isMacOS))
icon: const Icon(Icons.restore), OutlinedButton.icon(
label: Text('restorePurchase'.tr()), onPressed: () => _showRestorePurchaseSheet(context, ref),
style: OutlinedButton.styleFrom( icon: const Icon(Icons.restore),
minimumSize: const Size(double.infinity, 48), label: Text('restorePurchase'.tr()),
), style: OutlinedButton.styleFrom(
), minimumSize: const Size(double.infinity, 48),
),
).padding(top: 12),
], ],
), ),
); );
@ -410,33 +426,18 @@ class LevelingScreen extends HookConsumerWidget {
'id': 'solian.stellar.primary', 'id': 'solian.stellar.primary',
'name': 'membershipTierStellar'.tr(), 'name': 'membershipTierStellar'.tr(),
'price': 'membershipPriceStellar'.tr(), 'price': 'membershipPriceStellar'.tr(),
'features': [
'membershipFeatureBasic'.tr(),
'membershipFeaturePrioritySupport'.tr(),
'membershipFeatureAdFree'.tr(),
],
'color': Colors.blue, 'color': Colors.blue,
}, },
{ {
'id': 'solian.stellar.nova', 'id': 'solian.stellar.nova',
'name': 'membershipTierNova'.tr(), 'name': 'membershipTierNova'.tr(),
'price': 'membershipPriceNova'.tr(), 'price': 'membershipPriceNova'.tr(),
'features': [ 'color': Colors.indigo,
'membershipFeatureAllPrimary'.tr(),
'membershipFeatureAdvancedCustomization'.tr(),
'membershipFeatureEarlyAccess'.tr(),
],
'color': Colors.purple,
}, },
{ {
'id': 'solian.stellar.supernova', 'id': 'solian.stellar.supernova',
'name': 'membershipTierSupernova'.tr(), 'name': 'membershipTierSupernova'.tr(),
'price': 'membershipPriceSupernova'.tr(), 'price': 'membershipPriceSupernova'.tr(),
'features': [
'membershipFeatureAllNova'.tr(),
'membershipFeatureExclusiveContent'.tr(),
'membershipFeatureVipSupport'.tr(),
],
'color': Colors.orange, 'color': Colors.orange,
}, },
]; ];

View File

@ -286,7 +286,7 @@ class _PaymentContentState extends ConsumerState<_PaymentContent> {
} }
String _formatCurrency(int amount, String currency) { String _formatCurrency(int amount, String currency) {
final value = amount / 100.0; final value = amount;
return '${value.toStringAsFixed(2)} $currency'; return '${value.toStringAsFixed(2)} $currency';
} }