Compare commits

..

2 Commits

Author SHA1 Message Date
abd89b538c Restore purchase 2025-06-23 02:45:41 +08:00
9367a515f4 💄 Optimized desktop experience 2025-06-23 02:23:04 +08:00
13 changed files with 474 additions and 282 deletions

View File

@ -513,5 +513,12 @@
"membershipFeatureAllNova": "All Nova features", "membershipFeatureAllNova": "All Nova features",
"membershipFeatureExclusiveContent": "Exclusive content", "membershipFeatureExclusiveContent": "Exclusive content",
"membershipFeatureVipSupport": "VIP support", "membershipFeatureVipSupport": "VIP support",
"membershipCurrentBadge": "CURRENT" "membershipCurrentBadge": "CURRENT",
"restorePurchase": "Restore Purchase",
"restorePurchaseDescription": "Enter your payment provider and order ID to restore your purchase.",
"provider": "Provider",
"selectProvider": "Select a provider",
"orderId": "Order ID",
"enterOrderId": "Enter your order ID",
"restore": "Restore"
} }

View File

@ -10,6 +10,7 @@ import 'package:island/pods/userinfo.dart';
import 'package:island/services/responsive.dart'; import 'package:island/services/responsive.dart';
import 'package:island/services/time.dart'; import 'package:island/services/time.dart';
import 'package:island/widgets/account/leveling_progress.dart'; import 'package:island/widgets/account/leveling_progress.dart';
import 'package:island/widgets/account/restore_purchase_sheet.dart';
import 'package:island/widgets/alert.dart'; 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';
@ -54,6 +55,9 @@ class LevelingScreen extends HookConsumerWidget {
appBar: AppBar(title: Text('levelingProgress'.tr())), appBar: AppBar(title: Text('levelingProgress'.tr())),
body: SingleChildScrollView( body: SingleChildScrollView(
padding: getTabbedPadding(context, horizontal: 20, vertical: 20), padding: getTabbedPadding(context, horizontal: 20, vertical: 20),
child: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 480),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
@ -68,9 +72,9 @@ class LevelingScreen extends HookConsumerWidget {
// Level Stairs Graph // Level Stairs Graph
Text( Text(
'levelProgress'.tr(), 'levelProgress'.tr(),
style: Theme.of( style: Theme.of(context).textTheme.headlineSmall?.copyWith(
context, fontWeight: FontWeight.bold,
).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold), ),
), ),
const Gap(16), const Gap(16),
@ -96,7 +100,10 @@ class LevelingScreen extends HookConsumerWidget {
children: [ children: [
Text( Text(
'unlockedFeatures'.tr(), 'unlockedFeatures'.tr(),
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
), ),
const Gap(8), const Gap(8),
Text( Text(
@ -111,6 +118,8 @@ class LevelingScreen extends HookConsumerWidget {
], ],
), ),
), ),
),
),
); );
} }
@ -330,6 +339,17 @@ class LevelingScreen extends HookConsumerWidget {
const Gap(12), const Gap(12),
_buildMembershipTiers(context, ref, membership), _buildMembershipTiers(context, ref, membership),
const Gap(12),
// Restore Purchase Button
OutlinedButton.icon(
onPressed: () => _showRestorePurchaseSheet(context, ref),
icon: const Icon(Icons.restore),
label: Text('restorePurchase'.tr()),
style: OutlinedButton.styleFrom(
minimumSize: const Size(double.infinity, 48),
),
),
], ],
), ),
); );
@ -565,6 +585,16 @@ class LevelingScreen extends HookConsumerWidget {
} }
} }
Future<void> _showRestorePurchaseSheet(
BuildContext context,
WidgetRef ref,
) async {
await showModalBottomSheet(
context: context,
builder: (context) => const RestorePurchaseSheet(),
);
}
Future<void> _purchaseMembership( Future<void> _purchaseMembership(
BuildContext context, BuildContext context,
WidgetRef ref, WidgetRef ref,

View File

@ -470,7 +470,7 @@ class AccountSettingsScreen extends HookConsumerWidget {
), ),
), ),
], ],
).padding(horizontal: 16); );
} else { } else {
// Single column layout for narrow screens // Single column layout for narrow screens
return Column( return Column(

View File

@ -85,6 +85,7 @@ class AccountConnectionSheet extends HookConsumerWidget {
return SheetScaffold( return SheetScaffold(
titleText: 'accountConnections'.tr(), titleText: 'accountConnections'.tr(),
child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
@ -132,6 +133,7 @@ class AccountConnectionSheet extends HookConsumerWidget {
), ),
], ],
), ),
),
); );
} }
} }
@ -213,6 +215,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
return SheetScaffold( return SheetScaffold(
titleText: 'accountConnectionAdd'.tr(), titleText: 'accountConnectionAdd'.tr(),
child: SingleChildScrollView(
child: Column( child: Column(
spacing: 16, spacing: 16,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
@ -233,7 +236,9 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
value: provider, value: provider,
child: Row( child: Row(
children: [Text(getLocalizedProviderName(provider)).tr()], children: [
Text(getLocalizedProviderName(provider)).tr(),
],
), ),
); );
}).toList(), }).toList(),
@ -259,6 +264,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget {
), ),
], ],
).padding(horizontal: 20, vertical: 24), ).padding(horizontal: 20, vertical: 24),
),
); );
} }
} }

