feat: add header to note and user menu (#286)

* fix: clip drive file sheet * feat: add header to `NoteSheet` * feat: add header to `UserSheet` * feat: show `NoteSheet` on long press * feat: show `UserSheet` on long press
poppingmoon · Jul 11, 2024 · 461808c · 461808c
1 parent fc2175f
commit 461808c
Show file tree

Hide file tree

Showing 29 changed files with 648 additions and 398 deletions.
diff --git a/lib/util/get_note_action.dart b/lib/util/get_note_action.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:misskey_dart/misskey_dart.dart' hide Clip;
@@ -26,11 +25,10 @@ void Function()? getNoteAction(
     NoteActionType.none => null,
     NoteActionType.expand => () =>
         ref.context.push('/$account/notes/${appearNote.id}'),
-    NoteActionType.menu => () => showModalBottomSheet<void>(
+    NoteActionType.menu => () => showNoteSheet(
           context: ref.context,
-          builder: (context) => NoteSheet(account: account, noteId: note.id),
-          clipBehavior: Clip.hardEdge,
-          isScrollControlled: true,
+          account: account,
+          noteId: note.id,
         ),
     NoteActionType.reaction => !account.isGuest
         ? () async {

diff --git a/lib/view/dialog/user_select_dialog.dart b/lib/view/dialog/user_select_dialog.dart
@@ -12,6 +12,7 @@ import '../../provider/api/search_users_by_username_provider.dart';
 import '../../provider/recently_used_users_notifier_provider.dart';
 import '../widget/error_message.dart';
 import '../widget/user_preview.dart';
+import '../widget/user_sheet.dart';
 
 Future<UserDetailed?> selectUser(
   BuildContext context,
@@ -112,6 +113,11 @@ class UserSelectDialog extends HookConsumerWidget {
                           account: account,
                           user: recentlyUsedUsers[index],
                           onTap: () => context.pop(recentlyUsedUsers[index]),
+                          onLongPress: () => showUserSheet(
+                            context: context,
+                            account: account,
+                            userId: recentlyUsedUsers[index].id,
+                          ),
                         ),
                         separatorBuilder: (_, __) => const Divider(height: 0.0),
                         itemCount: recentlyUsedUsers.length,
@@ -135,6 +141,11 @@ class UserSelectDialog extends HookConsumerWidget {
                                           .add(users[index]);
                                       context.pop(users[index]);
                                     },
+                                    onLongPress: () => showUserSheet(
+                                      context: context,
+                                      account: account,
+                                      userId: users[index].id,
+                                    ),
                                   )
                                 : const SizedBox.shrink(),
                         separatorBuilder: (_, __) => const Divider(height: 0.0),

diff --git a/lib/view/page/clip_page.dart b/lib/view/page/clip_page.dart
@@ -21,6 +21,7 @@ import '../widget/mfm.dart';
 import '../widget/note_widget.dart';
 import '../widget/paginated_list_view.dart';
 import '../widget/user_avatar.dart';
+import '../widget/user_sheet.dart';
 import '../widget/username_widget.dart';
 
 class ClipPage extends HookConsumerWidget {
@@ -219,7 +220,7 @@ class ClipPage extends HookConsumerWidget {
                             onTap: () =>
                                 context.push('/$account/users/${user.id}'),
                           ),
-                          const SizedBox(width: 2.0),
+                          const SizedBox(width: 4.0),
                           Expanded(
                             child: Align(
                               alignment: Alignment.centerLeft,
@@ -228,6 +229,11 @@ class ClipPage extends HookConsumerWidget {
                                 user: user,
                                 onTap: () =>
                                     context.push('/$account/users/${user.id}'),
+                                onLongPress: () => showUserSheet(
+                                  context: context,
+                                  account: account,
+                                  userId: user.id,
+                                ),
                               ),
                             ),
                           ),

diff --git a/lib/view/page/drive_file_page.dart b/lib/view/page/drive_file_page.dart
@@ -46,6 +46,7 @@ class DriveFilePage extends ConsumerWidget {
                       account: account,
                       file: file,
                     ),
+                    clipBehavior: Clip.antiAlias,
                   );
                   final siblings = await ref.read(
                     driveFilesNotifierProvider(account, file.folderId).future,

diff --git a/lib/view/page/gallery/gallery_post_page.dart b/lib/view/page/gallery/gallery_post_page.dart
@@ -23,6 +23,7 @@ import '../../widget/like_button.dart';
 import '../../widget/mfm.dart';
 import '../../widget/time_widget.dart';
 import '../../widget/user_preview.dart';
+import '../../widget/user_sheet.dart';
 
 class GalleryPostPage extends ConsumerWidget {
   const GalleryPostPage({
@@ -197,6 +198,11 @@ class GalleryPostPage extends ConsumerWidget {
                   avatarSize: 50.0,
                   trailing: FollowButton(account: account, userId: post.userId),
                   onTap: () => context.push('/$account/users/${post.user.id}'),
+                  onLongPress: () => showUserSheet(
+                    context: context,
+                    account: account,
+                    userId: post.user.id,
+                  ),
                 ),
                 const Divider(),
                 Padding(

diff --git a/lib/view/page/page/page_page.dart b/lib/view/page/page/page_page.dart
@@ -29,6 +29,7 @@ import '../../widget/time_widget.dart';
 import '../../widget/url_preview.dart';
 import '../../widget/user_avatar.dart';
 import '../../widget/user_preview.dart';
+import '../../widget/user_sheet.dart';
 import '../../widget/username_widget.dart';
 
 class PagePage extends ConsumerWidget {
@@ -249,6 +250,11 @@ class PagePage extends ConsumerWidget {
                                 user: page.user,
                                 onTap: () => context
                                     .push('/$account/users/${page.userId}'),
+                                onLongPress: () => showUserSheet(
+                                  context: context,
+                                  account: account,
+                                  userId: page.userId,
+                                ),
                               ),
                             ),
                           ),
@@ -351,6 +357,11 @@ class PagePage extends ConsumerWidget {
                             FollowButton(account: account, userId: page.userId),
                         onTap: () =>
                             context.push('/$account/users/${page.user.id}'),
+                        onLongPress: () => showUserSheet(
+                          context: context,
+                          account: account,
+                          userId: page.user.id,
+                        ),
                       ),
                     ),
                     ColoredBox(

diff --git a/lib/view/page/play/play_page.dart b/lib/view/page/play/play_page.dart
@@ -18,6 +18,7 @@ import '../../widget/mfm/code.dart';
 import '../../widget/play_widget.dart';
 import '../../widget/time_widget.dart';
 import '../../widget/user_preview.dart';
+import '../../widget/user_sheet.dart';
 
 class PlayPage extends HookConsumerWidget {
   const PlayPage({
@@ -143,6 +144,13 @@ class PlayPage extends HookConsumerWidget {
                                   ? '/${this.account}/users/${play.userId}'
                                   : '/${account.value}/@${play.user.username}@${this.account.host}',
                             ),
+                            onLongPress: this.account == account.value
+                                ? () => showUserSheet(
+                                      context: context,
+                                      account: this.account,
+                                      userId: play.userId,
+                                    )
+                                : null,
                           ),
                           const Divider(),
                           DefaultTextStyle.merge(

diff --git a/lib/view/page/settings/blocked_users_page.dart b/lib/view/page/settings/blocked_users_page.dart
@@ -11,6 +11,7 @@ import '../../widget/acct_widget.dart';
 import '../../widget/paginated_list_view.dart';
 import '../../widget/time_widget.dart';
 import '../../widget/user_avatar.dart';
+import '../../widget/user_sheet.dart';
 import '../../widget/username_widget.dart';
 
 class BlockedUsersPage extends ConsumerWidget {
@@ -57,6 +58,11 @@ class BlockedUsersPage extends ConsumerWidget {
             color: Theme.of(context).colorScheme.error,
           ),
           onTap: () => context.push('/$account/users/${blocking.blockeeId}'),
+          onLongPress: () => showUserSheet(
+            context: context,
+            account: account,
+            userId: blocking.blockeeId,
+          ),
         ),
         onRefresh: () => ref.refresh(blockingsNotifierProvider(account).future),
         loadMore: (skipError) => ref

diff --git a/lib/view/page/settings/muted_users_page.dart b/lib/view/page/settings/muted_users_page.dart
@@ -11,6 +11,7 @@ import '../../widget/acct_widget.dart';
 import '../../widget/paginated_list_view.dart';
 import '../../widget/time_widget.dart';
 import '../../widget/user_avatar.dart';
+import '../../widget/user_sheet.dart';
 import '../../widget/username_widget.dart';
 
 class MutedUsersPage extends ConsumerWidget {
@@ -60,6 +61,11 @@ class MutedUsersPage extends ConsumerWidget {
             color: Theme.of(context).colorScheme.error,
           ),
           onTap: () => context.push('/$account/users/${muting.muteeId}'),
+          onLongPress: () => showUserSheet(
+            context: context,
+            account: account,
+            userId: muting.muteeId,
+          ),
         ),
         onRefresh: () => ref.refresh(mutingsNotifierProvider(account).future),
         loadMore: (skipError) => ref

diff --git a/lib/view/page/settings/renote_muted_users_page.dart b/lib/view/page/settings/renote_muted_users_page.dart
@@ -11,6 +11,7 @@ import '../../widget/acct_widget.dart';
 import '../../widget/paginated_list_view.dart';
 import '../../widget/time_widget.dart';
 import '../../widget/user_avatar.dart';
+import '../../widget/user_sheet.dart';
 import '../../widget/username_widget.dart';
 
 class RenoteMutedUsersPage extends ConsumerWidget {
@@ -61,6 +62,11 @@ class RenoteMutedUsersPage extends ConsumerWidget {
             color: Theme.of(context).colorScheme.error,
           ),
           onTap: () => context.push('/$account/users/${renoteMuting.muteeId}'),
+          onLongPress: () => showUserSheet(
+            context: context,
+            account: account,
+            userId: renoteMuting.muteeId,
+          ),
         ),
         onRefresh: () =>
             ref.refresh(renoteMutingsNotifierProvider(account).future),

diff --git a/lib/view/page/user/user_list_page.dart b/lib/view/page/user/user_list_page.dart
@@ -13,6 +13,7 @@ import '../../dialog/text_field_dialog.dart';
 import '../../widget/error_message.dart';
 import '../../widget/like_button.dart';
 import '../../widget/user_preview.dart';
+import '../../widget/user_sheet.dart';
 
 class UserListPage extends HookConsumerWidget {
   const UserListPage({
@@ -67,6 +68,11 @@ class UserListPage extends HookConsumerWidget {
                             user: user,
                             onTap: () =>
                                 context.push('/$account/users/${user.id}'),
+                            onLongPress: () => showUserSheet(
+                              context: context,
+                              account: account,
+                              userId: user.id,
+                            ),
                           ),
                         ),
                       ),

diff --git a/lib/view/page/user/user_page.dart b/lib/view/page/user/user_page.dart
@@ -84,15 +84,11 @@ class UserPage extends HookConsumerWidget {
           actions: [
             if (userId != null)
               IconButton(
-                onPressed: () => showModalBottomSheet<void>(
+                onPressed: () => showUserSheet(
                   context: context,
-                  builder: (context) => UserSheet(
-                    account: account,
-                    userId: userId,
-                    hideDetails: true,
-                  ),
-                  clipBehavior: Clip.hardEdge,
-                  isScrollControlled: true,
+                  account: account,
+                  userId: userId,
+                  disableHeader: true,
                 ),
                 icon: const Icon(Icons.more_vert),
               ),

diff --git a/lib/view/widget/drive_file_widget.dart b/lib/view/widget/drive_file_widget.dart
@@ -82,6 +82,7 @@ class DriveFileWidget extends ConsumerWidget {
                           account: account,
                           file: file,
                         ),
+                        clipBehavior: Clip.antiAlias,
                       ),
                       icon: const Icon(Icons.more_vert),
                     ),

diff --git a/lib/view/widget/follow_requests_list_view.dart b/lib/view/widget/follow_requests_list_view.dart
@@ -19,6 +19,7 @@ import '../../util/future_with_dialog.dart';
 import 'acct_widget.dart';
 import 'pagination_bottom_widget.dart';
 import 'user_avatar.dart';
+import 'user_sheet.dart';
 import 'username_widget.dart';
 
 class FollowRequestsListView extends HookConsumerWidget {
@@ -226,6 +227,11 @@ class FollowRequestTile extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return InkWell(
       onTap: () => context.push('/$account/users/${user.id}'),
+      onLongPress: () => showUserSheet(
+        context: context,
+        account: account,
+        userId: user.id,
+      ),
       child: Row(
         children: [
           Padding(
@@ -245,11 +251,7 @@ class FollowRequestTile extends ConsumerWidget {
                 children: [
                   DefaultTextStyle.merge(
                     style: const TextStyle(fontWeight: FontWeight.bold),
-                    child: UsernameWidget(
-                      account: account,
-                      user: user,
-                      onTap: () => context.push('/$account/users/${user.id}'),
-                    ),
+                    child: UsernameWidget(account: account, user: user),
                   ),
                   AcctWidget(account: account, user: user),
                 ],

diff --git a/lib/view/widget/gallery_post_preview.dart b/lib/view/widget/gallery_post_preview.dart
@@ -15,6 +15,7 @@ import 'image_widget.dart';
 import 'mfm.dart';
 import 'time_widget.dart';
 import 'user_avatar.dart';
+import 'user_sheet.dart';
 import 'username_widget.dart';
 
 class GalleryPostPreview extends HookConsumerWidget {
@@ -149,10 +150,16 @@ class GalleryPostPreview extends HookConsumerWidget {
                     user: post.user,
                     onTap: () => context.push('/$account/users/${post.userId}'),
                   ),
+                  const SizedBox(width: 2.0),
                   UsernameWidget(
                     account: account,
                     user: post.user,
                     onTap: () => context.push('/$account/users/${post.userId}'),
+                    onLongPress: () => showUserSheet(
+                      context: context,
+                      account: account,
+                      userId: post.userId,
+                    ),
                   ),
                 ],
               ),

diff --git a/lib/view/widget/note_detailed_widget.dart b/lib/view/widget/note_detailed_widget.dart
@@ -41,6 +41,7 @@ import 'renote_header.dart';
 import 'time_widget.dart';
 import 'url_preview.dart';
 import 'user_avatar.dart';
+import 'user_sheet.dart';
 import 'username_widget.dart';
 
 class NoteDetailedWidget extends HookConsumerWidget {
@@ -269,6 +270,11 @@ class NoteDetailedWidget extends HookConsumerWidget {
                                             onTap: () => context.push(
                                               '/$account/users/${appearNote.userId}',
                                             ),
+                                            onLongPress: () => showUserSheet(
+                                              context: context,
+                                              account: account,
+                                              userId: appearNote.userId,
+                                            ),
                                           ),
                                         ),
                                         if (appearNote.user.isBot)
@@ -309,12 +315,16 @@ class NoteDetailedWidget extends HookConsumerWidget {
                                 user: appearNote.user,
                               ),
                               if (showTicker)
-                                DefaultTextStyle.merge(
-                                  style: style.apply(fontSizeFactor: 0.9),
-                                  child: InstanceTickerWidget(
-                                    account: account,
-                                    instance: appearNote.user.instance,
-                                    host: appearNote.user.host,
+                                Padding(
+                                  padding:
+                                      const EdgeInsets.symmetric(vertical: 2.0),
+                                  child: DefaultTextStyle.merge(
+                                    style: style.apply(fontSizeFactor: 0.9),
+                                    child: InstanceTickerWidget(
+                                      account: account,
+                                      instance: appearNote.user.instance,
+                                      host: appearNote.user.host,
+                                    ),
                                   ),
                                 ),
                             ],
@@ -514,7 +524,7 @@ class NoteDetailedWidget extends HookConsumerWidget {
                     NoteFooter(
                       account: account,
                       noteId: noteId,
-                      hideDetails: true,
+                      disableHeader: true,
                     ),
                     if (children
                         case AsyncValue(