🐛 Bug fixes

lib/router.dart

@@ -192,11 +192,6 @@ final _appRoutes = [
       child: const RealmScreen(),
     ),
     routes: [
-      GoRoute(
-        path: '/:alias',
-        name: 'realmDetail',
-        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
-      ),
       GoRoute(
         path: '/manage',
         name: 'realmManage',
@@ -204,6 +199,11 @@ final _appRoutes = [
           editingRealmAlias: state.uri.queryParameters['editing'],
         ),
       ),
+      GoRoute(
+        path: '/:alias',
+        name: 'realmDetail',
+        builder: (context, state) => RealmDetailScreen(alias: state.pathParameters['alias']!),
+      ),
     ],
   ),
   GoRoute(path: '/news', name: 'news', builder: (context, state) => const NewsScreen(), routes: [

lib/screens/chat/manage.dart

@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -17,6 +18,7 @@ import 'package:uuid/uuid.dart';
 
 class ChatManageScreen extends StatefulWidget {
   final String? editingChannelAlias;
+
   const ChatManageScreen({super.key, this.editingChannelAlias});
 
   @override
@@ -33,6 +35,8 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
   List<SnRealm>? _realms;
   SnRealm? _belongToRealm;
 
+  SnChannel? _editingChannel;
+
   Future<void> _fetchRealms() async {
     setState(() => _isBusy = true);
     try {
@@ -41,6 +45,9 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
       _realms = List<SnRealm>.from(
         resp.data?.map((e) => SnRealm.fromJson(e)) ?? [],
       );
+      if (_editingChannel != null) {
+        _belongToRealm = _realms?.firstWhereOrNull((e) => e.id == _editingChannel!.realmId);
+      }
     } catch (err) {
       if (mounted) context.showErrorDialog(err);
     } finally {
@@ -48,8 +55,6 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
     }
   }
 
-  SnChannel? _editingChannel;
-
   Future<void> _fetchChannel() async {
     setState(() => _isBusy = true);
 
@@ -124,9 +129,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
   Widget build(BuildContext context) {
     return AppScaffold(
       appBar: AppBar(
-        title: widget.editingChannelAlias != null
+        title: widget.editingChannelAlias != null ? Text('screenChatManage').tr() : Text('screenChatNew').tr(),
-            ? Text('screenChatManage').tr()
-            : Text('screenChatNew').tr(),
       ),
       body: SingleChildScrollView(
         child: Column(
@@ -138,8 +141,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                 leadingPadding: const EdgeInsets.only(left: 10, right: 20),
                 dividerColor: Colors.transparent,
                 content: Text(
-                  'channelEditingNotice'
+                  'channelEditingNotice'.tr(args: ['#${_editingChannel!.alias}']),
-                      .tr(args: ['#${_editingChannel!.alias}']),
                 ),
                 actions: [
                   TextButton(
@@ -162,6 +164,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                 items: [
                   ...(_realms?.map(
                         (SnRealm item) => DropdownMenuItem<SnRealm>(
+                          enabled: _editingChannel == null || _editingChannel?.realmId == item.id,
                           value: item,
                           child: Row(
                             children: [
@@ -179,15 +182,12 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                                   mainAxisSize: MainAxisSize.min,
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
-                                    Text(item.name).textStyle(Theme.of(context)
+                                    Text(item.name).textStyle(Theme.of(context).textTheme.bodyMedium!),
-                                        .textTheme
-                                        .bodyMedium!),
                                     Text(
                                       item.description,
                                       maxLines: 1,
                                       overflow: TextOverflow.ellipsis,
-                                    ).textStyle(
+                                    ).textStyle(Theme.of(context).textTheme.bodySmall!),
-                                        Theme.of(context).textTheme.bodySmall!),
                                   ],
                                 ),
                               ),
@@ -197,14 +197,14 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                       ) ??
                       []),
                   DropdownMenuItem<SnRealm>(
+                    enabled: _editingChannel == null,
                     value: null,
                     child: Row(
                       children: [
                         CircleAvatar(
                           radius: 16,
                           backgroundColor: Colors.transparent,
-                          foregroundColor:
+                          foregroundColor: Theme.of(context).colorScheme.onSurface,
-                              Theme.of(context).colorScheme.onSurface,
                           child: const Icon(Symbols.clear),
                         ),
                         const Gap(12),
@@ -213,9 +213,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                             mainAxisSize: MainAxisSize.min,
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text('fieldChatBelongToRealmUnset')
+                              Text('fieldChatBelongToRealmUnset').tr().textStyle(
-                                  .tr()
-                                  .textStyle(
                                     Theme.of(context).textTheme.bodyMedium!,
                                   ),
                             ],
@@ -231,10 +229,10 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                 },
                 buttonStyleData: const ButtonStyleData(
                   padding: EdgeInsets.only(right: 16),
-                  height: 60,
+                  height: 48,
                 ),
                 menuItemStyleData: const MenuItemStyleData(
-                  height: 60,
+                  height: 48,
                 ),
               ),
             ),
@@ -250,8 +248,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     helperText: 'fieldChatAliasHint'.tr(),
                     helperMaxLines: 2,
                   ),
-                  onTapOutside: (_) =>
+                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(4),
                 TextField(
@@ -260,8 +257,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     border: const UnderlineInputBorder(),
                     labelText: 'fieldChatName'.tr(),
                   ),
-                  onTapOutside: (_) =>
+                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(4),
                 TextField(
@@ -272,8 +268,7 @@ class _ChatManageScreenState extends State<ChatManageScreen> {
                     border: const UnderlineInputBorder(),
                     labelText: 'fieldChatDescription'.tr(),
                   ),
-                  onTapOutside: (_) =>
+                  onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(),
-                      FocusManager.instance.primaryFocus?.unfocus(),
                 ),
                 const Gap(12),
                 Row(

lib/widgets/account/account_select.dart

@@ -6,6 +6,7 @@ import 'package:provider/provider.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/providers/user_directory.dart';
+import 'package:surface/providers/userinfo.dart';
 import 'package:surface/types/account.dart';
 import 'package:surface/widgets/account/account_image.dart';
 
@@ -49,10 +50,19 @@ class _AccountSelectState extends State<AccountSelect> {
   Future<void> _getFriends() async {
     final sn = context.read<SnNetworkProvider>();
     final resp = await sn.client.get('/cgi/id/users/me/relations?status=1');
+    if (!mounted) return;
+    final ua = context.read<UserProvider>();
 
     setState(() {
       _relativeUsers.addAll(
-        resp.data?.map((e) => SnRelationship.fromJson(e)) ?? [],
+        resp.data?.map((e) {
+          final rel = SnRelationship.fromJson(e);
+          if (rel.relatedId == ua.user?.id) {
+            return rel.account!;
+          } else {
+            return rel.related!;
+          }
+        }).cast<SnAccount>(),
       );
     });
   }
@@ -123,13 +133,9 @@ class _AccountSelectState extends State<AccountSelect> {
           ),
           Expanded(
             child: ListView.builder(
-              itemCount: _pendingUsers.isEmpty
+              itemCount: _pendingUsers.isEmpty ? _relativeUsers.length : _pendingUsers.length,
-                  ? _relativeUsers.length
-                  : _pendingUsers.length,
               itemBuilder: (context, index) {
-                var user = _pendingUsers.isEmpty
+                var user = _pendingUsers.isEmpty ? _relativeUsers[index] : _pendingUsers[index];
-                    ? _relativeUsers[index]
-                    : _pendingUsers[index];
                 return ListTile(
                   title: Text(user.nick),
                   subtitle: Text(user.name),
@@ -148,8 +154,7 @@ class _AccountSelectState extends State<AccountSelect> {
                           }
 
                           setState(() {
-                            final idx = _selectedUsers
+                            final idx = _selectedUsers.indexWhere((x) => x.id == user.id);
-                                .indexWhere((x) => x.id == user.id);
                             if (idx != -1) {
                               _selectedUsers.removeAt(idx);
                             } else {