diff --git a/lib/screens/account/relationship.dart b/lib/screens/account/relationship.dart index 9a7cdf7..e9c9139 100644 --- a/lib/screens/account/relationship.dart +++ b/lib/screens/account/relationship.dart @@ -216,6 +216,7 @@ class RelationshipScreen extends HookConsumerWidget { final result = await showModalBottomSheet( context: context, useRootNavigator: true, + isScrollControlled: true, builder: (context) => AccountPickerSheet(), ); if (result == null) return; diff --git a/lib/screens/chat/chat.dart b/lib/screens/chat/chat.dart index 2291cd5..30afbee 100644 --- a/lib/screens/chat/chat.dart +++ b/lib/screens/chat/chat.dart @@ -227,6 +227,7 @@ class ChatListScreen extends HookConsumerWidget { final result = await showModalBottomSheet( context: context, useRootNavigator: true, + isScrollControlled: true, builder: (context) => const AccountPickerSheet(), ); if (result == null) return; diff --git a/lib/screens/chat/room_detail.dart b/lib/screens/chat/room_detail.dart index 99e9385..2694be6 100644 --- a/lib/screens/chat/room_detail.dart +++ b/lib/screens/chat/room_detail.dart @@ -589,6 +589,7 @@ class _ChatMemberListSheet extends HookConsumerWidget { final result = await showModalBottomSheet( context: context, useRootNavigator: true, + isScrollControlled: true, builder: (context) => const AccountPickerSheet(), ); if (result == null) return; @@ -727,7 +728,7 @@ class _ChatMemberListSheet extends HookConsumerWidget { apiClientProvider, ); await apiClient.delete( - '/chat/$roomId/members/${member.accountId}', + '/sphere/chat/$roomId/members/${member.accountId}', ); // Refresh both providers memberNotifier.reset(); diff --git a/lib/screens/creators/hub.dart b/lib/screens/creators/hub.dart index ffc612f..345420b 100644 --- a/lib/screens/creators/hub.dart +++ b/lib/screens/creators/hub.dart @@ -708,6 +708,7 @@ class _PublisherMemberListSheet extends HookConsumerWidget { Future invitePerson() async { final result = await showModalBottomSheet( + useRootNavigator: true, isScrollControlled: true, context: context, builder: (context) => const AccountPickerSheet(), diff --git a/lib/screens/creators/stickers/pack_detail.dart b/lib/screens/creators/stickers/pack_detail.dart index 579148a..96eae9e 100644 --- a/lib/screens/creators/stickers/pack_detail.dart +++ b/lib/screens/creators/stickers/pack_detail.dart @@ -180,6 +180,7 @@ class StickerPackDetailScreen extends HookConsumerWidget { .pushNamed( 'creatorStickerEdit', pathParameters: { + 'name': pubName, 'packId': id, 'id': sticker.id, }, diff --git a/lib/screens/realm/realm_detail.dart b/lib/screens/realm/realm_detail.dart index 4dc73ec..68b550d 100644 --- a/lib/screens/realm/realm_detail.dart +++ b/lib/screens/realm/realm_detail.dart @@ -488,6 +488,7 @@ class _RealmMemberListSheet extends HookConsumerWidget { Future invitePerson() async { final result = await showModalBottomSheet( isScrollControlled: true, + useRootNavigator: true, context: context, builder: (context) => const AccountPickerSheet(), ); diff --git a/lib/widgets/account/account_picker.dart b/lib/widgets/account/account_picker.dart index 1dea7fb..c081b62 100644 --- a/lib/widgets/account/account_picker.dart +++ b/lib/widgets/account/account_picker.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; @@ -44,9 +45,8 @@ class AccountPickerSheet extends HookConsumerWidget { } return Container( - constraints: BoxConstraints( - maxHeight: MediaQuery.of(context).size.height * 0.4, - ), + padding: MediaQuery.of(context).viewInsets, + height: MediaQuery.of(context).size.height * 0.6, child: Column( children: [ Padding( @@ -54,8 +54,8 @@ class AccountPickerSheet extends HookConsumerWidget { child: TextField( controller: searchController, onChanged: onSearchChanged, - decoration: const InputDecoration( - hintText: 'Search accounts...', + decoration: InputDecoration( + hintText: 'searchAccounts'.tr(), contentPadding: EdgeInsets.symmetric( horizontal: 18, vertical: 16,