View File

@ -213,6 +213,7 @@ class _OidcScreenState extends ConsumerState<OidcScreen> {
} }
}, },
), ),
const Gap(8),
], ],
), ),
), ),

View File

@ -123,6 +123,7 @@ class CreatorHubScreen extends HookConsumerWidget {
); );
return AppScaffold( return AppScaffold(
noBackground: false,
appBar: AppBar( appBar: AppBar(
leading: !isWide ? const PageBackButton() : null, leading: !isWide ? const PageBackButton() : null,
title: Text('creatorHub').tr(), title: Text('creatorHub').tr(),

View File

@ -96,6 +96,7 @@ class ExploreScreen extends HookConsumerWidget {
Tab( Tab(
child: Text( child: Text(
'explore'.tr(), 'explore'.tr(),
textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).appBarTheme.foregroundColor!, color: Theme.of(context).appBarTheme.foregroundColor!,
), ),
@ -104,6 +105,7 @@ class ExploreScreen extends HookConsumerWidget {
Tab( Tab(
child: Text( child: Text(
'exploreFilterSubscriptions'.tr(), 'exploreFilterSubscriptions'.tr(),
textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).appBarTheme.foregroundColor!, color: Theme.of(context).appBarTheme.foregroundColor!,
), ),
@ -112,6 +114,7 @@ class ExploreScreen extends HookConsumerWidget {
Tab( Tab(
child: Text( child: Text(
'exploreFilterFriends'.tr(), 'exploreFilterFriends'.tr(),
textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).appBarTheme.foregroundColor!, color: Theme.of(context).appBarTheme.foregroundColor!,
), ),

View File

@ -191,7 +191,8 @@ class PostComposeScreen extends HookConsumerWidget {
progress: progressMap[idx], progress: progressMap[idx],
onRequestUpload: onRequestUpload:
() => ComposeLogic.uploadAttachment(ref, state, idx), () => ComposeLogic.uploadAttachment(ref, state, idx),
onDelete: () => ComposeLogic.deleteAttachment(ref, state, idx), onDelete:
() => ComposeLogic.deleteAttachment(ref, state, idx),
onMove: (delta) { onMove: (delta) {
state.attachments.value = ComposeLogic.moveAttachment( state.attachments.value = ComposeLogic.moveAttachment(
state.attachments.value, state.attachments.value,
@ -209,12 +210,9 @@ class PostComposeScreen extends HookConsumerWidget {
// Build UI // Build UI
return AppScaffold( return AppScaffold(
noBackground: false,
appBar: AppBar( appBar: AppBar(
leading: const PageBackButton(), leading: const PageBackButton(),
title:
isWideScreen(context)
? Text(originalPost != null ? 'editPost'.tr() : 'newPost'.tr())
: null,
actions: [ actions: [
IconButton( IconButton(
icon: const Icon(Symbols.settings), icon: const Icon(Symbols.settings),
@ -272,6 +270,8 @@ class PostComposeScreen extends HookConsumerWidget {
// Main content area // Main content area
Expanded( Expanded(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 480),
child: Row( child: Row(
spacing: 12, spacing: 12,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -342,7 +342,9 @@ class PostComposeScreen extends HookConsumerWidget {
ValueListenableBuilder<List<UniversalFile>>( ValueListenableBuilder<List<UniversalFile>>(
valueListenable: state.attachments, valueListenable: state.attachments,
builder: (context, attachments, _) { builder: (context, attachments, _) {
if (attachments.isEmpty) return const SizedBox.shrink(); if (attachments.isEmpty) {
return const SizedBox.shrink();
}
return LayoutBuilder( return LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
final isWide = isWideScreen(context); final isWide = isWideScreen(context);
@ -359,6 +361,7 @@ class PostComposeScreen extends HookConsumerWidget {
), ),
], ],
).padding(horizontal: 16), ).padding(horizontal: 16),
).alignment(Alignment.topCenter),
), ),
// Bottom toolbar // Bottom toolbar
@ -427,10 +430,7 @@ class PostComposeScreen extends HookConsumerWidget {
children: [ children: [
Row( Row(
children: [ children: [
Icon( Icon(Symbols.reply, size: 16),
Symbols.reply,
size: 16,
),
const Gap(4), const Gap(4),
Text( Text(
'postReplyingTo'.tr(), 'postReplyingTo'.tr(),
@ -452,10 +452,7 @@ class PostComposeScreen extends HookConsumerWidget {
children: [ children: [
Row( Row(
children: [ children: [
Icon( Icon(Symbols.forward, size: 16),
Symbols.forward,
size: 16,
),
const Gap(4), const Gap(4),
Text( Text(
'postForwardingTo'.tr(), 'postForwardingTo'.tr(),
@ -482,10 +479,7 @@ class PostComposeScreen extends HookConsumerWidget {
children: [ children: [
Row( Row(
children: [ children: [
Icon( Icon(Symbols.reply, size: 16),
Symbols.reply,
size: 16,
),
const Gap(4), const Gap(4),
Text( Text(
'postReplyingTo'.tr(), 'postReplyingTo'.tr(),
@ -510,10 +504,7 @@ class PostComposeScreen extends HookConsumerWidget {
children: [ children: [
Row( Row(
children: [ children: [
Icon( Icon(Symbols.forward, size: 16),
Symbols.forward,
size: 16,
),
const Gap(4), const Gap(4),
Text( Text(
'postForwardingTo'.tr(), 'postForwardingTo'.tr(),
@ -537,14 +528,18 @@ class PostComposeScreen extends HookConsumerWidget {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
builder: (context) => DraggableScrollableSheet( builder:
(context) => DraggableScrollableSheet(
initialChildSize: 0.7, initialChildSize: 0.7,
maxChildSize: 0.9, maxChildSize: 0.9,
minChildSize: 0.5, minChildSize: 0.5,
builder: (context, scrollController) => Container( builder:
(context, scrollController) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
borderRadius: const BorderRadius.vertical(top: Radius.circular(16)), borderRadius: const BorderRadius.vertical(
top: Radius.circular(16),
),
), ),
child: Column( child: Column(
children: [ children: [

View File

@ -525,7 +525,7 @@ class SettingsScreen extends HookConsumerWidget {
), ),
), ),
], ],
).padding(horizontal: 16); );
} else { } else {
// Single column layout for narrow screens // Single column layout for narrow screens
return Column( return Column(

View File

@ -135,7 +135,7 @@ class TabbedFabLocation extends FloatingActionButtonLocation {
final double fabX = final double fabX =
scaffoldGeometry.scaffoldSize.width - scaffoldGeometry.scaffoldSize.width -
scaffoldGeometry.floatingActionButtonSize.width - scaffoldGeometry.floatingActionButtonSize.width -
16.0 - 16 -
safeAreaPadding.right; safeAreaPadding.right;
// Use safe area bottom padding + navigation bar height (typically 80px) // Use safe area bottom padding + navigation bar height (typically 80px)
@ -144,7 +144,7 @@ class TabbedFabLocation extends FloatingActionButtonLocation {
scaffoldGeometry.floatingActionButtonSize.height - scaffoldGeometry.floatingActionButtonSize.height -
scaffoldGeometry.bottomSheetSize.height - scaffoldGeometry.bottomSheetSize.height -
safeAreaPadding.bottom - safeAreaPadding.bottom -
80.0 + (isWideScreen(context) ? 24 : 80) +
16; 16;
return Offset(fabX, fabY); return Offset(fabX, fabY);

View File

@ -0,0 +1,142 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/pods/network.dart';
import 'package:island/screens/account/me/settings_connections.dart';
import 'package:island/services/responsive.dart';
import 'package:island/widgets/alert.dart';
import 'package:island/widgets/content/sheet.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:styled_widget/styled_widget.dart';
class RestorePurchaseSheet extends HookConsumerWidget {
const RestorePurchaseSheet({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final selectedProvider = useState<String?>(null);
final orderIdController = useTextEditingController();
final isLoading = useState(false);
final providers = ['afdian'];
Future<void> restorePurchase() async {
if (selectedProvider.value == null ||
orderIdController.text.trim().isEmpty) {
showErrorAlert('Please fill in all fields');
return;
}
isLoading.value = true;
try {
final client = ref.read(apiClientProvider);
await client.post(
'/wallet/subscriptions/order/restore/${selectedProvider.value!}',
data: {'order_id': orderIdController.text.trim()},
);
if (context.mounted) {
Navigator.pop(context);
showSnackBar(context, 'Purchase restored successfully!');
}
} catch (err) {
showErrorAlert(err);
} finally {
isLoading.value = false;
}
}
return SheetScaffold(
titleText: 'restorePurchase'.tr(),
child: SingleChildScrollView(
padding: getTabbedPadding(context),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'restorePurchaseDescription'.tr(),
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const Gap(24),
// Provider Selection
Text(
'provider'.tr(),
style: Theme.of(context).textTheme.titleMedium,
),
const Gap(8),
Container(
decoration: BoxDecoration(
border: Border.all(
color: Theme.of(context).colorScheme.outline,
),
borderRadius: BorderRadius.circular(8),
),
child: DropdownButtonHideUnderline(
child: DropdownButton<String>(
value: selectedProvider.value,
hint: Text('selectProvider'.tr()),
isExpanded: true,
padding: const EdgeInsets.symmetric(horizontal: 12),
items:
providers.map((provider) {
return DropdownMenuItem<String>(
value: provider,
child: Row(
children: [
getProviderIcon(
provider,
size: 20,
color: Theme.of(context).colorScheme.onSurface,
),
const Gap(12),
Text(getLocalizedProviderName(provider)),
],
),
);
}).toList(),
onChanged: (value) {
selectedProvider.value = value;
},
),
),
),
const Gap(16),
// Order ID Input
Text(
'orderId'.tr(),
style: Theme.of(context).textTheme.titleMedium,
),
const Gap(8),
TextField(
controller: orderIdController,
decoration: InputDecoration(
hintText: 'enterOrderId'.tr(),
border: const OutlineInputBorder(),
),
),
const Gap(24),
// Restore Button
FilledButton(
onPressed: isLoading.value ? null : restorePurchase,
child:
isLoading.value
? const SizedBox(
height: 20,
width: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: Text('restore'.tr()),
),
const Gap(16),
],
).padding(all: 16),
),
);
}
}

View File

@ -88,14 +88,14 @@ class PostItemCreator extends HookConsumerWidget {
); );
}, },
child: Material( child: Material(
color: backgroundColor, color: Colors.transparent,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
elevation: 1, elevation: 1,
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
onTap: () { onTap: () {
if (isOpenable) { if (isOpenable) {
context.router.push(PostDetailRoute(id: item.id)); context.router.pushPath('/posts/${item.id}');
} }
}, },
child: Padding( child: Padding(

View File

@ -94,6 +94,9 @@ PODS:
- flutter_webrtc - flutter_webrtc
- FlutterMacOS - FlutterMacOS
- WebRTC-SDK (= 125.6422.07) - WebRTC-SDK (= 125.6422.07)
- local_auth_darwin (0.0.1):
- Flutter
- FlutterMacOS
- media_kit_libs_macos_video (1.0.4): - media_kit_libs_macos_video (1.0.4):
- FlutterMacOS - FlutterMacOS
- media_kit_video (0.0.1): - media_kit_video (0.0.1):
@ -173,6 +176,7 @@ DEPENDENCIES:
- gal (from `Flutter/ephemeral/.symlinks/plugins/gal/darwin`) - gal (from `Flutter/ephemeral/.symlinks/plugins/gal/darwin`)
- irondash_engine_context (from `Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos`) - irondash_engine_context (from `Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos`)
- livekit_client (from `Flutter/ephemeral/.symlinks/plugins/livekit_client/macos`) - livekit_client (from `Flutter/ephemeral/.symlinks/plugins/livekit_client/macos`)
- local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
- media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`) - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`)
- media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`) - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`)
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
@ -239,6 +243,8 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos :path: Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos
livekit_client: livekit_client:
:path: Flutter/ephemeral/.symlinks/plugins/livekit_client/macos :path: Flutter/ephemeral/.symlinks/plugins/livekit_client/macos
local_auth_darwin:
:path: Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin
media_kit_libs_macos_video: media_kit_libs_macos_video:
:path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos
media_kit_video: media_kit_video:
@ -293,6 +299,7 @@ SPEC CHECKSUMS:
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
livekit_client: 6a35243df3da61750c98e266e02dedcf5d25c888 livekit_client: 6a35243df3da61750c98e266e02dedcf5d25c888
local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
media_kit_libs_macos_video: 85a23e549b5f480e72cae3e5634b5514bc692f65 media_kit_libs_macos_video: 85a23e549b5f480e72cae3e5634b5514bc692f65
media_kit_video: fa6564e3799a0a28bff39442334817088b7ca758 media_kit_video: fa6564e3799a0a28bff39442334817088b7ca758
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275