poppingmoon · poppingmoon · Jun 30, 2024 · Jun 30, 2024 · Jun 30, 2024 · Jun 30, 2024
diff --git a/lib/provider/api/tag_users_provider.dart b/lib/provider/api/tag_users_provider.dart
@@ -0,0 +1,25 @@
+import 'package:misskey_dart/misskey_dart.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+import '../../model/account.dart';
+import 'misskey_provider.dart';
+
+part 'tag_users_provider.g.dart';
+
+@riverpod
+FutureOr<List<UserDetailed>> tagUsers(
+  TagUsersRef ref,
+  Account account,
+  String tag, {
+  UsersSortType sort = UsersSortType.followerDescendant,
+  Origin? userOrigin,
+}) async {
+  final response = await ref.read(misskeyProvider(account)).hashtags.users(
+        HashtagsUsersRequest(
+          tag: tag,
+          sort: sort,
+          origin: userOrigin,
+        ),
+      );
+  return response.toList();
+}
diff --git a/lib/provider/api/tag_users_provider.g.dart b/lib/provider/api/tag_users_provider.g.dart
diff --git a/lib/router/router.dart b/lib/router/router.dart
@@ -72,7 +72,7 @@ import '../view/page/settings/theme_manage_page.dart';
 import '../view/page/settings/theme_page.dart';
 import '../view/page/share_page.dart';
 import '../view/page/splash_page.dart';
-import '../view/page/tag_page.dart';
+import '../view/page/tag/tag_page.dart';
 import '../view/page/timeline_page.dart';
 import '../view/page/timelines_page.dart';
 import '../view/page/token_login_page.dart';
@@ -592,6 +592,7 @@ GoRouter router(RouterRef ref) {
             builder: (_, state) => TagPage(
               account: Account.fromString(state.pathParameters['acct']!),
               tag: state.pathParameters['tag']!,
+              initialIndex: state.uri.fragment == 'users' ? 1 : 0,
             ),
           ),
           GoRoute(

diff --git a/lib/router/router.g.dart b/lib/router/router.g.dart
diff --git a/lib/view/page/explore/explore_users.dart b/lib/view/page/explore/explore_users.dart
@@ -12,6 +12,7 @@ import '../../widget/error_message.dart';
 import '../../widget/misskey_server_autocomplete.dart';
 import '../../widget/paginated_list_view.dart';
 import '../../widget/user_info.dart';
+import '../../widget/users_sort_type_widget.dart';
 
 enum _UserType { pinned, local, remote }
 
@@ -99,44 +100,14 @@ class ExploreUsers extends HookConsumerWidget {
                     flex: 3,
                     child: DropdownButton(
                       isExpanded: true,
-                      items: [
-                        DropdownMenuItem(
-                          value: UsersSortType.followerAscendant,
-                          child: Text(
-                            '${t.misskey.followersCount} (${t.misskey.ascendingOrder})',
-                          ),
-                        ),
-                        DropdownMenuItem(
-                          value: UsersSortType.followerDescendant,
-                          child: Text(
-                            '${t.misskey.followersCount} (${t.misskey.descendingOrder})',
-                          ),
-                        ),
-                        DropdownMenuItem(
-                          value: UsersSortType.createdAtAscendant,
-                          child: Text(
-                            '${t.misskey.createdAt} (${t.misskey.ascendingOrder})',
-                          ),
-                        ),
-                        DropdownMenuItem(
-                          value: UsersSortType.createdAtDescendant,
-                          child: Text(
-                            '${t.misskey.createdAt} (${t.misskey.descendingOrder})',
-                          ),
-                        ),
-                        DropdownMenuItem(
-                          value: UsersSortType.updateAtAscendant,
-                          child: Text(
-                            '${t.misskey.updatedAt} (${t.misskey.ascendingOrder})',
-                          ),
-                        ),
-                        DropdownMenuItem(
-                          value: UsersSortType.updateAtDescendant,
-                          child: Text(
-                            '${t.misskey.updatedAt} (${t.misskey.descendingOrder})',
-                          ),
-                        ),
-                      ],
+                      items: UsersSortType.values
+                          .map(
+                            (sort) => DropdownMenuItem(
+                              value: sort,
+                              child: UsersSortTypeWidget(sort: sort),
+                            ),
+                          )
+                          .toList(),
                       value: sort.value,
                       onChanged: (value) {
                         if (value != null) {

diff --git a/lib/view/page/tag/tag_notes.dart b/lib/view/page/tag/tag_notes.dart
@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../../i18n/strings.g.dart';
+import '../../../model/account.dart';
+import '../../../provider/api/tag_notes_notifier_provider.dart';
+import '../../widget/note_widget.dart';
+import '../../widget/paginated_list_view.dart';
+
+class TagNotes extends ConsumerWidget {
+  const TagNotes({
+    super.key,
+    required this.account,
+    required this.tag,
+  });
+
+  final Account account;
+  final String tag;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final notes = ref.watch(tagNotesNotifierProvider(account, tag));
+
+    return PaginatedListView(
+      paginationState: notes,
+      itemBuilder: (context, note) =>
+          NoteWidget(account: account, noteId: note.id),
+      footer: const SliverToBoxAdapter(child: SizedBox(height: 80.0)),
+      onRefresh: () =>
+          ref.refresh(tagNotesNotifierProvider(account, tag).future),
+      loadMore: (skipError) => ref
+          .read(tagNotesNotifierProvider(account, tag).notifier)
+          .loadMore(skipError: skipError),
+      noItemsLabel: t.misskey.noNotes,
+    );
+  }
+}