🐛 Bug fixes

💄 Optimize user profile page

assets/locales/en_us.json

@@ -98,6 +98,8 @@
   "accountFriendBlocked": "Friend blocklist",
   "accountFriendListHint": "Swipe left to decline, right to approve",
   "accountFriendRequestSent": "Friend request sent, waiting for processing...",
+  "accountBlocked": "Account has been blocked",
+  "accountUnblocked": "Account has been unblocked",
   "accountSuspended": "Account was suspended",
   "accountSuspendedAt": "Account was suspended since @date",
   "aspectRatio": "Aspect Ratio",
@@ -457,5 +459,9 @@
   "serviceStatus": "Status of Service",
   "firstBootTime": "First boot at @time",
   "rateTheApp": "Rate the app",
-  "rateTheAppDesc": "Rate Solar Network on the App Store to let us serve you better!"
+  "rateTheAppDesc": "Rate Solar Network on the App Store to let us serve you better!",
+  "friendAdd": "Add as friend",
+  "blockUser": "Block user",
+  "unblockUser": "Unblock user",
+  "learnMoreAboutPerson": "Learn more about that person"
 }

assets/locales/zh_cn.json

@@ -98,6 +98,8 @@
   "accountFriendBlocked": "好友黑名单",
   "accountFriendListHint": "左滑来拒绝，右滑来接受",
   "accountFriendRequestSent": "好友请求已发送，等待处理对方中……",
+  "accountBlocked": "已屏蔽账号",
+  "accountUnblocked": "已解除屏蔽账号",
   "accountSuspended": "帐号被停用",
   "accountSuspendedAt": "该帐号自 @date 起被停用",
   "aspectRatio": "纵横比",
@@ -453,5 +455,9 @@
   "serviceStatus": "服务状态",
   "firstBootTime": "首次启动于 @time",
   "rateTheApp": "给应用评分",
-  "rateTheAppDesc": "在 App Store 上给 Solar Network 评分，让我们更好地为您服务吧！"
+  "rateTheAppDesc": "在 App Store 上给 Solar Network 评分，让我们更好地为您服务吧！",
+  "friendAdd": "添加好友",
+  "blockUser": "屏蔽用户",
+  "unblockUser": "解除屏蔽用户",
+  "learnMoreAboutPerson": "了解关于 TA 的更多"
 }

lib/main.dart

