Compare commits
	
		
			8 Commits
		
	
	
		
			2ea9f5e907
			...
			3.0.0+111
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 552b4b2572 | |||
| 594ac39e3d | |||
| 23321171f3 | |||
| ee72d79c93 | |||
| a20c2598fc | |||
| 2eba871a6d | |||
| 46919dec31 | |||
| 9dd6cffe0c | 
| @@ -375,7 +375,9 @@ | ||||
|   "postContent": "Content", | ||||
|   "postSettings": "Settings", | ||||
|   "postPublisherUnselected": "Publisher Unspecified", | ||||
|   "postVisibility": "Visibility", | ||||
|   "postType": "Post Type", | ||||
|   "articleAttachmentHint": "Attachments must be uploaded and inserted into the article body to be visible.", | ||||
|   "postVisibility": "Post Visibility", | ||||
|   "postVisibilityPublic": "Public", | ||||
|   "postVisibilityFriends": "Friends Only", | ||||
|   "postVisibilityUnlisted": "Unlisted", | ||||
| @@ -686,8 +688,9 @@ | ||||
|   "aboutScreenDeveloperSectionTitle": "Developer", | ||||
|   "aboutScreenContactUsTitle": "Contact Us", | ||||
|   "aboutScreenLicenseTitle": "License", | ||||
|   "aboutScreenLicenseContent": "All copyright reserved © {} Solsynth\nOpen-sourced under license GNU AGPL v3.0", | ||||
|   "aboutScreenCopyright": "© {} {}. All rights reserved.", | ||||
|   "aboutScreenLicenseContent": "GNU Affero General Public License v3.0", | ||||
|   "aboutScreenCopyright": "All rights reserved © Solsynth {}", | ||||
|   "aboutScreenMadeWith": "Made with ❤︎️ by Solar Network Team", | ||||
|   "aboutScreenFailedToLoadPackageInfo": "Failed to load package info: {error}", | ||||
|   "copiedToClipboard": "Copied to clipboard", | ||||
|   "copyToClipboardTooltip": "Copy to clipboard", | ||||
|   | ||||
| @@ -512,5 +512,33 @@ | ||||
|   "orderId": "订单 ID", | ||||
|   "enterOrderId": "输入您的订单 ID", | ||||
|   "restore": "恢复", | ||||
|   "keyboardShortcuts": "键盘快捷键" | ||||
|   "keyboardShortcuts": "键盘快捷键", | ||||
|   "about": "关于", | ||||
|   "membershipCancel": "取消会员订阅", | ||||
|   "membershipCancelConfirm": "您确定要取消您的会员订阅?", | ||||
|   "membershipCancelHint": "您确定要取消您的会员订阅吗?您将不会再被收费。您的会员资格将在当前计费周期结束前保持有效。并且您在当前订阅结束之前无法重新订阅。", | ||||
|   "membershipCancelSuccess": "您的会员订阅已成功取消。", | ||||
|   "aboutScreenTitle": "关于", | ||||
|   "aboutScreenVersionInfo": "版本 {} ({})", | ||||
|   "aboutScreenAppInfoSectionTitle": "应用信息", | ||||
|   "aboutScreenPackageNameLabel": "包名", | ||||
|   "aboutScreenVersionLabel": "版本", | ||||
|   "aboutScreenBuildNumberLabel": "构建编号", | ||||
|   "aboutScreenLinksSectionTitle": "链接", | ||||
|   "aboutScreenPrivacyPolicyTitle": "隐私政策", | ||||
|   "aboutScreenTermsOfServiceTitle": "服务条款", | ||||
|   "aboutScreenOpenSourceLicensesTitle": "开源许可证", | ||||
|   "aboutScreenDeveloperSectionTitle": "开发者", | ||||
|   "aboutScreenContactUsTitle": "联系我们", | ||||
|   "aboutScreenLicenseTitle": "许可证", | ||||
|   "aboutScreenLicenseContent": "GNU Affero General Public License v3.0", | ||||
|   "aboutScreenCopyright": "版权所有 © 索尔辛茨 {}", | ||||
|   "aboutScreenMadeWith": "由 Solar Network Team 用 ❤︎️ 制作", | ||||
|   "aboutScreenFailedToLoadPackageInfo": "加载包信息失败:{error}", | ||||
|   "copiedToClipboard": "已复制到剪贴板", | ||||
|   "copyToClipboardTooltip": "复制到剪贴板", | ||||
|   "postForwardingTo": "转发给", | ||||
|   "postReplyingTo": "回复给", | ||||
|   "postEditing": "您正在编辑现有帖子", | ||||
|   "postArticle": "文章" | ||||
| } | ||||
|   | ||||
| @@ -221,7 +221,7 @@ class IslandApp extends HookConsumerWidget { | ||||
|       Future(() { | ||||
|         userNotifier.fetchUser().then((_) { | ||||
|           final user = ref.watch(userInfoProvider); | ||||
|           if (user.hasValue) { | ||||
|           if (user.value != null) { | ||||
|             final apiClient = ref.read(apiClientProvider); | ||||
|             subscribePushNotification(apiClient); | ||||
|             final wsNotifier = ref.read(websocketStateProvider.notifier); | ||||
|   | ||||
| @@ -18,8 +18,13 @@ class UserInfoNotifier extends StateNotifier<AsyncValue<SnAccount?>> { | ||||
|       final user = SnAccount.fromJson(response.data); | ||||
|       state = AsyncValue.data(user); | ||||
|     } catch (error, stackTrace) { | ||||
|       log("[UserInfo] Failed to fetch user info: $error"); | ||||
|       state = AsyncValue.error(error, stackTrace); | ||||
|       log( | ||||
|         "[UserInfo] Failed to fetch user info...", | ||||
|         name: 'UserInfoNotifier', | ||||
|         error: error, | ||||
|         stackTrace: stackTrace, | ||||
|       ); | ||||
|       state = AsyncValue.data(null); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   | ||||
| @@ -1,24 +1,34 @@ | ||||
| import 'package:device_info_plus/device_info_plus.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter/services.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/pods/network.dart'; | ||||
| import 'package:island/services/notify.dart'; | ||||
| import 'package:island/services/udid.native.dart'; | ||||
| import 'package:island/widgets/alert.dart'; | ||||
| import 'package:material_symbols_icons/symbols.dart'; | ||||
| import 'package:package_info_plus/package_info_plus.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:url_launcher/url_launcher.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
|  | ||||
| class AboutScreen extends StatefulWidget { | ||||
| class AboutScreen extends ConsumerStatefulWidget { | ||||
|   const AboutScreen({super.key}); | ||||
|  | ||||
|   @override | ||||
|   State<AboutScreen> createState() => _AboutScreenState(); | ||||
|   ConsumerState<AboutScreen> createState() => _AboutScreenState(); | ||||
| } | ||||
|  | ||||
| class _AboutScreenState extends State<AboutScreen> { | ||||
| class _AboutScreenState extends ConsumerState<AboutScreen> { | ||||
|   PackageInfo _packageInfo = PackageInfo( | ||||
|     appName: 'Solian', | ||||
|     packageName: 'dev.solsynth.solian', | ||||
|     version: '1.0.0', | ||||
|     buildNumber: '1', | ||||
|   ); | ||||
|   BaseDeviceInfo? _deviceInfo; | ||||
|   String? _deviceUdid; | ||||
|   bool _isLoading = true; | ||||
|   String? _errorMessage; | ||||
|  | ||||
| @@ -26,6 +36,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|   void initState() { | ||||
|     super.initState(); | ||||
|     _initPackageInfo(); | ||||
|     _initDeviceInfo(); | ||||
|   } | ||||
|  | ||||
|   Future<void> _initPackageInfo() async { | ||||
| @@ -49,6 +60,25 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   Future<void> _initDeviceInfo() async { | ||||
|     try { | ||||
|       final deviceInfoPlugin = DeviceInfoPlugin(); | ||||
|       _deviceInfo = await deviceInfoPlugin.deviceInfo; | ||||
|       _deviceUdid = await getUdid(); | ||||
|       if (mounted) { | ||||
|         setState(() {}); | ||||
|       } | ||||
|     } catch (e) { | ||||
|       if (mounted) { | ||||
|         setState(() { | ||||
|           _errorMessage = 'aboutScreenFailedToLoadDeviceInfo'.tr( | ||||
|             args: [e.toString()], | ||||
|           ); | ||||
|         }); | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   Future<void> _launchURL(String url) async { | ||||
|     final uri = Uri.parse(url); | ||||
|     if (await canLaunchUrl(uri)) { | ||||
| @@ -108,25 +138,66 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                       children: [ | ||||
|                         _buildInfoItem( | ||||
|                           context, | ||||
|                           icon: Icons.info_outline, | ||||
|                           icon: Symbols.info, | ||||
|                           label: 'aboutScreenPackageNameLabel'.tr(), | ||||
|                           value: _packageInfo.packageName, | ||||
|                         ), | ||||
|                         _buildInfoItem( | ||||
|                           context, | ||||
|                           icon: Icons.update, | ||||
|                           icon: Symbols.update, | ||||
|                           label: 'aboutScreenVersionLabel'.tr(), | ||||
|                           value: _packageInfo.version, | ||||
|                         ), | ||||
|                         _buildInfoItem( | ||||
|                           context, | ||||
|                           icon: Icons.build, | ||||
|                           icon: Symbols.build, | ||||
|                           label: 'aboutScreenBuildNumberLabel'.tr(), | ||||
|                           value: _packageInfo.buildNumber, | ||||
|                         ), | ||||
|                       ], | ||||
|                     ), | ||||
|  | ||||
|                     if (_deviceInfo != null) const SizedBox(height: 16), | ||||
|  | ||||
|                     if (_deviceInfo != null) | ||||
|                       _buildSection( | ||||
|                         context, | ||||
|                         title: 'Device Information', | ||||
|                         children: [ | ||||
|                           _buildInfoItem( | ||||
|                             context, | ||||
|                             icon: Symbols.label, | ||||
|                             label: 'Device Name', | ||||
|                             value: _deviceInfo?.data['name'], | ||||
|                           ), | ||||
|                           _buildInfoItem( | ||||
|                             context, | ||||
|                             icon: Symbols.fingerprint, | ||||
|                             label: 'Device Identifier', | ||||
|                             value: _deviceUdid ?? 'N/A', | ||||
|                             copyable: true, | ||||
|                           ), | ||||
|                           const Divider(height: 1), | ||||
|                           _buildListTile( | ||||
|                             context, | ||||
|                             icon: Symbols.notifications_active, | ||||
|                             title: 'Reactivate Push Notifications', | ||||
|                             onTap: () async { | ||||
|                               showLoadingModal(context); | ||||
|                               try { | ||||
|                                 await subscribePushNotification( | ||||
|                                   ref.watch(apiClientProvider), | ||||
|                                 ); | ||||
|                               } catch (err) { | ||||
|                                 showErrorAlert(err); | ||||
|                               } finally { | ||||
|                                 if (context.mounted) hideLoadingModal(context); | ||||
|                               } | ||||
|                             }, | ||||
|                           ), | ||||
|                         ], | ||||
|                       ), | ||||
|  | ||||
|                     const SizedBox(height: 16), | ||||
|  | ||||
|                     // Links Card | ||||
| @@ -136,7 +207,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                       children: [ | ||||
|                         _buildListTile( | ||||
|                           context, | ||||
|                           icon: Icons.privacy_tip_outlined, | ||||
|                           icon: Symbols.privacy_tip, | ||||
|                           title: 'aboutScreenPrivacyPolicyTitle'.tr(), | ||||
|                           onTap: | ||||
|                               () => _launchURL( | ||||
| @@ -145,7 +216,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                         ), | ||||
|                         _buildListTile( | ||||
|                           context, | ||||
|                           icon: Icons.description_outlined, | ||||
|                           icon: Symbols.description, | ||||
|                           title: 'aboutScreenTermsOfServiceTitle'.tr(), | ||||
|                           onTap: | ||||
|                               () => _launchURL( | ||||
| @@ -154,7 +225,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                         ), | ||||
|                         _buildListTile( | ||||
|                           context, | ||||
|                           icon: Icons.code, | ||||
|                           icon: Symbols.code, | ||||
|                           title: 'aboutScreenOpenSourceLicensesTitle'.tr(), | ||||
|                           onTap: () { | ||||
|                             showLicensePage( | ||||
| @@ -177,14 +248,14 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                       children: [ | ||||
|                         _buildListTile( | ||||
|                           context, | ||||
|                           icon: Icons.email_outlined, | ||||
|                           icon: Symbols.email, | ||||
|                           title: 'aboutScreenContactUsTitle'.tr(), | ||||
|                           subtitle: 'lily@solsynth.dev', | ||||
|                           onTap: () => _launchURL('mailto:lily@solsynth.dev'), | ||||
|                         ), | ||||
|                         _buildListTile( | ||||
|                           context, | ||||
|                           icon: Icons.copyright, | ||||
|                           icon: Symbols.copyright, | ||||
|                           title: 'aboutScreenLicenseTitle'.tr(), | ||||
|                           subtitle: 'aboutScreenLicenseContent'.tr( | ||||
|                             args: [DateTime.now().year.toString()], | ||||
| @@ -202,14 +273,25 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                     // Copyright | ||||
|                     Padding( | ||||
|                       padding: const EdgeInsets.all(16.0), | ||||
|                       child: Text( | ||||
|                         'aboutScreenCopyright'.tr( | ||||
|                           args: [DateTime.now().year.toString(), "Solsynth"], | ||||
|                         ), | ||||
|                         style: theme.textTheme.bodySmall, | ||||
|                         textAlign: TextAlign.center, | ||||
|                       child: Column( | ||||
|                         children: [ | ||||
|                           Text( | ||||
|                             'aboutScreenCopyright'.tr( | ||||
|                               args: [DateTime.now().year.toString()], | ||||
|                             ), | ||||
|                             style: theme.textTheme.bodySmall, | ||||
|                             textAlign: TextAlign.center, | ||||
|                           ), | ||||
|                           const Gap(1), | ||||
|                           Text( | ||||
|                             'aboutScreenMadeWith'.tr(), | ||||
|                             textAlign: TextAlign.center, | ||||
|                           ).fontSize(10).opacity(0.8), | ||||
|                         ], | ||||
|                       ), | ||||
|                     ), | ||||
|  | ||||
|                     Gap(MediaQuery.of(context).padding.bottom + 16), | ||||
|                   ], | ||||
|                 ), | ||||
|               ), | ||||
| @@ -247,6 +329,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|     required IconData icon, | ||||
|     required String label, | ||||
|     required String value, | ||||
|     bool copyable = false, | ||||
|   }) { | ||||
|     return Padding( | ||||
|       padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), | ||||
| @@ -263,13 +346,14 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|                 SelectableText( | ||||
|                   value, | ||||
|                   style: Theme.of(context).textTheme.bodyMedium, | ||||
|                   maxLines: copyable ? 1 : null, | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|           if (value.startsWith('http') || value.contains('@')) | ||||
|           if (value.startsWith('http') || value.contains('@') || copyable) | ||||
|             IconButton( | ||||
|               icon: const Icon(Icons.copy, size: 16), | ||||
|               icon: const Icon(Symbols.content_copy, size: 16), | ||||
|               onPressed: () { | ||||
|                 Clipboard.setData(ClipboardData(text: value)); | ||||
|                 ScaffoldMessenger.of(context).showSnackBar( | ||||
| @@ -301,7 +385,7 @@ class _AboutScreenState extends State<AboutScreen> { | ||||
|           subtitle: subtitle != null ? Text(subtitle) : null, | ||||
|           isThreeLine: multipleLines, | ||||
|           trailing: const Icon( | ||||
|             Icons.chevron_right, | ||||
|             Symbols.chevron_right, | ||||
|           ).padding(top: multipleLines ? 8 : 0), | ||||
|           shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), | ||||
|           onTap: onTap, | ||||
|   | ||||
| @@ -59,7 +59,7 @@ class AccountScreen extends HookConsumerWidget { | ||||
|       notificationUnreadCountNotifierProvider, | ||||
|     ); | ||||
|  | ||||
|     if (!user.hasValue || user.value == null) { | ||||
|     if (user.value == null || user.value == null) { | ||||
|       return _UnauthorizedAccountScreen(); | ||||
|     } | ||||
|  | ||||
| @@ -367,12 +367,23 @@ class _UnauthorizedAccountScreen extends StatelessWidget { | ||||
|                   ), | ||||
|                 ), | ||||
|                 const Gap(8), | ||||
|                 TextButton( | ||||
|                   onPressed: () { | ||||
|                     context.push('/settings'); | ||||
|                   }, | ||||
|                   child: Text('appSettings').tr(), | ||||
|                 ).center(), | ||||
|                 Row( | ||||
|                   mainAxisAlignment: MainAxisAlignment.center, | ||||
|                   children: [ | ||||
|                     TextButton( | ||||
|                       onPressed: () { | ||||
|                         context.push('/about'); | ||||
|                       }, | ||||
|                       child: Text('about').tr(), | ||||
|                     ), | ||||
|                     TextButton( | ||||
|                       onPressed: () { | ||||
|                         context.push('/settings'); | ||||
|                       }, | ||||
|                       child: Text('appSettings').tr(), | ||||
|                     ), | ||||
|                   ], | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ).center(), | ||||
|   | ||||
| @@ -82,7 +82,7 @@ class EventCalanderScreen extends HookConsumerWidget { | ||||
|                       ), | ||||
|  | ||||
|                       // Show user profile if viewing someone else's calendar | ||||
|                       if (name != 'me' && user.hasValue) | ||||
|                       if (name != 'me' && user.value != null) | ||||
|                         AccountNameplate(name: name), | ||||
|                     ], | ||||
|                   ), | ||||
| @@ -106,7 +106,7 @@ class EventCalanderScreen extends HookConsumerWidget { | ||||
|                     ).padding(horizontal: 8, vertical: 4), | ||||
|  | ||||
|                     // Show user profile if viewing someone else's calendar | ||||
|                     if (name != 'me' && user.hasValue) | ||||
|                     if (name != 'me' && user.value != null) | ||||
|                       AccountNameplate(name: name), | ||||
|                     Gap(MediaQuery.of(context).padding.bottom + 16), | ||||
|                   ], | ||||
|   | ||||
| @@ -72,6 +72,8 @@ Future<Color?> accountAppbarForcegroundColor(Ref ref, String uname) async { | ||||
|  | ||||
| @riverpod | ||||
| Future<SnChatRoom?> accountDirectChat(Ref ref, String uname) async { | ||||
|   final userInfo = ref.watch(userInfoProvider); | ||||
|   if (userInfo.value == null) return null; | ||||
|   final account = await ref.watch(accountProvider(uname).future); | ||||
|   final apiClient = ref.watch(apiClientProvider); | ||||
|   try { | ||||
| @@ -87,6 +89,8 @@ Future<SnChatRoom?> accountDirectChat(Ref ref, String uname) async { | ||||
|  | ||||
| @riverpod | ||||
| Future<SnRelationship?> accountRelationship(Ref ref, String uname) async { | ||||
|   final userInfo = ref.watch(userInfoProvider); | ||||
|   if (userInfo.value == null) return null; | ||||
|   final account = await ref.watch(accountProvider(uname).future); | ||||
|   final apiClient = ref.watch(apiClientProvider); | ||||
|   try { | ||||
| @@ -219,6 +223,8 @@ class AccountProfileScreen extends HookConsumerWidget { | ||||
|       ]; | ||||
|     } | ||||
|  | ||||
|     final user = ref.watch(userInfoProvider); | ||||
|  | ||||
|     return account.when( | ||||
|       data: | ||||
|           (data) => AppScaffold( | ||||
| @@ -379,56 +385,60 @@ class AccountProfileScreen extends HookConsumerWidget { | ||||
|                   ).padding(horizontal: 24), | ||||
|                 ), | ||||
|  | ||||
|                 SliverToBoxAdapter( | ||||
|                   child: const Divider(height: 1).padding(top: 24, bottom: 12), | ||||
|                 ), | ||||
|                 SliverToBoxAdapter( | ||||
|                   child: Row( | ||||
|                     spacing: 8, | ||||
|                     children: [ | ||||
|                       Expanded( | ||||
|                         child: FilledButton.icon( | ||||
|                           style: ButtonStyle( | ||||
|                             backgroundColor: WidgetStatePropertyAll( | ||||
|                               accountRelationship.value == null | ||||
|                                   ? null | ||||
|                                   : Theme.of(context).colorScheme.secondary, | ||||
|                             ), | ||||
|                             foregroundColor: WidgetStatePropertyAll( | ||||
|                               accountRelationship.value == null | ||||
|                                   ? null | ||||
|                                   : Theme.of(context).colorScheme.onSecondary, | ||||
|                             ), | ||||
|                           ), | ||||
|                           onPressed: relationshipAction, | ||||
|                           label: | ||||
|                               Text( | ||||
|                 if (user.value != null) | ||||
|                   SliverToBoxAdapter( | ||||
|                     child: const Divider( | ||||
|                       height: 1, | ||||
|                     ).padding(top: 24, bottom: 12), | ||||
|                   ), | ||||
|                 if (user.value != null) | ||||
|                   SliverToBoxAdapter( | ||||
|                     child: Row( | ||||
|                       spacing: 8, | ||||
|                       children: [ | ||||
|                         Expanded( | ||||
|                           child: FilledButton.icon( | ||||
|                             style: ButtonStyle( | ||||
|                               backgroundColor: WidgetStatePropertyAll( | ||||
|                                 accountRelationship.value == null | ||||
|                                     ? 'addFriendShort' | ||||
|                                     : 'added', | ||||
|                               ).tr(), | ||||
|                           icon: | ||||
|                               accountRelationship.value == null | ||||
|                                   ? const Icon(Symbols.person_add) | ||||
|                                   : const Icon(Symbols.person_check), | ||||
|                                     ? null | ||||
|                                     : Theme.of(context).colorScheme.secondary, | ||||
|                               ), | ||||
|                               foregroundColor: WidgetStatePropertyAll( | ||||
|                                 accountRelationship.value == null | ||||
|                                     ? null | ||||
|                                     : Theme.of(context).colorScheme.onSecondary, | ||||
|                               ), | ||||
|                             ), | ||||
|                             onPressed: relationshipAction, | ||||
|                             label: | ||||
|                                 Text( | ||||
|                                   accountRelationship.value == null | ||||
|                                       ? 'addFriendShort' | ||||
|                                       : 'added', | ||||
|                                 ).tr(), | ||||
|                             icon: | ||||
|                                 accountRelationship.value == null | ||||
|                                     ? const Icon(Symbols.person_add) | ||||
|                                     : const Icon(Symbols.person_check), | ||||
|                           ), | ||||
|                         ), | ||||
|                       ), | ||||
|                       Expanded( | ||||
|                         child: FilledButton.icon( | ||||
|                           onPressed: directMessageAction, | ||||
|                           icon: const Icon(Symbols.message), | ||||
|                           label: | ||||
|                               Text( | ||||
|                                 accountChat.value == null | ||||
|                                     ? 'createDirectMessage' | ||||
|                                     : 'gotoDirectMessage', | ||||
|                                 maxLines: 1, | ||||
|                               ).tr(), | ||||
|                         Expanded( | ||||
|                           child: FilledButton.icon( | ||||
|                             onPressed: directMessageAction, | ||||
|                             icon: const Icon(Symbols.message), | ||||
|                             label: | ||||
|                                 Text( | ||||
|                                   accountChat.value == null | ||||
|                                       ? 'createDirectMessage' | ||||
|                                       : 'gotoDirectMessage', | ||||
|                                   maxLines: 1, | ||||
|                                 ).tr(), | ||||
|                           ), | ||||
|                         ), | ||||
|                       ), | ||||
|                     ], | ||||
|                   ).padding(horizontal: 16), | ||||
|                 ), | ||||
|                       ], | ||||
|                     ).padding(horizontal: 16), | ||||
|                   ), | ||||
|                 SliverToBoxAdapter( | ||||
|                   child: const Divider(height: 1).padding(top: 12), | ||||
|                 ), | ||||
|   | ||||
| @@ -51,54 +51,59 @@ class _ArticleDetailContent extends HookConsumerWidget { | ||||
|     ); | ||||
|  | ||||
|     return SingleChildScrollView( | ||||
|       child: Column( | ||||
|         crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|         children: [ | ||||
|           if (article.preview?.imageUrl != null) | ||||
|             Image.network( | ||||
|               article.preview!.imageUrl!, | ||||
|               width: double.infinity, | ||||
|               height: 200, | ||||
|               fit: BoxFit.cover, | ||||
|             ), | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.all(16.0), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 Text( | ||||
|                   article.title, | ||||
|                   style: Theme.of(context).textTheme.headlineSmall, | ||||
|       child: Center( | ||||
|         child: ConstrainedBox( | ||||
|           constraints: const BoxConstraints(maxWidth: 560), | ||||
|           child: Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|             children: [ | ||||
|               if (article.preview?.imageUrl != null) | ||||
|                 Image.network( | ||||
|                   article.preview!.imageUrl!, | ||||
|                   width: double.infinity, | ||||
|                   height: 200, | ||||
|                   fit: BoxFit.cover, | ||||
|                 ), | ||||
|                 const SizedBox(height: 8), | ||||
|                 if (article.feed?.title != null) | ||||
|                   Text( | ||||
|                     article.feed!.title, | ||||
|                     style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|                       color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|               Padding( | ||||
|                 padding: const EdgeInsets.all(16.0), | ||||
|                 child: Column( | ||||
|                   crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                   children: [ | ||||
|                     Text( | ||||
|                       article.title, | ||||
|                       style: Theme.of(context).textTheme.headlineSmall, | ||||
|                     ), | ||||
|                   ), | ||||
|                 const Divider(height: 32), | ||||
|                 if (article.content != null) | ||||
|                   ...MarkdownTextContent.buildGenerator( | ||||
|                     isDark: Theme.of(context).brightness == Brightness.dark, | ||||
|                   ).buildWidgets(markdownContent) | ||||
|                 else if (article.preview?.description != null) | ||||
|                   Text(article.preview!.description!), | ||||
|                 const Gap(24), | ||||
|                 FilledButton( | ||||
|                   onPressed: | ||||
|                       () => launchUrlString( | ||||
|                         article.url, | ||||
|                         mode: LaunchMode.externalApplication, | ||||
|                     const SizedBox(height: 8), | ||||
|                     if (article.feed?.title != null) | ||||
|                       Text( | ||||
|                         article.feed!.title, | ||||
|                         style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|                           color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                         ), | ||||
|                       ), | ||||
|                   child: const Text('Read Full Article'), | ||||
|                     const Divider(height: 32), | ||||
|                     if (article.content != null) | ||||
|                       ...MarkdownTextContent.buildGenerator( | ||||
|                         isDark: Theme.of(context).brightness == Brightness.dark, | ||||
|                       ).buildWidgets(markdownContent) | ||||
|                     else if (article.preview?.description != null) | ||||
|                       Text(article.preview!.description!), | ||||
|                     const Gap(24), | ||||
|                     FilledButton( | ||||
|                       onPressed: | ||||
|                           () => launchUrlString( | ||||
|                             article.url, | ||||
|                             mode: LaunchMode.externalApplication, | ||||
|                           ), | ||||
|                       child: const Text('Read Full Article'), | ||||
|                     ), | ||||
|                     Gap(MediaQuery.of(context).padding.bottom), | ||||
|                   ], | ||||
|                 ), | ||||
|                 Gap(MediaQuery.of(context).padding.bottom), | ||||
|               ], | ||||
|             ), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
|         ], | ||||
|         ), | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
|   | ||||
| @@ -126,16 +126,21 @@ class ArticlesScreen extends ConsumerWidget { | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     return Scaffold( | ||||
|       appBar: AppBar(title: Text(title ?? 'Articles')), | ||||
|       body: CustomScrollView( | ||||
|         slivers: [ | ||||
|           SliverPadding( | ||||
|             padding: const EdgeInsets.only(top: 8, left: 8, right: 8), | ||||
|             sliver: SliverArticlesList( | ||||
|               feedId: feedId, | ||||
|               publisherId: publisherId, | ||||
|             ), | ||||
|       body: Center( | ||||
|         child: ConstrainedBox( | ||||
|           constraints: const BoxConstraints(maxWidth: 560), | ||||
|           child: CustomScrollView( | ||||
|             slivers: [ | ||||
|               SliverPadding( | ||||
|                 padding: const EdgeInsets.only(top: 8, left: 8, right: 8), | ||||
|                 sliver: SliverArticlesList( | ||||
|                   feedId: feedId, | ||||
|                   publisherId: publisherId, | ||||
|                 ), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
|         ], | ||||
|         ), | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
|   | ||||
| @@ -307,7 +307,7 @@ class _ActivityListView extends HookConsumerWidget { | ||||
|  | ||||
|     return CustomScrollView( | ||||
|       slivers: [ | ||||
|         if (user.hasValue && !contentOnly) | ||||
|         if (user.value != null && !contentOnly) | ||||
|           SliverToBoxAdapter(child: CheckInWidget()), | ||||
|         SliverList.builder( | ||||
|           itemCount: widgetCount, | ||||
|   | ||||
| @@ -321,8 +321,15 @@ class ArticleComposeScreen extends HookConsumerWidget { | ||||
|             builder: (context, attachments, _) { | ||||
|               if (attachments.isEmpty) return const SizedBox.shrink(); | ||||
|               return Column( | ||||
|                 crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                 children: [ | ||||
|                   const Gap(16), | ||||
|                   Text( | ||||
|                     'articleAttachmentHint'.tr(), | ||||
|                     style: Theme.of(context).textTheme.bodySmall?.copyWith( | ||||
|                       color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                     ), | ||||
|                   ).padding(bottom: 8), | ||||
|                   ValueListenableBuilder<Map<int, double>>( | ||||
|                     valueListenable: state.attachmentProgress, | ||||
|                     builder: (context, progressMap, _) { | ||||
| @@ -332,8 +339,8 @@ class ArticleComposeScreen extends HookConsumerWidget { | ||||
|                         children: [ | ||||
|                           for (var idx = 0; idx < attachments.length; idx++) | ||||
|                             SizedBox( | ||||
|                               width: 120, | ||||
|                               height: 120, | ||||
|                               width: 280, | ||||
|                               height: 280, | ||||
|                               child: AttachmentPreview( | ||||
|                                 item: attachments[idx], | ||||
|                                 progress: progressMap[idx], | ||||
| @@ -358,6 +365,12 @@ class ArticleComposeScreen extends HookConsumerWidget { | ||||
|                                     delta, | ||||
|                                   ); | ||||
|                                 }, | ||||
|                                 onInsert: | ||||
|                                     () => ComposeLogic.insertAttachment( | ||||
|                                       ref, | ||||
|                                       state, | ||||
|                                       idx, | ||||
|                                     ), | ||||
|                               ), | ||||
|                             ), | ||||
|                         ], | ||||
|   | ||||
| @@ -63,7 +63,10 @@ StreamSubscription<WebSocketPacket> setupNotificationListener( | ||||
|   }); | ||||
| } | ||||
|  | ||||
| Future<void> subscribePushNotification(Dio apiClient) async { | ||||
| Future<void> subscribePushNotification( | ||||
|   Dio apiClient, { | ||||
|   bool detailedErrors = false, | ||||
| }) async { | ||||
|   await FirebaseMessaging.instance.requestPermission( | ||||
|     provisional: true, | ||||
|     alert: true, | ||||
| @@ -97,6 +100,8 @@ Future<void> subscribePushNotification(Dio apiClient) async { | ||||
|       deviceToken, | ||||
|       !kIsWeb && (Platform.isIOS || Platform.isMacOS) ? 0 : 1, | ||||
|     ); | ||||
|   } else if (detailedErrors) { | ||||
|     throw Exception("Failed to get device token for push notifications."); | ||||
|   } | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -59,7 +59,7 @@ class AccountStatusCreationSheet extends HookConsumerWidget { | ||||
|           }, | ||||
|           options: Options(method: initialStatus == null ? 'POST' : 'PATCH'), | ||||
|         ); | ||||
|         if (user.hasValue) { | ||||
|         if (user.value != null) { | ||||
|           ref.invalidate(accountStatusProvider(user.value!.name)); | ||||
|         } | ||||
|         if (!context.mounted) return; | ||||
|   | ||||
| @@ -350,7 +350,7 @@ class _WebSocketIndicator extends HookConsumerWidget { | ||||
|     return AnimatedPositioned( | ||||
|       duration: Duration(milliseconds: 1850), | ||||
|       top: | ||||
|           !user.hasValue || | ||||
|           user.value == null || | ||||
|                   user.value == null || | ||||
|                   websocketState == WebSocketState.connected() | ||||
|               ? -indicatorHeight | ||||
| @@ -362,7 +362,7 @@ class _WebSocketIndicator extends HookConsumerWidget { | ||||
|       child: IgnorePointer( | ||||
|         child: Material( | ||||
|           elevation: | ||||
|               !user.hasValue || websocketState == WebSocketState.connected() | ||||
|               user.value == null || websocketState == WebSocketState.connected() | ||||
|                   ? 0 | ||||
|                   : 4, | ||||
|           child: AnimatedContainer( | ||||
|   | ||||
| @@ -15,6 +15,7 @@ class AttachmentPreview extends StatelessWidget { | ||||
|   final double? progress; | ||||
|   final Function(int)? onMove; | ||||
|   final Function? onDelete; | ||||
|   final Function? onInsert; | ||||
|   final Function? onRequestUpload; | ||||
|   const AttachmentPreview({ | ||||
|     super.key, | ||||
| @@ -23,6 +24,7 @@ class AttachmentPreview extends StatelessWidget { | ||||
|     this.onRequestUpload, | ||||
|     this.onMove, | ||||
|     this.onDelete, | ||||
|     this.onInsert, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
| @@ -104,7 +106,11 @@ class AttachmentPreview extends StatelessWidget { | ||||
|                           style: TextStyle(color: Colors.white), | ||||
|                         ), | ||||
|                       Gap(6), | ||||
|                       Center(child: LinearProgressIndicator(value: progress)), | ||||
|                       Center( | ||||
|                         child: LinearProgressIndicator( | ||||
|                           value: progress != null ? progress! / 100.0 : null, | ||||
|                         ), | ||||
|                       ), | ||||
|                     ], | ||||
|                   ), | ||||
|                 ), | ||||
| @@ -166,6 +172,18 @@ class AttachmentPreview extends StatelessWidget { | ||||
|                               onMove?.call(1); | ||||
|                             }, | ||||
|                           ), | ||||
|                         if (onInsert != null) | ||||
|                           InkWell( | ||||
|                             borderRadius: BorderRadius.circular(8), | ||||
|                             child: const Icon( | ||||
|                               Symbols.add, | ||||
|                               size: 14, | ||||
|                               color: Colors.white, | ||||
|                             ).padding(horizontal: 8, vertical: 6), | ||||
|                             onTap: () { | ||||
|                               onInsert?.call(); | ||||
|                             }, | ||||
|                           ), | ||||
|                       ], | ||||
|                     ), | ||||
|                   ), | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| import 'package:collection/collection.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:go_router/go_router.dart'; | ||||
| @@ -6,11 +7,14 @@ import 'package:flutter_highlight/themes/a11y-dark.dart'; | ||||
| import 'package:flutter_highlight/themes/a11y-light.dart'; | ||||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/models/file.dart'; | ||||
| import 'package:island/pods/config.dart'; | ||||
| import 'package:island/widgets/alert.dart'; | ||||
| import 'package:island/widgets/content/cloud_files.dart'; | ||||
| import 'package:island/widgets/content/markdown_latex.dart'; | ||||
| import 'package:markdown/markdown.dart' as markdown; | ||||
| import 'package:markdown_widget/markdown_widget.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:url_launcher/url_launcher.dart'; | ||||
|  | ||||
| import 'image.dart'; | ||||
| @@ -23,6 +27,7 @@ class MarkdownTextContent extends HookConsumerWidget { | ||||
|   final TextStyle? linkStyle; | ||||
|   final EdgeInsets? linesMargin; | ||||
|   final bool isSelectable; | ||||
|   final List<SnCloudFile>? attachments; | ||||
|  | ||||
|   const MarkdownTextContent({ | ||||
|     super.key, | ||||
| @@ -33,6 +38,7 @@ class MarkdownTextContent extends HookConsumerWidget { | ||||
|     this.linkStyle, | ||||
|     this.isSelectable = false, | ||||
|     this.linesMargin, | ||||
|     this.attachments, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
| @@ -109,6 +115,29 @@ class MarkdownTextContent extends HookConsumerWidget { | ||||
|               final uri = Uri.parse(url); | ||||
|               if (uri.scheme == 'solian') { | ||||
|                 switch (uri.host) { | ||||
|                   case 'files': | ||||
|                     final file = attachments?.firstWhereOrNull( | ||||
|                       (file) => file.id == uri.pathSegments[0], | ||||
|                     ); | ||||
|                     if (file == null) { | ||||
|                       return const SizedBox.shrink(); | ||||
|                     } | ||||
|  | ||||
|                     return ClipRRect( | ||||
|                       borderRadius: const BorderRadius.all(Radius.circular(8)), | ||||
|                       child: Container( | ||||
|                         decoration: BoxDecoration( | ||||
|                           color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                           borderRadius: const BorderRadius.all( | ||||
|                             Radius.circular(8), | ||||
|                           ), | ||||
|                         ), | ||||
|                         child: CloudFileWidget( | ||||
|                           item: file, | ||||
|                           fit: BoxFit.cover, | ||||
|                         ).clipRRect(all: 8), | ||||
|                       ), | ||||
|                     ); | ||||
|                   case 'stickers': | ||||
|                     final size = doesEnlargeSticker ? 96.0 : 24.0; | ||||
|                     return ClipRRect( | ||||
| @@ -132,9 +161,9 @@ class MarkdownTextContent extends HookConsumerWidget { | ||||
|                     ); | ||||
|                 } | ||||
|               } | ||||
|               final content = UniversalImage( | ||||
|                 uri: uri.toString(), | ||||
|                 fit: BoxFit.cover, | ||||
|               final content = ConstrainedBox( | ||||
|                 constraints: BoxConstraints(maxHeight: 360), | ||||
|                 child: UniversalImage(uri: uri.toString(), fit: BoxFit.contain), | ||||
|               ); | ||||
|               return content; | ||||
|             }, | ||||
|   | ||||
| @@ -474,6 +474,23 @@ class ComposeLogic { | ||||
|     state.attachments.value = clone; | ||||
|   } | ||||
|  | ||||
|   static void insertAttachment(WidgetRef ref, ComposeState state, int index) { | ||||
|     final attachment = state.attachments.value[index]; | ||||
|     if (!attachment.isOnCloud) { | ||||
|       return; | ||||
|     } | ||||
|     final cloudFile = attachment.data as SnCloudFile; | ||||
|     final markdown = ''; | ||||
|     final controller = state.contentController; | ||||
|     final text = controller.text; | ||||
|     final selection = controller.selection; | ||||
|     final newText = text.replaceRange(selection.start, selection.end, markdown); | ||||
|     controller.text = newText; | ||||
|     controller.selection = TextSelection.fromPosition( | ||||
|       TextPosition(offset: selection.start + markdown.length), | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   static Future<void> performAction( | ||||
|     WidgetRef ref, | ||||
|     ComposeState state, | ||||
|   | ||||
| @@ -56,7 +56,7 @@ class PostItem extends HookConsumerWidget { | ||||
|  | ||||
|     final user = ref.watch(userInfoProvider); | ||||
|     final isAuthor = useMemoized( | ||||
|       () => user.hasValue && user.value?.id == item.publisher.accountId, | ||||
|       () => user.value != null && user.value?.id == item.publisher.accountId, | ||||
|       [user], | ||||
|     ); | ||||
|  | ||||
| @@ -163,7 +163,7 @@ class PostItem extends HookConsumerWidget { | ||||
|             if ((item.repliedPost != null || item.forwardedPost != null) && | ||||
|                 showReferencePost) | ||||
|               _buildReferencePost(context, item), | ||||
|             if (item.attachments.isNotEmpty) | ||||
|             if (item.attachments.isNotEmpty && item.type != 1) | ||||
|               CloudFileList( | ||||
|                 files: item.attachments, | ||||
|                 maxWidth: math.min( | ||||
| @@ -331,6 +331,7 @@ class PostItem extends HookConsumerWidget { | ||||
|                                   item.type == 0 | ||||
|                                       ? EdgeInsets.only(bottom: 8) | ||||
|                                       : null, | ||||
|                               attachments: item.attachments, | ||||
|                             ), | ||||
|                         ], | ||||
|                         // Render tags and categories if they exist | ||||
| @@ -389,7 +390,7 @@ class PostItem extends HookConsumerWidget { | ||||
|                                 item.forwardedPost != null) && | ||||
|                             showReferencePost) | ||||
|                           _buildReferencePost(context, item), | ||||
|                         if (item.attachments.isNotEmpty) | ||||
|                         if (item.attachments.isNotEmpty && item.type != 1) | ||||
|                           CloudFileList( | ||||
|                             files: item.attachments, | ||||
|                             maxWidth: math.min( | ||||
| @@ -689,6 +690,7 @@ Widget _buildReferencePost(BuildContext context, SnPost item) { | ||||
|                           referencePost.type == 0 | ||||
|                               ? EdgeInsets.only(bottom: 4) | ||||
|                               : null, | ||||
|                       attachments: item.attachments, | ||||
|                     ).padding(bottom: 4), | ||||
|                   // Truncation hint for referenced post | ||||
|                   if (referencePost.isTruncated) | ||||
| @@ -696,7 +698,8 @@ Widget _buildReferencePost(BuildContext context, SnPost item) { | ||||
|                       isCompact: true, | ||||
|                       margin: const EdgeInsets.only(top: 4, bottom: 8), | ||||
|                     ), | ||||
|                   if (referencePost.attachments.isNotEmpty) | ||||
|                   if (referencePost.attachments.isNotEmpty && | ||||
|                       referencePost.type != 1) | ||||
|                     Row( | ||||
|                       mainAxisSize: MainAxisSize.min, | ||||
|                       children: [ | ||||
| @@ -1030,6 +1033,7 @@ class _ArticlePostDisplay extends StatelessWidget { | ||||
|             MarkdownTextContent( | ||||
|               content: item.content!, | ||||
|               textStyle: Theme.of(context).textTheme.bodyLarge, | ||||
|               attachments: item.attachments, | ||||
|             ), | ||||
|         ], | ||||
|       ); | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/models/post.dart'; | ||||
| import 'package:island/pods/userinfo.dart'; | ||||
| import 'package:island/widgets/content/sheet.dart'; | ||||
| import 'package:island/widgets/post/post_replies.dart'; | ||||
| import 'package:island/widgets/post/post_quick_reply.dart'; | ||||
| @@ -14,6 +15,8 @@ class PostRepliesSheet extends HookConsumerWidget { | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     final user = ref.watch(userInfoProvider); | ||||
|  | ||||
|     return SheetScaffold( | ||||
|       titleText: 'repliesCount'.plural(post.repliesCount), | ||||
|       child: Column( | ||||
| @@ -21,26 +24,29 @@ class PostRepliesSheet extends HookConsumerWidget { | ||||
|           // Replies list | ||||
|           Expanded( | ||||
|             child: CustomScrollView( | ||||
|               slivers: [PostRepliesList( | ||||
|                 postId: post.id.toString(), | ||||
|                 backgroundColor: Colors.transparent, | ||||
|               )], | ||||
|               slivers: [ | ||||
|                 PostRepliesList( | ||||
|                   postId: post.id.toString(), | ||||
|                   backgroundColor: Colors.transparent, | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|           // Quick reply section | ||||
|           Material( | ||||
|             elevation: 2, | ||||
|             child: PostQuickReply( | ||||
|               parent: post, | ||||
|               onPosted: () { | ||||
|                 ref.invalidate(postRepliesNotifierProvider(post.id)); | ||||
|               }, | ||||
|             ).padding( | ||||
|               bottom: MediaQuery.of(context).padding.bottom + 16, | ||||
|               top: 16, | ||||
|               horizontal: 16, | ||||
|           if (user.value != null) | ||||
|             Material( | ||||
|               elevation: 2, | ||||
|               child: PostQuickReply( | ||||
|                 parent: post, | ||||
|                 onPosted: () { | ||||
|                   ref.invalidate(postRepliesNotifierProvider(post.id)); | ||||
|                 }, | ||||
|               ).padding( | ||||
|                 bottom: MediaQuery.of(context).padding.bottom + 16, | ||||
|                 top: 16, | ||||
|                 horizontal: 16, | ||||
|               ), | ||||
|             ), | ||||
|           ), | ||||
|         ], | ||||
|       ), | ||||
|     ); | ||||
|   | ||||
| @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev | ||||
| # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html | ||||
| # In Windows, build-name is used as the major, minor, and patch parts | ||||
| # of the product and file versions while build-number is used as the build suffix. | ||||
| version: 3.0.0+110 | ||||
| version: 3.0.0+111 | ||||
|  | ||||
| environment: | ||||
|   sdk: ^3.7.2 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user