@@ -57,13 +57,16 @@ void main() async {
 
 Future<void> _initializeFirebase() async {
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
-  FlutterError.onError = (errorDetails) {
-    FirebaseCrashlytics.instance.recordFlutterFatalError(errorDetails);
-  };
-  PlatformDispatcher.instance.onError = (error, stack) {
-    FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
-    return true;
-  };
+  if (PlatformInfo.isIOS || PlatformInfo.isAndroid || PlatformInfo.isMacOS) {
+    // Initialize firebase crashlytics for the platform that supported
+    FlutterError.onError = (errorDetails) {
+      FirebaseCrashlytics.instance.recordFlutterFatalError(errorDetails);
+    };
+    PlatformDispatcher.instance.onError = (error, stack) {
+      FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
+      return true;
+    };
+  }
 }
 
 Future<void> _initializeBackgroundNotificationService() async {

lib/providers/relation.dart

@@ -26,6 +26,19 @@ class RelationshipProvider extends GetxController {
     return _friends.any((x) => x.relatedId == account.id);
   }
 
+  Future<Relationship?> getRelationship(int relatedId) async {
+    final AuthProvider auth = Get.find();
+    final client = await auth.configureClient('auth');
+    final resp = await client.get('/users/me/relations/$relatedId');
+    if (resp.statusCode == 404) {
+      return null;
+    } else if (resp.statusCode != 200) {
+      throw RequestException(resp);
+    }
+
+    return Relationship.fromJson(resp.body);
+  }
+
   Future<Response> listRelation() async {
     final AuthProvider auth = Get.find();
     final client = await auth.configureClient('auth');
@@ -38,7 +51,19 @@ class RelationshipProvider extends GetxController {
     return client.get('/users/me/relations?status=$status');
   }
 
-  Future<Response> makeFriend(String username) async {
+  Future<Relationship?> blockUser(String username) async {
+    final AuthProvider auth = Get.find();
+    final client = await auth.configureClient('auth');
+    final resp =
+        await client.post('/users/me/relations/block?related=$username', {});
+    if (resp.statusCode != 200) {
+      throw RequestException(resp);
+    }
+
+    return Relationship.fromJson(resp.body);
+  }
+
+  Future<Relationship?> makeFriend(String username) async {
     final AuthProvider auth = Get.find();
     final client = await auth.configureClient('auth');
     final resp = await client.post('/users/me/relations?related=$username', {});
@@ -46,7 +71,7 @@ class RelationshipProvider extends GetxController {
       throw RequestException(resp);
     }
 
-    return resp;
+    return Relationship.fromJson(resp.body);
   }
 
   Future<Response> handleRelation(
@@ -64,17 +89,17 @@ class RelationshipProvider extends GetxController {
     return resp;
   }
 
-  Future<Response> editRelation(Relationship relationship, int status) async {
+  Future<Relationship?> editRelation(int relatedId, int status) async {
     final AuthProvider auth = Get.find();
     final client = await auth.configureClient('auth');
-    final resp = await client.patch(
-      '/users/me/relations/${relationship.relatedId}',
+    final resp = await client.put(
+      '/users/me/relations/$relatedId',
       {'status': status},
     );
     if (resp.statusCode != 200) {
       throw RequestException(resp);
     }
 
-    return resp;
+    return Relationship.fromJson(resp.body);
   }
 }

lib/screens/account/profile_page.dart

@@ -13,6 +13,7 @@ import 'package:solian/models/attachment.dart';
 import 'package:solian/models/daily_sign.dart';
 import 'package:solian/models/pagination.dart';
 import 'package:solian/models/post.dart';
+import 'package:solian/models/relations.dart';
 import 'package:solian/models/subscription.dart';
 import 'package:solian/providers/account_status.dart';
 import 'package:solian/providers/relation.dart';
@@ -26,6 +27,7 @@ import 'package:solian/widgets/attachments/attachment_list.dart';
 import 'package:solian/widgets/daily_sign/history_chart.dart';
 import 'package:solian/widgets/posts/post_list.dart';
 import 'package:solian/widgets/posts/post_warped_list.dart';
+import 'package:solian/widgets/reports/abuse_report.dart';
 import 'package:solian/widgets/sized_container.dart';
 
 class AccountProfilePage extends StatefulWidget {
@@ -50,6 +52,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
 
   Account? _userinfo;
   Subscription? _subscription;
+  Relationship? _relationship;
   List<Post> _pinnedPosts = List.empty();
   List<DailySignRecord> _dailySignRecords = List.empty();
   int _totalUpvote = 0, _totalDownvote = 0;
@@ -61,6 +64,15 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     setState(() => _isSubscribing = false);
   }
 
+  Future<void> _getRelationship() async {
+    setState(() => _isBusy = true);
+
+    final relations = Get.find<RelationshipProvider>();
+    _relationship = await relations.getRelationship(_userinfo!.id);
+
+    setState(() => _isBusy = false);
+  }
+
   Future<void> _getUserinfo() async {
     setState(() => _isBusy = true);
 
@@ -120,6 +132,63 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     }
   }
 
+  Future<void> _subscribeToUser() async {
+    setState(() => _isSubscribing = true);
+    _subscription =
+        await Get.find<SubscriptionProvider>().subscribeToUser(_userinfo!.id);
+    setState(() => _isSubscribing = false);
+  }
+
+  Future<void> _unsubscribeFromUser() async {
+    setState(() => _isSubscribing = true);
+    await Get.find<SubscriptionProvider>().unsubscribeFromUser(_userinfo!.id);
+    _subscription = null;
+    setState(() => _isSubscribing = false);
+  }
+
+  Future<void> _makeFriend() async {
+    setState(() => _isMakingFriend = true);
+    try {
+      _relationship = await _relationshipProvider.makeFriend(widget.name);
+      context.showSnackbar(
+        'accountFriendRequestSent'.tr,
+      );
+    } catch (e) {
+      context.showErrorDialog(e);
+    } finally {
+      setState(() => _isMakingFriend = false);
+    }
+  }
+
+  Future<void> _blockUser() async {
+    setState(() => _isMakingFriend = true);
+    try {
+      _relationship = await _relationshipProvider.blockUser(widget.name);
+      context.showSnackbar(
+        'accountBlocked'.tr,
+      );
+    } catch (e) {
+      context.showErrorDialog(e);
+    } finally {
+      setState(() => _isMakingFriend = false);
+    }
+  }
+
+  Future<void> _unblockUser() async {
+    setState(() => _isMakingFriend = true);
+    try {
+      _relationship =
+          await _relationshipProvider.editRelation(_userinfo!.id, 1);
+      context.showSnackbar(
+        'accountUnblocked'.tr,
+      );
+    } catch (e) {
+      context.showErrorDialog(e);
+    } finally {
+      setState(() => _isMakingFriend = false);
+    }
+  }
+
   int get _userSocialCreditPoints {
     return _totalUpvote * 2 - _totalDownvote + _postController.postTotal.value;
   }
@@ -151,29 +220,13 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     });
 
     _getUserinfo().then((_) {
+      _getRelationship();
       _getSubscription();
       _getPinnedPosts();
       _getDailySignRecords();
     });
   }
 
-  Widget _buildStatisticsEntry(String label, String content) {
-    return Expanded(
-      child: Column(
-        children: [
-          Text(
-            label,
-            style: Theme.of(context).textTheme.bodySmall,
-          ),
-          Text(
-            content,
-            style: Theme.of(context).textTheme.bodyLarge,
-          ),
-        ],
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     if (_isBusy || _userinfo == null) {
@@ -221,59 +274,31 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                         ),
                       ),
                       if (_userinfo != null && _subscription == null)
-                        OutlinedButton(
+                        IconButton(
                           style: const ButtonStyle(
                             visualDensity:
                                 VisualDensity(horizontal: -4, vertical: -2),
                           ),
-                          onPressed: _isSubscribing
-                              ? null
-                              : () async {
-                                  setState(() => _isSubscribing = true);
-                                  _subscription =
-                                      await Get.find<SubscriptionProvider>()
-                                          .subscribeToUser(_userinfo!.id);
-                                  setState(() => _isSubscribing = false);
-                                },
-                          child: Text('subscribe'.tr),
+                          onPressed: _isSubscribing ? null : _subscribeToUser,
+                          icon: const Icon(Icons.add_circle_outline),
+                          tooltip: 'subscribe'.tr,
                         )
                       else if (_userinfo != null)
-                        OutlinedButton(
+                        IconButton(
                           style: const ButtonStyle(
                             visualDensity:
                                 VisualDensity(horizontal: -4, vertical: -2),
                           ),
-                          onPressed: _isSubscribing
-                              ? null
-                              : () async {
-                                  setState(() => _isSubscribing = true);
-                                  await Get.find<SubscriptionProvider>()
-                                      .unsubscribeFromUser(_userinfo!.id);
-                                  _subscription = null;
-                                  setState(() => _isSubscribing = false);
-                                },
-                          child: Text('unsubscribe'.tr),
+                          onPressed:
+                              _isSubscribing ? null : _unsubscribeFromUser,
+                          icon: const Icon(Icons.remove_circle_outline),
+                          tooltip: 'unsubscribe'.tr,
                         ),
-                      if (_userinfo != null &&
-                          !_relationshipProvider.hasFriend(_userinfo!))
+                      if (_userinfo != null && _relationship == null)
                         IconButton(
                           icon: const Icon(Icons.person_add),
-                          onPressed: _isMakingFriend
-                              ? null
-                              : () async {
-                                  setState(() => _isMakingFriend = true);
-                                  try {
-                                    await _relationshipProvider
-                                        .makeFriend(widget.name);
-                                    context.showSnackbar(
-                                      'accountFriendRequestSent'.tr,
-                                    );
-                                  } catch (e) {
-                                    context.showErrorDialog(e);
-                                  } finally {
-                                    setState(() => _isMakingFriend = false);
-                                  }
-                                },
+                          onPressed: _isMakingFriend ? null : _makeFriend,
+                          tooltip: 'friendAdd'.tr,
                         )
                       else
                         const IconButton(
@@ -300,8 +325,8 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
             physics: const NeverScrollableScrollPhysics(),
             children: [
               ListView(
+                padding: const EdgeInsets.only(top: 16, bottom: 16),
                 children: [
-                  const Gap(16),
                   CenteredContainer(
                     child: AccountHeadingWidget(
                       name: _userinfo!.name,
@@ -421,9 +446,82 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                                 ),
                               ),
                             ).marginOnly(
-                                right: 24, left: 12, bottom: 8, top: 24),
+                              right: 24,
+                              left: 12,
+                              bottom: 8,
+                              top: 24,
+                            ),
                           )
                       ],
+                      appendWidgets: [
+                        Card(
+                          child: Container(
+                            padding: const EdgeInsets.symmetric(
+                              vertical: 4,
+                              horizontal: 8,
+                            ),
+                            width: double.maxFinite,
+                            child: Wrap(
+                              alignment: WrapAlignment.spaceAround,
+                              children: [
+                                TextButton.icon(
+                                  style: const ButtonStyle(
+                                    visualDensity: VisualDensity(
+                                      horizontal: -4,
+                                      vertical: -2,
+                                    ),
+                                  ),
+                                  onPressed: () {
+                                    showDialog(
+                                      context: context,
+                                      builder: (context) => AbuseReportDialog(
+                                        resourceId: 'user:${_userinfo!.id}',
+                                      ),
+                                    );
+                                  },
+                                  icon: const Icon(
+                                    Icons.flag,
+                                    size: 16,
+                                  ),
+                                  label: Text('reportAbuse'.tr),
+                                ),
+                                if (_relationship?.status != 2)
+                                  TextButton.icon(
+                                    style: const ButtonStyle(
+                                      visualDensity: VisualDensity(
+                                        horizontal: -4,
+                                        vertical: -2,
+                                      ),
+                                    ),
+                                    onPressed:
+                                        _isMakingFriend ? null : _blockUser,
+                                    icon: const Icon(
+                                      Icons.block,
+                                      size: 16,
+                                    ),
+                                    label: Text('blockUser'.tr),
+                                  )
+                                else
+                                  TextButton.icon(
+                                    style: const ButtonStyle(
+                                      visualDensity: VisualDensity(
+                                        horizontal: -4,
+                                        vertical: -2,
+                                      ),
+                                    ),
+                                    onPressed:
+                                        _isMakingFriend ? null : _unblockUser,
+                                    icon: const Icon(
+                                      Icons.add_circle_outline,
+                                      size: 16,
+                                    ),
+                                    label: Text('unblockUser'.tr),
+                                  ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ],
                     ),
                   ),
                 ],
@@ -440,7 +538,7 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                         Row(
                           mainAxisAlignment: MainAxisAlignment.spaceAround,
                           children: [
-                            _buildStatisticsEntry(
+                            _StatsWidget(
                               'totalSocialCreditPoints'.tr,
                               _userinfo != null
                                   ? _userSocialCreditPoints.toString()
@@ -453,16 +551,16 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
                           mainAxisAlignment: MainAxisAlignment.spaceAround,
                           children: [
                             Obx(
-                              () => _buildStatisticsEntry(
+                              () => _StatsWidget(
                                 'totalPostCount'.tr,
                                 _postController.postTotal.value.toString(),
                               ),
                             ),
-                            _buildStatisticsEntry(
+                            _StatsWidget(
                               'totalUpvote'.tr,
                               _totalUpvote.toString(),
                             ),
-                            _buildStatisticsEntry(
+                            _StatsWidget(
                               'totalDownvote'.tr,
                               _totalDownvote.toString(),
                             ),
@@ -560,3 +658,28 @@ class _AccountProfilePageState extends State<AccountProfilePage> {
     );
   }
 }
+
+class _StatsWidget extends StatelessWidget {
+  final String label;
+  final String content;
+
+  const _StatsWidget(this.label, this.content);
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Column(
+        children: [
+          Text(
+            label,
+            style: Theme.of(context).textTheme.bodySmall,
+          ),
+          Text(
+            content,
+            style: Theme.of(context).textTheme.bodyLarge,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/channel/channel_chat.dart

@@ -201,9 +201,10 @@ class _ChannelChatScreenState extends State<ChannelChatScreen>
     String title = _channel?.name ?? 'loading'.tr;
     String? placeholder;
 
-    if (_channel?.type == 1) {
-      final otherside =
-          _channel!.members!.where((e) => e.account.id != _accountId).first;
+    final otherside =
+        _channel?.members!.where((e) => e.account.id != _accountId).firstOrNull;
+
+    if (_channel?.type == 1 && otherside != null) {
       title = otherside.account.nick;
       placeholder = 'messageInputPlaceholder'.trParams(
         {'channel': '@${otherside.account.name}'},

lib/screens/chat.dart

@@ -131,7 +131,7 @@ class _ChatScreenState extends State<ChatScreen> {
                           ..._channels.directChannels
                         ]),
                         selfId: selfId,
-                        useReplace: true,
+                        useReplace: false,
                       ),
                     ),
                   ),

lib/screens/explore.dart

@@ -83,7 +83,7 @@ class _ExploreScreenState extends State<ExploreScreen>
             return [
               SliverAppBar(
                 title: AppBarTitle('explore'.tr),
-                centerTitle: false,
+                centerTitle: true,
                 floating: true,
                 toolbarHeight: AppTheme.toolbarHeight(context),
                 leading: AppBarLeadingButton.adaptive(context),

lib/shells/root_shell.dart

@@ -2,7 +2,8 @@ import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:solian/theme.dart';
-import 'package:solian/widgets/navigation/app_navigation_drawer.dart';
+import 'package:solian/widgets/navigation/app_navigation.dart';
+import 'package:solian/widgets/navigation/app_navigation_bottom.dart';
 
 final GlobalKey<ScaffoldState> rootScaffoldKey = GlobalKey<ScaffoldState>();
 
@@ -39,17 +40,19 @@ class RootShell extends StatelessWidget {
       );
     }
 
+    final destNames = AppNavigation.destinations.map((x) => x.page).toList();
+    final showBottomNavigation = destNames.contains(routeName);
+
     return Scaffold(
       key: rootScaffoldKey,
-      drawer: AppTheme.isLargeScreen(context)
-          ? null
-          : AppNavigationDrawer(routeName: routeName),
+      bottomNavigationBar: showBottomNavigation
+          ? AppNavigationBottom(
+              initialIndex: destNames.indexOf(routeName ?? 'page'),
+            )
+          : null,
       body: AppTheme.isLargeScreen(context)
           ? Row(
               children: [
-                if (showNavigation) AppNavigationDrawer(routeName: routeName),
-                if (showNavigation)
-                  const VerticalDivider(thickness: 0.3, width: 1),
                 Expanded(child: child),
               ],
             )

lib/widgets/account/account_heading.dart

@@ -23,6 +23,7 @@ class AccountHeadingWidget extends StatelessWidget {
   final AccountProfile? profile;
   final List<AccountBadge>? badges;
   final List<Widget>? extraWidgets;
+  final List<Widget>? appendWidgets;
 
   final Future<Response>? status;
   final Function? onEditStatus;
@@ -39,6 +40,7 @@ class AccountHeadingWidget extends StatelessWidget {
     this.profile,
     this.status,
     this.extraWidgets,
+    this.appendWidgets,
     this.onEditStatus,
   });
 
@@ -257,6 +259,7 @@ class AccountHeadingWidget extends StatelessWidget {
               ),
             ),
           ).paddingSymmetric(horizontal: 16),
+          ...?appendWidgets?.map((x) => x.paddingSymmetric(horizontal: 16)),
         ],
       ),
     );

lib/widgets/account/account_profile_popup.dart

@@ -106,10 +106,14 @@ class _AccountProfilePopupState extends State<AccountProfilePopup> {
             extraWidgets: [
               Card(
                 child: ListTile(
+                  leading: const Icon(
+                    Icons.contact_page_outlined,
+                  ),
                   shape: const RoundedRectangleBorder(
                     borderRadius: BorderRadius.all(Radius.circular(8)),
                   ),
                   title: Text('visitProfilePage'.tr),
+                  subtitle: Text('learnMoreAboutPerson'.tr),
                   visualDensity:
                       const VisualDensity(horizontal: -4, vertical: -2),
                   trailing: const Icon(Icons.chevron_right),

lib/widgets/account/relative_list.dart

@@ -28,42 +28,46 @@ class SilverRelativeList extends StatelessWidget {
           showModalBottomSheet(
             useRootNavigator: true,
             isScrollControlled: true,
-            backgroundColor: Theme
-                .of(context)
-                .colorScheme
-                .surface,
+            backgroundColor: Theme.of(context).colorScheme.surface,
             context: context,
-            builder: (context) =>
-                AccountProfilePopup(
-                  name: element.related.name,
-                ),
+            builder: (context) => AccountProfilePopup(
+              name: element.related.name,
+            ),
           );
         },
       ),
       trailing: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          if(element.status != 1 && element.status != 3)
+          if (element.status != 1 && element.status != 3)
             IconButton(
               icon: const Icon(Icons.check),
               onPressed: () {
                 final RelationshipProvider provider = Get.find();
                 if (element.status == 0) {
-                  provider.handleRelation(element, true).then((_) => onUpdate());
+                  provider
+                      .handleRelation(element, true)
+                      .then((_) => onUpdate());
                 } else {
-                  provider.editRelation(element, 1).then((_) => onUpdate());
+                  provider
+                      .editRelation(element.relatedId, 1)
+                      .then((_) => onUpdate());
                 }
               },
             ),
-          if(element.status != 2 && element.status != 3)
+          if (element.status != 2 && element.status != 3)
             IconButton(
               icon: const Icon(Icons.close),
               onPressed: () {
                 final RelationshipProvider provider = Get.find();
                 if (element.status == 0) {
-                  provider.handleRelation(element, false).then((_) => onUpdate());
+                  provider
+                      .handleRelation(element, false)
+                      .then((_) => onUpdate());
                 } else {
-                  provider.editRelation(element, 2).then((_) => onUpdate());
+                  provider
+                      .editRelation(element.relatedId, 2)
+                      .then((_) => onUpdate());
                 }
               },
             ),

lib/widgets/attachments/attachment_editor.dart

@@ -744,8 +744,8 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
               return IgnorePointer(
                 ignoring: _uploadController.isUploading.value,
                 child: Container(
-                  height: 64,
                   width: MediaQuery.of(context).size.width,
+                  padding: const EdgeInsets.all(8),
                   decoration: BoxDecoration(
                     border: Border(
                       top: BorderSide(
@@ -754,67 +754,72 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
                       ),
                     ),
                   ),
-                  child: SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Wrap(
-                      spacing: 8,
-                      runSpacing: 0,
-                      alignment: WrapAlignment.center,
-                      runAlignment: WrapAlignment.center,
-                      children: [
-                        if ((PlatformInfo.isDesktop ||
-                                PlatformInfo.isIOS ||
-                                PlatformInfo.isWeb) &&
-                            !widget.imageOnly)
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.paste),
-                            label: Text('attachmentAddClipboard'.tr),
-                            style: const ButtonStyle(visualDensity: density),
-                            onPressed: () => _pasteFileToUpload(),
-                          ),
-                        ElevatedButton.icon(
-                          icon: const Icon(Icons.add_photo_alternate),
-                          label: Text('attachmentAddGalleryPhoto'.tr),
+                  child: Wrap(
+                    spacing: 8,
+                    runSpacing: 8,
+                    alignment: WrapAlignment.center,
+                    runAlignment: WrapAlignment.center,
+                    children: [
+                      if ((PlatformInfo.isDesktop ||
+                              PlatformInfo.isIOS ||
+                              PlatformInfo.isWeb) &&
+                          !widget.imageOnly)
+                        IconButton(
+                          icon: const Icon(Icons.paste),
+                          tooltip: 'attachmentAddClipboard'.tr,
                           style: const ButtonStyle(visualDensity: density),
-                          onPressed: () => _pickPhotoToUpload(),
+                          color: Theme.of(context).colorScheme.primary,
+                          onPressed: () => _pasteFileToUpload(),
                         ),
-                        if (!widget.imageOnly)
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.add_road),
-                            label: Text('attachmentAddGalleryVideo'.tr),
-                            style: const ButtonStyle(visualDensity: density),
-                            onPressed: () => _pickVideoToUpload(),
-                          ),
-                        ElevatedButton.icon(
-                          icon: const Icon(Icons.photo_camera_back),
-                          label: Text('attachmentAddCameraPhoto'.tr),
+                      IconButton(
+                        icon: const Icon(Icons.add_photo_alternate),
+                        tooltip: 'attachmentAddGalleryPhoto'.tr,
+                        style: const ButtonStyle(visualDensity: density),
+                        color: Theme.of(context).colorScheme.primary,
+                        onPressed: () => _pickPhotoToUpload(),
+                      ),
+                      if (!widget.imageOnly)
+                        IconButton(
+                          icon: const Icon(Icons.add_road),
+                          tooltip: 'attachmentAddGalleryVideo'.tr,
                           style: const ButtonStyle(visualDensity: density),
+                          color: Theme.of(context).colorScheme.primary,
+                          onPressed: () => _pickVideoToUpload(),
+                        ),
+                      if (PlatformInfo.isMobile)
+                        IconButton(
+                          icon: const Icon(Icons.photo_camera_back),
+                          tooltip: 'attachmentAddCameraPhoto'.tr,
+                          style: const ButtonStyle(visualDensity: density),
+                          color: Theme.of(context).colorScheme.primary,
                           onPressed: () => _takeMediaToUpload(false),
                         ),
-                        if (!widget.imageOnly)
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.video_camera_back_outlined),
-                            label: Text('attachmentAddCameraVideo'.tr),
-                            style: const ButtonStyle(visualDensity: density),
-                            onPressed: () => _takeMediaToUpload(true),
-                          ),
-                        if (!widget.imageOnly)
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.file_present_rounded),
-                            label: Text('attachmentAddFile'.tr),
-                            style: const ButtonStyle(visualDensity: density),
-                            onPressed: () => _pickFileToUpload(),
-                          ),
-                        if (!widget.imageOnly)
-                          ElevatedButton.icon(
-                            icon: const Icon(Icons.link),
-                            label: Text('attachmentAddFile'.tr),
-                            style: const ButtonStyle(visualDensity: density),
-                            onPressed: () => _linkAttachments(),
-                          ),
-                      ],
-                    ).paddingSymmetric(horizontal: 12),
-                  ),
+                      if (!widget.imageOnly && PlatformInfo.isMobile)
+                        IconButton(
+                          icon: const Icon(Icons.video_camera_back_outlined),
+                          tooltip: 'attachmentAddCameraVideo'.tr,
+                          style: const ButtonStyle(visualDensity: density),
+                          color: Theme.of(context).colorScheme.primary,
+                          onPressed: () => _takeMediaToUpload(true),
+                        ),
+                      if (!widget.imageOnly)
+                        IconButton(
+                          icon: const Icon(Icons.file_present_rounded),
+                          tooltip: 'attachmentAddFile'.tr,
+                          style: const ButtonStyle(visualDensity: density),
+                          color: Theme.of(context).colorScheme.primary,
+                          onPressed: () => _pickFileToUpload(),
+                        ),
+                      if (!widget.imageOnly)
+                        IconButton(
+                          icon: const Icon(Icons.link),
+                          tooltip: 'attachmentAddLink'.tr,
+                          style: const ButtonStyle(visualDensity: density),
+                          color: Theme.of(context).colorScheme.primary,
+                          onPressed: () => _linkAttachments(),
+                        ),
+                    ],
+                  ).paddingSymmetric(horizontal: 12),
                 )
                     .animate(
                       target: _uploadController.isUploading.value ? 0 : 1,

lib/widgets/channel/channel_list.dart

@@ -132,10 +132,10 @@ class _ChannelListWidgetState extends State<ChannelListWidget> {
         ? const EdgeInsets.symmetric(horizontal: 20)
         : const EdgeInsets.symmetric(horizontal: 16);
 
-    if (item.type == 1) {
-      final otherside =
-          item.members!.where((e) => e.account.id != widget.selfId).first;
+    final otherside =
+        item.members!.where((e) => e.account.id != widget.selfId).firstOrNull;
 
+    if (item.type == 1 && otherside != null) {
       final avatar = AccountAvatar(
         content: otherside.account.avatar,
         radius: widget.isDense ? 12 : 20,

lib/widgets/navigation/app_account_widget.dart

@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:solian/models/account_status.dart';
+import 'package:solian/providers/account_status.dart';
+import 'package:solian/providers/auth.dart';
+import 'package:solian/providers/relation.dart';
+import 'package:badges/badges.dart' as badges;
+import 'package:solian/widgets/account/account_avatar.dart';
+
+class AppAccountWidget extends StatefulWidget {
+  const AppAccountWidget({super.key});
+
+  @override
+  State<AppAccountWidget> createState() => _AppAccountWidgetState();
+}
+
+class _AppAccountWidgetState extends State<AppAccountWidget> {
+  AccountStatus? _accountStatus;
+
+  Future<void> _getStatus() async {
+    final StatusProvider provider = Get.find();
+
+    final resp = await provider.getCurrentStatus();
+    final status = AccountStatus.fromJson(resp.body);
+
+    if (mounted) {
+      setState(() {
+        _accountStatus = status;
+      });
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _getStatus();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final AuthProvider auth = Get.find();
+
+    return Obx(() {
+      if (auth.isAuthorized.isFalse || auth.userProfile.value == null) {
+        return const Icon(Icons.account_circle);
+      }
+
+      final statusBadgeColor = _accountStatus != null
+          ? StatusProvider.determineStatus(_accountStatus!).$2
+          : Colors.grey;
+
+      final RelationshipProvider relations = Get.find();
+      final accountNotifications = relations.friendRequestCount.value;
+
+      return badges.Badge(
+        badgeContent: Text(
+          accountNotifications.toString(),
+          style: const TextStyle(color: Colors.white),
+        ),
+        showBadge: accountNotifications > 0,
+        position: badges.BadgePosition.topEnd(
+          top: -10,
+          end: -6,
+        ),
+        child: badges.Badge(
+          showBadge: _accountStatus != null,
+          badgeStyle: badges.BadgeStyle(badgeColor: statusBadgeColor),
+          position: badges.BadgePosition.bottomEnd(
+            bottom: 0,
+            end: -2,
+          ),
+          child: AccountAvatar(
+            radius: 14,
+            content: auth.userProfile.value!['avatar'],
+          ),
+        ),
+      );
+    });
+  }
+}

lib/widgets/navigation/app_navigation.dart

@@ -1,28 +1,34 @@
 import 'package:flutter/material.dart';
 import 'package:get/utils.dart';
+import 'package:solian/widgets/navigation/app_account_widget.dart';
 
 abstract class AppNavigation {
   static List<AppNavigationDestination> destinations = [
     AppNavigationDestination(
-      icon: Icons.dashboard,
+      icon: const Icon(Icons.dashboard),
       label: 'dashboard'.tr,
       page: 'dashboard',
     ),
     AppNavigationDestination(
-      icon: Icons.explore,
+      icon: const Icon(Icons.explore),
       label: 'explore'.tr,
       page: 'explore',
     ),
     AppNavigationDestination(
-      icon: Icons.workspaces,
+      icon: const Icon(Icons.workspaces),
       label: 'realms'.tr,
       page: 'realms',
     ),
     AppNavigationDestination(
-      icon: Icons.forum,
+      icon: const Icon(Icons.forum),
       label: 'chat'.tr,
       page: 'chat',
     ),
+    AppNavigationDestination(
+      icon: const AppAccountWidget(),
+      label: 'account'.tr,
+      page: 'account',
+    ),
   ];
 
   static List<String> get destinationPages =>
@@ -30,7 +36,7 @@ abstract class AppNavigation {
 }
 
 class AppNavigationDestination {
-  final IconData icon;
+  final Widget icon;
   final String label;
   final String page;
 

lib/widgets/navigation/app_navigation_bottom.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:solian/router.dart';
+import 'package:solian/widgets/navigation/app_navigation.dart';
+
+class AppNavigationBottom extends StatefulWidget {
+  final int initialIndex;
+
+  const AppNavigationBottom({super.key, this.initialIndex = 0});
+
+  @override
+  State<AppNavigationBottom> createState() => _AppNavigationBottomState();
+}
+
+class _AppNavigationBottomState extends State<AppNavigationBottom> {
+  int _currentIndex = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.initialIndex >= 0) {
+      _currentIndex = widget.initialIndex;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BottomNavigationBar(
+      currentIndex: _currentIndex,
+      type: BottomNavigationBarType.fixed,
+      showUnselectedLabels: false,
+      showSelectedLabels: false,
+      landscapeLayout: BottomNavigationBarLandscapeLayout.centered,
+      items: AppNavigation.destinations
+          .map(
+            (x) => BottomNavigationBarItem(
+              icon: x.icon,
+              label: x.label,
+            ),
+          )
+          .toList(),
+      onTap: (idx) {
+        setState(() => _currentIndex = idx);
+        AppRouter.instance.goNamed(AppNavigation.destinations[idx].page);
+      },
+    );
+  }
+}

lib/widgets/navigation/app_navigation_drawer.dart

@@ -1,330 +0,0 @@
-import 'dart:math' as math;
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:solian/models/account_status.dart';
-import 'package:solian/providers/account_status.dart';
-import 'package:solian/providers/auth.dart';
-import 'package:solian/providers/relation.dart';
-import 'package:solian/router.dart';
-import 'package:solian/shells/root_shell.dart';
-import 'package:solian/theme.dart';
-import 'package:solian/widgets/account/account_avatar.dart';
-import 'package:solian/widgets/account/account_status_action.dart';
-import 'package:solian/widgets/navigation/app_navigation.dart';
-import 'package:badges/badges.dart' as badges;
-import 'package:solian/widgets/navigation/app_navigation_region.dart';
-
-class AppNavigationDrawer extends StatefulWidget {
-  final String? routeName;
-
-  const AppNavigationDrawer({super.key, this.routeName});
-
-  @override
-  State<AppNavigationDrawer> createState() => _AppNavigationDrawerState();
-}
-
-class _AppNavigationDrawerState extends State<AppNavigationDrawer>
-    with TickerProviderStateMixin {
-  bool _isCollapsed = true;
-
-  late final AnimationController _drawerAnimationController =
-      AnimationController(
-    duration: const Duration(milliseconds: 500),
-    vsync: this,
-  );
-  late final Animation<double> _drawerAnimation = Tween<double>(
-    begin: 80.0,
-    end: 304.0,
-  ).animate(CurvedAnimation(
-    parent: _drawerAnimationController,
-    curve: Curves.easeInOut,
-  ));
-
-  AccountStatus? _accountStatus;
-
-  Future<void> _getStatus() async {
-    final StatusProvider provider = Get.find();
-
-    final resp = await provider.getCurrentStatus();
-    final status = AccountStatus.fromJson(resp.body);
-
-    if (mounted) {
-      setState(() {
-        _accountStatus = status;
-      });
-    }
-  }
-
-  Color get _unFocusColor =>
-      Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
-
-  Widget _buildUserInfo() {
-    return Obx(() {
-      final AuthProvider auth = Get.find();
-      if (auth.isAuthorized.isFalse || auth.userProfile.value == null) {
-        if (_isCollapsed) {
-          return InkWell(
-            child: const Icon(Icons.account_circle).paddingSymmetric(
-              horizontal: 28,
-              vertical: 20,
-            ),
-            onTap: () {
-              AppRouter.instance.goNamed('account');
-              _closeDrawer();
-            },
-          );
-        }
-
-        return ListTile(
-          contentPadding: const EdgeInsets.symmetric(horizontal: 28),
-          leading: const Icon(Icons.account_circle),
-          title: !_isCollapsed ? Text('guest'.tr) : null,
-          subtitle: !_isCollapsed ? Text('unsignedIn'.tr) : null,
-          onTap: () {
-            AppRouter.instance.goNamed('account');
-            _closeDrawer();
-          },
-        );
-      }
-
-      final leading = Obx(() {
-        final statusBadgeColor = _accountStatus != null
-            ? StatusProvider.determineStatus(_accountStatus!).$2
-            : Colors.grey;
-
-        final RelationshipProvider relations = Get.find();
-        final accountNotifications = relations.friendRequestCount.value;
-
-        return badges.Badge(
-          badgeContent: Text(
-            accountNotifications.toString(),
-            style: const TextStyle(color: Colors.white),
-          ),
-          showBadge: accountNotifications > 0,
-          position: badges.BadgePosition.topEnd(
-            top: -10,
-            end: -6,
-          ),
-          child: badges.Badge(
-            showBadge: _accountStatus != null,
-            badgeStyle: badges.BadgeStyle(badgeColor: statusBadgeColor),
-            position: badges.BadgePosition.bottomEnd(
-              bottom: 0,
-              end: -2,
-            ),
-            child: AccountAvatar(
-              content: auth.userProfile.value!['avatar'],
-            ),
-          ),
-        );
-      });
-
-      return InkWell(
-        child: !_isCollapsed
-            ? Row(
-                children: [
-                  leading,
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          auth.userProfile.value!['nick'],
-                          maxLines: 1,
-                          overflow: TextOverflow.fade,
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ).paddingOnly(left: 16),
-                        Builder(
-                          builder: (context) {
-                            if (_accountStatus == null) {
-                              return Text(
-                                'loading'.tr,
-                                maxLines: 1,
-                                overflow: TextOverflow.fade,
-                                style: TextStyle(
-                                  color: _unFocusColor,
-                                ),
-                              ).paddingOnly(left: 16);
-                            }
-                            final info = StatusProvider.determineStatus(
-                              _accountStatus!,
-                            );
-                            return Text(
-                              info.$3,
-                              maxLines: 1,
-                              overflow: TextOverflow.fade,
-                              style: TextStyle(
-                                color: _unFocusColor,
-                              ),
-                            ).paddingOnly(left: 16);
-                          },
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ).paddingSymmetric(horizontal: 20, vertical: 16)
-            : leading.paddingSymmetric(horizontal: 20, vertical: 16),
-        onTap: () {
-          AppRouter.instance.goNamed('account');
-          _closeDrawer();
-        },
-        onLongPress: () {
-          showModalBottomSheet(
-            useRootNavigator: true,
-            context: context,
-            builder: (context) => AccountStatusAction(
-              currentStatus: _accountStatus!.status,
-            ),
-          ).then((val) {
-            if (val == true) _getStatus();
-          });
-        },
-      );
-    });
-  }
-
-  void _expandDrawer() {
-    _drawerAnimationController.animateTo(1);
-  }
-
-  void _collapseDrawer() {
-    _drawerAnimationController.animateTo(0);
-  }
-
-  void _closeDrawer() {
-    _autoResize();
-    rootScaffoldKey.currentState!.closeDrawer();
-  }
-
-  void _autoResize() {
-    if (AppTheme.isExtraLargeScreen(context)) {
-      _expandDrawer();
-    } else if (AppTheme.isLargeScreen(context)) {
-      _collapseDrawer();
-    } else {
-      _drawerAnimationController.value = 1;
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    final AuthProvider auth = Get.find();
-    if (auth.isAuthorized.value) _getStatus();
-    Future.delayed(Duration.zero, () => _autoResize());
-    _drawerAnimationController.addListener(() {
-      if (_drawerAnimation.value > 180 && _isCollapsed) {
-        setState(() => _isCollapsed = false);
-      } else if (_drawerAnimation.value < 180 && !_isCollapsed) {
-        setState(() => _isCollapsed = true);
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _drawerAnimationController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _drawerAnimation,
-      builder: (context, child) {
-        return Drawer(
-          width: _drawerAnimation.value,
-          backgroundColor:
-              AppTheme.isLargeScreen(context) ? Colors.transparent : null,
-          child: child,
-        );
-      },
-      child: SafeArea(
-        bottom: false,
-        child: Column(
-          children: [
-            _buildUserInfo().paddingSymmetric(vertical: 8),
-            const Divider(thickness: 0.3, height: 1),
-            SizedBox(
-              width: double.infinity,
-              child: Wrap(
-                runSpacing: 8,
-                spacing: 8,
-                alignment: WrapAlignment.spaceAround,
-                children: AppNavigation.destinations
-                    .map(
-                      (e) => Tooltip(
-                        message: e.label,
-                        child: InkWell(
-                          borderRadius:
-                              const BorderRadius.all(Radius.circular(8)),
-                          child: Icon(
-                            e.icon,
-                            size: 22,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ).paddingAll(16),
-                          onTap: () {
-                            AppRouter.instance.goNamed(e.page);
-                            _closeDrawer();
-                          },
-                        ),
-                      ),
-                    )
-                    .toList(),
-              ).paddingSymmetric(vertical: 8, horizontal: 12),
-            ),
-            const Divider(thickness: 0.3, height: 1),
-            Expanded(
-              child: Material(
-                color: Theme.of(context).colorScheme.surface,
-                child: AppNavigationRegion(
-                  isCollapsed: _isCollapsed,
-                  onSelected: () {
-                    _closeDrawer();
-                  },
-                ),
-              ),
-            ),
-            const Divider(thickness: 0.3, height: 1),
-            Column(
-              children: [
-                if (_isCollapsed)
-                  Tooltip(
-                    message: 'expand'.tr,
-                    child: InkWell(
-                      child: const Icon(Icons.chevron_right, size: 20)
-                          .paddingSymmetric(
-                        horizontal: 28,
-                        vertical: 10,
-                      ),
-                      onTap: () {
-                        _expandDrawer();
-                      },
-                    ),
-                  )
-                else
-                  ListTile(
-                    minTileHeight: 0,
-                    contentPadding: const EdgeInsets.symmetric(
-                      horizontal: 20,
-                    ),
-                    leading:
-                        const Icon(Icons.chevron_left, size: 20).paddingAll(2),
-                    title: Text('collapse'.tr),
-                    onTap: () {
-                      _collapseDrawer();
-                    },
-                  ),
-              ],
-            ).paddingOnly(
-              top: 8,
-              bottom: math.max(8, MediaQuery.of(context).padding.bottom),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

macos/Runner/DebugProfile.entitlements

@@ -12,8 +12,6 @@
 	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
-	<key>com.apple.security.device.bluetooth</key>
-	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-only</key>

macos/Runner/Release.entitlements

@@ -10,8 +10,6 @@
 	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
-	<key>com.apple.security.device.bluetooth</key>
-	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-only</key>

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.4+1
+version: 1.2.5+1
 
 environment:
   sdk: ">=3.3.4 <4.0.0"