diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart index fb57735..5558beb 100644 --- a/lib/controllers/client_controller.dart +++ b/lib/controllers/client_controller.dart @@ -261,12 +261,12 @@ class ClientController extends AsyncNotifier { } } - Future discoverHomeserver(Uri homeserver) async { + Future discoverHomeserver(Uri homeserver) async { try { final response = await _sendCommand("discover_homeserver", { "user_id": "@fake-user:${homeserver.host}", }); - return Uri.parse(response["m.homeserver"]?["base_url"]); + return response["m.homeserver"]?["base_url"]; } catch (error) { return null; } diff --git a/lib/controllers/members_controller.dart b/lib/controllers/members_controller.dart index 57fc5be..330785c 100644 --- a/lib/controllers/members_controller.dart +++ b/lib/controllers/members_controller.dart @@ -24,7 +24,7 @@ class MembersController extends AsyncNotifier> { .getRoomState( GetRoomStateRequest( roomId: roomId, - fetchMembers: !(room.metadata?.hasMemberList ?? false), + fetchMembers: room.metadata?.hasMemberList ?? true, includeMembers: true, ), ); diff --git a/lib/controllers/members_grouped_controller.dart b/lib/controllers/members_grouped_controller.dart deleted file mode 100644 index 7cec625..0000000 --- a/lib/controllers/members_grouped_controller.dart +++ /dev/null @@ -1,64 +0,0 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:flutter_riverpod/flutter_riverpod.dart"; -import "package:nexus/controllers/members_by_status_controller.dart"; -import "package:nexus/controllers/rooms_controller.dart"; -import "package:nexus/models/configs/members_by_status_config.dart"; -import "package:nexus/models/content/content.dart"; -import "package:nexus/models/content/create.dart"; -import "package:nexus/models/content/power_levels.dart"; -import "package:nexus/models/event.dart"; - -class MembersGroupedController extends AsyncNotifier>> { - final MembersByStatusConfig config; - MembersGroupedController(this.config); - - @override - Future>> build() async { - final room = ref.watch( - RoomsController.provider.select((value) => value[config.roomId]), - ); - - final createRowId = room?.state[EventType.create.type]?[""]; - final createEvent = createRowId == null ? null : room?.events[createRowId]; - final createEventContent = switch (createEvent?.content) { - CreateContent content => content, - _ => null, - }; - final creators = createEventContent?.additionalCreatorIds.add( - createEvent!.sender, - ); - - final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""]; - final powerLevelsEvent = powerLevelsRowId == null - ? null - : room?.events[powerLevelsRowId]; - - final content = switch (powerLevelsEvent?.content) { - PowerLevelsContent content => content, - _ => PowerLevelsContent(), - }; - - final members = await ref.watch( - MembersByStatusController.provider(config).future, - ); - - return members.fold>>(.new(), (result, event) { - final groupKey = creators?.contains(event.stateKey!) == true - ? null - : content.users[event.stateKey!] ?? content.usersDefault; - - return result.update( - groupKey, - (value) => value.add(event), - ifAbsent: () => .new({event}), - ); - }); - } - - static final provider = - AsyncNotifierProvider.family< - MembersGroupedController, - IMap>, - MembersByStatusConfig - >(MembersGroupedController.new); -} diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart index 07b3650..84ac7b0 100644 --- a/lib/controllers/room_chat_controller.dart +++ b/lib/controllers/room_chat_controller.dart @@ -14,18 +14,17 @@ import "package:nexus/models/relation_type.dart"; import "package:nexus/models/requests/send_message_request.dart"; import "package:nexus/models/room.dart"; -class RoomChatController extends AsyncNotifier?> { +class RoomChatController extends AsyncNotifier> { final String roomId; RoomChatController(this.roomId); @override - Future?> build() async { + Future> build() async { final client = ref.watch(ClientController.provider.notifier); final room = ref.watch( RoomsController.provider.select((rooms) => rooms[roomId]), ); - - if (room == null) return null; + if (room == null) return .new(); if (!room.hasFetchedState) { final state = await client.getRoomState(.new(roomId: roomId)); @@ -216,7 +215,7 @@ class RoomChatController extends AsyncNotifier?> { } static final provider = AsyncNotifierProvider.family - .autoDispose?, String>( + .autoDispose, String>( RoomChatController.new, ); } diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart index 26e1487..548ff20 100644 --- a/lib/controllers/spaces_controller.dart +++ b/lib/controllers/spaces_controller.dart @@ -88,7 +88,6 @@ class SpacesController extends Notifier> { final children = childRoomsBySpaceId[id] ?? .new(); return Space( - subSpaces: const IList.empty(), // TODO id: id, title: room.metadata?.name ?? "Unnamed Room", room: room, @@ -104,14 +103,12 @@ class SpacesController extends Notifier> { title: "Home", icon: Icons.home, children: homeRooms, - subSpaces: .new(), ), .new( id: "dms", title: "Direct Messages", icon: Icons.people, children: dmRooms, - subSpaces: .new(), ), ...topLevelSpacesList, ] diff --git a/lib/helpers/required_validator_helper.dart b/lib/helpers/required_validator_helper.dart deleted file mode 100644 index d243684..0000000 --- a/lib/helpers/required_validator_helper.dart +++ /dev/null @@ -1,2 +0,0 @@ -String? requiredValidator(String? value) => - value == null || value.isEmpty ? "This field is required" : null; diff --git a/lib/main.dart b/lib/main.dart index a8d8499..dcf7b67 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import "dart:io"; -import "package:dynamic_color/dynamic_color.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/foundation.dart"; import "package:flutter_riverpod/flutter_riverpod.dart"; @@ -12,12 +11,13 @@ import "package:nexus/controllers/shared_prefs_controller.dart"; import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/scheme_to_theme.dart"; import "package:nexus/pages/chat_page.dart"; -import "package:nexus/pages/select_server_page.dart"; +import "package:nexus/pages/login_page.dart"; import "package:nexus/pages/verify_page.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; import "package:window_manager/window_manager.dart"; import "package:flutter/material.dart"; +import "package:dynamic_system_colors/dynamic_system_colors.dart"; final GlobalKey navigatorKey = GlobalKey(); @@ -124,7 +124,7 @@ class App extends StatelessWidget { } if (!clientState.isLoggedIn) { - return SelectServerPage(); + return LoginPage(); } else if (!clientState.isVerified) { return VerifyPage(); } else { diff --git a/lib/models/content/create.dart b/lib/models/content/create.dart index c534558..6921c04 100644 --- a/lib/models/content/create.dart +++ b/lib/models/content/create.dart @@ -8,6 +8,8 @@ part "create.g.dart"; abstract class CreateContent extends Content with _$CreateContent { CreateContent._(); factory CreateContent({ + @JsonKey(name: "creator") String? creatorId, + @JsonKey(name: "additional_creators") @Default(IList.empty()) IList additionalCreatorIds, diff --git a/lib/models/space.dart b/lib/models/space.dart index 73fbbc6..631759a 100644 --- a/lib/models/space.dart +++ b/lib/models/space.dart @@ -2,7 +2,6 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/widgets.dart"; import "package:freezed_annotation/freezed_annotation.dart"; import "package:nexus/models/room.dart"; -import "package:nexus/models/subspace.dart"; part "space.freezed.dart"; @freezed @@ -13,6 +12,5 @@ abstract class Space with _$Space { IconData? icon, Room? room, required IList children, - required IList subSpaces, }) = _Space; } diff --git a/lib/models/subspace.dart b/lib/models/subspace.dart deleted file mode 100644 index 1a1879c..0000000 --- a/lib/models/subspace.dart +++ /dev/null @@ -1,10 +0,0 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; -import "package:freezed_annotation/freezed_annotation.dart"; -import "package:nexus/models/room.dart"; -part "subspace.freezed.dart"; - -@freezed -abstract class Subspace with _$Subspace { - const factory Subspace({required Room room, required IList children}) = - _Subspace; -} diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 4969287..58662f4 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -1,95 +1,205 @@ import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; +import "package:flutter_svg/flutter_svg.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; +import "package:nexus/helpers/launch_helper.dart"; +import "package:nexus/models/homeserver.dart"; import "package:nexus/widgets/appbar.dart"; -import "package:nexus/helpers/required_validator_helper.dart"; +import "package:nexus/widgets/divider_text.dart"; +import "package:nexus/widgets/loading.dart"; class LoginPage extends HookConsumerWidget { - final Uri homeserver; - const LoginPage({super.key, required this.homeserver}); + const LoginPage({super.key}); @override Widget build(BuildContext context, WidgetRef ref) { + final theme = Theme.of(context); final client = ref.watch(ClientController.provider.notifier); final isLoading = useState(false); + final homeserver = useState(null); + + final launch = ref.watch(LaunchHelper.provider).launchUrl; + + Future setHomeserver(Uri? newHomeserver) async { + isLoading.value = true; + + homeserver.value = newHomeserver == null + ? null + : await client.discoverHomeserver( + newHomeserver.hasScheme + ? newHomeserver + : Uri.https(newHomeserver.path), + ); + + if (homeserver.value == null && context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + .new( + content: Text( + "Homeserver verification failed. Is your homeserver down?", + style: TextStyle(color: theme.colorScheme.onErrorContainer), + ), + backgroundColor: theme.colorScheme.errorContainer, + ), + ); + } + isLoading.value = false; + } + + final homeserverUrl = useTextEditingController(); final username = useTextEditingController(); final password = useTextEditingController(); - final inputError = useState(null); - final formKey = useRef(GlobalKey()); - - Future tryLogin() async { - isLoading.value = true; - - try { - if (formKey.value.currentState?.validate() != true) return; - - final error = await client.login( - .new( - username: username.text, - password: password.text, - homeserverUrl: homeserver.origin, - ), - ); - - if (error != null) { - inputError.value = error; - isLoading.value = false; - } else { - if (context.mounted) Navigator.of(context).pop(); - } - } finally { - isLoading.value = false; - } - } - return Scaffold( - appBar: Appbar( - leading: IconButton( - icon: Icon(Icons.arrow_back), - onPressed: Navigator.of(context).pop, - ), - ), - body: AlertDialog( - title: Text("Login to ${homeserver.host}"), - content: Form( - key: formKey.value, - child: Column( - mainAxisSize: .min, - crossAxisAlignment: .start, + appBar: Appbar(), + body: Center( + child: ConstrainedBox( + constraints: .new(maxWidth: 600), + child: ListView( + padding: .symmetric(horizontal: 16, vertical: 64), children: [ - TextFormField( - autofocus: true, - textInputAction: .next, - autovalidateMode: .onUserInteraction, - validator: requiredValidator, - decoration: .new(label: Text("Username")), - controller: username, + Row( + children: [ + SvgPicture.asset("assets/icon.svg", width: 128), + SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: .start, + children: [ + Text("Nexus", style: theme.textTheme.displayMedium), + Text( + "A Simple Matrix Client", + style: theme.textTheme.headlineMedium, + overflow: .ellipsis, + ), + ], + ), + ), + ], ), - SizedBox(height: 12), - TextFormField( - textInputAction: .done, - decoration: .new( - label: Text("Password"), - errorText: inputError.value, - errorMaxLines: 5, + Padding(padding: .symmetric(vertical: 12), child: Divider()), + + DividerText("Enter a homeserver domain:"), + Row( + spacing: 8, + children: [ + Expanded( + child: TextField( + controller: homeserverUrl, + decoration: .new( + labelText: "Homeserver URL (e.g. matrix.org)", + ), + ), + ), + IconButton.filled( + tooltip: "Confirm homeserver choice", + onPressed: isLoading.value + ? null + : () => setHomeserver(.tryParse(homeserverUrl.text)), + icon: Icon(Icons.check), + ), + ], + ), + + DividerText("Or, choose from some popular homeservers:"), + ...([ + .new( + name: "Matrix.org", + description: + "The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.", + url: .https("matrix.org"), + iconUrl: + "https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", ), - autovalidateMode: .onUserInteraction, - validator: requiredValidator, - controller: password, - obscureText: true, + .new( + name: "Federated Nexus", + description: + "Federated Nexus is a community resource hosting multiple FOSS (especially federated) services, including Matrix and Forgejo. By the same developers who made Nexus client.", + url: .https("federated.nexus"), + iconUrl: "https://federated.nexus/images/icon.png", + ), + .new( + name: "Unredacted", + description: + "Unredacted is a 501(c)(3) non-profit organization that builds Internet infrastructure and services to help people evade censorship and protect their right to privacy.", + url: .https("unredacted.org", "services/si/matrix"), + iconUrl: "https://unredacted.org/favicon.ico", + ), + ].map( + (homeserver) => Card( + child: ListTile( + title: Text(homeserver.name), + leading: Image.network( + homeserver.iconUrl, + errorBuilder: (_, _, _) => SizedBox.shrink(), + height: 32, + ), + subtitle: Text(homeserver.description), + onTap: isLoading.value + ? null + : () => setHomeserver(homeserver.url), + trailing: IconButton( + tooltip: "Launch homeserver info page", + onPressed: () => launch(homeserver.url), + icon: Icon(Icons.info_outline), + ), + ), + ), + )), + SizedBox(height: 8), + TextButton( + onPressed: () => launch(.https("servers.joinmatrix.org")), + child: Text("See more homeservers..."), ), + if (isLoading.value) + Padding(padding: .only(top: 32), child: Loading()) + else if (homeserver.value != null) ...[ + DividerText("Then, sign in:"), + SizedBox(height: 4), + TextField( + decoration: .new(label: Text("Username")), + controller: username, + ), + SizedBox(height: 12), + TextField( + decoration: .new(label: Text("Password")), + controller: password, + obscureText: true, + ), + SizedBox(height: 12), + ElevatedButton( + onPressed: () async { + isLoading.value = true; + final error = await client.login( + .new( + username: username.text, + password: password.text, + homeserverUrl: homeserver.value!, + ), + ); + + if (error != null && context.mounted) { + ScaffoldMessenger.of(context).showSnackBar( + .new( + content: Text( + "Login failed. Is your password right?\nError: $error", + style: .new( + color: theme.colorScheme.onErrorContainer, + ), + ), + backgroundColor: theme.colorScheme.errorContainer, + ), + ); + isLoading.value = false; + } + }, + child: Text("Sign In"), + ), + ], ], ), ), - actions: [ - TextButton( - onPressed: isLoading.value ? null : tryLogin, - child: Text("Sign In"), - ), - ], ), ); } diff --git a/lib/pages/select_server_page.dart b/lib/pages/select_server_page.dart deleted file mode 100644 index f0e7dff..0000000 --- a/lib/pages/select_server_page.dart +++ /dev/null @@ -1,169 +0,0 @@ -import "package:flutter/material.dart"; -import "package:flutter_hooks/flutter_hooks.dart"; -import "package:flutter_svg/flutter_svg.dart"; -import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:nexus/controllers/client_controller.dart"; -import "package:nexus/helpers/launch_helper.dart"; -import "package:nexus/models/homeserver.dart"; -import "package:nexus/pages/login_page.dart"; -import "package:nexus/widgets/appbar.dart"; -import "package:nexus/widgets/divider_text.dart"; - -class SelectServerPage extends HookConsumerWidget { - const SelectServerPage({super.key}); - - @override - Widget build(BuildContext context, WidgetRef ref) { - final theme = Theme.of(context); - - final launch = ref.watch(LaunchHelper.provider).launchUrl; - - final isLoading = useState(false); - final homeserverUrl = useTextEditingController(); - - Future setHomeserver(Uri? newHomeserver) async { - isLoading.value = true; - - try { - if (newHomeserver?.hasScheme == false) { - newHomeserver = Uri.https(newHomeserver!.path); - } - - final newUrl = newHomeserver == null - ? null - : await ref - .watch(ClientController.provider.notifier) - .discoverHomeserver(newHomeserver); - - if (context.mounted) { - if (newUrl == null) { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - "Homeserver verification failed. Is your homeserver down?", - style: .new(color: theme.colorScheme.onErrorContainer), - ), - backgroundColor: theme.colorScheme.errorContainer, - ), - ); - } else { - await Navigator.of(context).push( - MaterialPageRoute(builder: (_) => LoginPage(homeserver: newUrl)), - ); - } - } - } finally { - isLoading.value = false; - } - } - - return Scaffold( - appBar: Appbar(), - body: Center( - child: ConstrainedBox( - constraints: .new(maxWidth: 600), - child: ListView( - children: [ - Row( - children: [ - SvgPicture.asset("assets/icon.svg", width: 128), - SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: .start, - children: [ - Text("Nexus", style: theme.textTheme.displayMedium), - Text( - "A Simple Matrix Client", - style: theme.textTheme.headlineMedium, - overflow: .ellipsis, - ), - ], - ), - ), - ], - ), - Padding(padding: .symmetric(vertical: 12), child: Divider()), - DividerText("Enter a homeserver domain:"), - Row( - spacing: 8, - children: [ - Expanded( - child: TextField( - textInputAction: .done, - autofocus: true, - onSubmitted: (text) => setHomeserver(.tryParse(text)), - controller: homeserverUrl, - decoration: .new( - labelText: "Homeserver URL", - hintText: "matrix.org", - ), - ), - ), - IconButton.filled( - tooltip: "Confirm homeserver choice", - onPressed: isLoading.value - ? null - : () => setHomeserver(.tryParse(homeserverUrl.text)), - icon: Icon(Icons.check), - ), - ], - ), - DividerText("Or, choose from some popular homeservers:"), - ...([ - .new( - name: "Matrix.org", - description: - "The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.", - url: .https("matrix.org"), - iconUrl: - "https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", - ), - .new( - name: "Federated Nexus", - description: - "Federated Nexus is a community resource hosting multiple FOSS (especially federated) services, including Matrix and Forgejo. By the same developers who made Nexus client.", - url: .https("federated.nexus"), - iconUrl: "https://federated.nexus/images/icon.png", - ), - .new( - name: "Unredacted", - description: - "Unredacted is a 501(c)(3) non-profit organization that builds Internet infrastructure and services to help people evade censorship and protect their right to privacy.", - url: .https("unredacted.org", "services/si/matrix"), - iconUrl: "https://unredacted.org/favicon.ico", - ), - ].map( - (homeserver) => Card( - child: ListTile( - enabled: !isLoading.value, - title: Text(homeserver.name), - leading: Image.network( - homeserver.iconUrl, - errorBuilder: (_, _, _) => SizedBox.shrink(), - height: 32, - ), - subtitle: Text(homeserver.description), - onTap: isLoading.value - ? null - : () => setHomeserver(homeserver.url), - trailing: IconButton( - tooltip: "Launch homeserver info page", - onPressed: () => launch(homeserver.url), - icon: Icon(Icons.info_outline), - ), - ), - ), - )), - - TextButton( - onPressed: () => launch(.https("servers.joinmatrix.org")), - child: Text("See more homeservers..."), - ), - ], - ), - ), - ), - ); - } -} diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart index a2089e3..0469fa4 100644 --- a/lib/pages/verify_page.dart +++ b/lib/pages/verify_page.dart @@ -3,7 +3,7 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/client_controller.dart"; import "package:nexus/widgets/appbar.dart"; -import "package:nexus/helpers/required_validator_helper.dart"; +import "package:nexus/widgets/form_text_input.dart"; class VerifyPage extends HookConsumerWidget { const VerifyPage({super.key}); @@ -11,56 +11,70 @@ class VerifyPage extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final passphraseController = useTextEditingController(); - final isLoading = useState(false); - final inputError = useState(null); - final formKey = useRef(GlobalKey()); - + final isVerifying = useState(false); return Scaffold( appBar: Appbar(), body: AlertDialog( title: Text("Verify"), - content: Form( - key: formKey.value, - child: Column( - mainAxisSize: .min, - crossAxisAlignment: .start, - children: [ - Text( - "Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.", - ), - SizedBox(height: 12), - TextFormField( - autofocus: true, - controller: passphraseController, - textInputAction: .done, - autovalidateMode: .onUserInteraction, - validator: requiredValidator, - obscureText: true, - decoration: .new( - label: Text("Recovery Key or Passphrase"), - errorText: inputError.value, - ), - ), - ], - ), + content: Column( + mainAxisSize: .min, + crossAxisAlignment: .start, + children: [ + Text( + "Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.", + ), + SizedBox(height: 12), + FormTextInput( + required: false, + autofocus: true, + capitalize: true, + controller: passphraseController, + obscure: true, + title: "Recovery Key or Passphrase", + ), + ], ), actions: [ TextButton( - onPressed: isLoading.value + onPressed: isVerifying.value ? null : () async { - isLoading.value = true; + final scaffoldMessenger = ScaffoldMessenger.of(context); + final snackbar = scaffoldMessenger.showSnackBar( + .new( + content: Text( + "Attempting to verify with recovery key...", + ), + duration: .new(days: 999), + ), + ); - try { - if (formKey.value.currentState?.validate() != true) { - return; + isVerifying.value = true; + + final error = await ref + .watch(ClientController.provider.notifier) + .verify(passphraseController.text); + + snackbar.close(); + if (error != null) { + isVerifying.value = false; + if (context.mounted) { + scaffoldMessenger.showSnackBar( + .new( + backgroundColor: Theme.of( + context, + ).colorScheme.errorContainer, + content: Text( + "Verification failed. Is your passphrase correct?\nError: $error", + style: .new( + color: Theme.of( + context, + ).colorScheme.onErrorContainer, + ), + ), + ), + ); } - - inputError.value = await ref - .watch(ClientController.provider.notifier) - .verify(passphraseController.text); - } finally { - isLoading.value = false; } }, child: Text("Verify"), diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index 4931684..e24dd3d 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -11,11 +11,15 @@ class AvatarOrHash extends ConsumerWidget { final Uri? avatar; final String title; final Widget? fallback; + final bool hasBadge; + final int badgeNumber; final double height; const AvatarOrHash( this.avatar, this.title, { this.fallback, + this.badgeNumber = 0, + this.hasBadge = false, this.height = 24, super.key, }); @@ -40,24 +44,30 @@ class AvatarOrHash extends ConsumerWidget { width: height, height: height, child: Center( - child: ClipRRect( - borderRadius: .all(.circular((height - 8) / 2.5)), - child: SizedBox( - width: height, - height: height, - child: parsedAvatar == null - ? fallback ?? box - : Image( - image: CachedNetworkImage( - parsedAvatar.toString(), - ref.watch(CrossCacheController.provider), - headers: ref.headers, + child: Badge( + isLabelVisible: hasBadge, + label: badgeNumber != 0 ? Text(badgeNumber.toString()) : null, + smallSize: 12, + backgroundColor: Theme.of(context).colorScheme.primary, + child: ClipRRect( + borderRadius: .all(.circular((height - 8) / 2.5)), + child: SizedBox( + width: height, + height: height, + child: parsedAvatar == null + ? fallback ?? box + : Image( + image: CachedNetworkImage( + parsedAvatar.toString(), + ref.watch(CrossCacheController.provider), + headers: ref.headers, + ), + fit: .cover, + loadingBuilder: (_, child, loadingProgress) => + loadingProgress == null ? child : fallback ?? box, + errorBuilder: (_, _, _) => fallback ?? box, ), - fit: .cover, - loadingBuilder: (_, child, loadingProgress) => - loadingProgress == null ? child : fallback ?? box, - errorBuilder: (_, _, _) => fallback ?? box, - ), + ), ), ), ), diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index 618d9ee..d090cac 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -1,6 +1,5 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; -import "package:flutter/services.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:fluttertagger/fluttertagger.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -136,34 +135,21 @@ class Composer extends HookConsumerWidget { query.value = newQuery; }, triggerCharacterAndStyles: {"@": style, "#": style}, - builder: (context, key) => Focus( - onKeyEvent: (_, event) { - if (event is KeyDownEvent && - event.logicalKey == - LogicalKeyboardKey.enter) { - final shiftPressed = - HardwareKeyboard.instance.isShiftPressed; - - if (!shiftPressed) { - send(); - return KeyEventResult.handled; - } - } - - return KeyEventResult.ignored; - }, - child: TextField( - maxLines: 12, - minLines: 1, - autofocus: true, - decoration: .new( - hintText: "Your message here...", - border: .none, - ), - controller: controller.value, - key: key, - focusNode: node, + builder: (context, key) => TextField( + maxLines: 12, + minLines: 1, + autofocus: true, + decoration: .new( + hintText: "Your message here...", + border: .none, ), + controller: controller.value, + key: key, + onSubmitted: (_) => send(), + // Don't defocus on submit + onEditingComplete: () {}, + textInputAction: .done, + focusNode: node, ), ), ), diff --git a/lib/widgets/form_text_input.dart b/lib/widgets/form_text_input.dart new file mode 100644 index 0000000..8b48883 --- /dev/null +++ b/lib/widgets/form_text_input.dart @@ -0,0 +1,81 @@ +import "package:flutter/material.dart"; +import "package:flutter/services.dart"; + +class FormTextInput extends StatelessWidget { + final List extraValidators; + final TextEditingController? controller; + final TextInputType keyboardType; + final String? initialValue; + final bool readOnly; + final bool obscure; + final String? title; + final int? minLines; + final int? maxLength; + final bool outlined; + final int? maxLines; + final bool capitalize; + final bool required; + final bool autocorrect; + final void Function()? onTap; + final Widget? trailing; + final InputBorder? border; + final List? formatters; + final bool autofocus; + + const FormTextInput({ + super.key, + this.border, + this.controller, + this.autofocus = false, + this.title, + this.obscure = false, + this.readOnly = false, + this.extraValidators = const [], + this.keyboardType = TextInputType.text, + this.initialValue, + this.minLines, + this.capitalize = false, + this.maxLength, + this.formatters, + this.maxLines = 1, + this.outlined = true, + this.trailing, + this.onTap, + this.autocorrect = true, + this.required = true, + }); + + @override + Widget build(BuildContext context) => TextFormField( + autofocus: autofocus, + controller: controller, + keyboardType: keyboardType, + readOnly: readOnly, + minLines: minLines, + maxLines: maxLines, + maxLength: maxLength, + inputFormatters: formatters, + textCapitalization: capitalize ? .sentences : .none, + initialValue: initialValue, + autocorrect: autocorrect, + obscureText: obscure, + onTap: onTap, + decoration: .new( + labelText: title, + border: border ?? (outlined ? null : const UnderlineInputBorder()), + suffixIcon: trailing, + ), + validator: (value) { + if ((value?.isEmpty ?? true) && required) { + return "This field is required"; + } + + for (final validator in extraValidators) { + final reason = validator(value!); + if (reason != null) return reason; + } + + return null; + }, + ); +} diff --git a/lib/widgets/join_dialog.dart b/lib/widgets/join_dialog.dart index d420dea..e20ab2a 100644 --- a/lib/widgets/join_dialog.dart +++ b/lib/widgets/join_dialog.dart @@ -6,6 +6,7 @@ import "package:nexus/controllers/client_controller.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; import "package:nexus/helpers/extensions/link_to_mention.dart"; +import "package:nexus/widgets/form_text_input.dart"; class JoinDialog extends HookWidget { final WidgetRef ref; @@ -22,9 +23,11 @@ class JoinDialog extends HookWidget { children: [ Text("Enter the room alias, Matrix URI, or Matrix.to link."), SizedBox(height: 12), - TextField( + FormTextInput( + required: false, + capitalize: true, controller: roomAlias, - decoration: .new(hintText: "#room:server"), + title: "#room:server", ), ], ), @@ -84,15 +87,9 @@ class JoinDialog extends HookWidget { space?.id ?? spaces .firstWhere( - (space) => - space.children.any( - (child) => - child.metadata?.id == id, - ) || - space.subSpaces.any( - (child) => - child.room.metadata?.id == id, - ), + (space) => space.children.any( + (child) => child.metadata?.id == id, + ), ) .id, ); diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart index bdac414..00633a7 100644 --- a/lib/widgets/member_list.dart +++ b/lib/widgets/member_list.dart @@ -1,16 +1,13 @@ -import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:m3e_buttons/m3e_buttons.dart"; -import "package:material_segmented_list/material_segmented_list.dart"; -import "package:nexus/controllers/members_grouped_controller.dart"; +import "package:nexus/controllers/members_by_status_controller.dart"; import "package:nexus/helpers/extensions/get_localpart.dart"; +import "package:nexus/helpers/extensions/show_user_popover.dart"; import "package:nexus/helpers/extensions/string_to_color.dart"; import "package:nexus/models/content/membership.dart"; import "package:nexus/models/membership_status.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; -import "package:nexus/widgets/divider_text.dart"; import "package:nexus/widgets/error_dialog.dart"; import "package:nexus/widgets/loading.dart"; @@ -21,19 +18,12 @@ class MemberList extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final status = useState(MembershipStatus.join); - - final membersData = ref.watch( - MembersGroupedController.provider( + final membersProvider = ref.watch( + MembersByStatusController.provider( .new(roomId: roomId, status: status.value), ), ); - final options = { - "Joined": .join, - "Invited": .invite, - "Banned": .ban, - }; - return Drawer( shape: Border(), child: Column( @@ -52,107 +42,74 @@ class MemberList extends HookConsumerWidget { ), ], ), - M3EToggleButtonGroup( - type: .connected, - selectedIndex: options.values.toIList().indexOf(status.value), - onSelectedIndexChanged: (index) => - status.value = options.values.elementAt(index ?? 0), - // overflow: M3EButtonGroupOverflow.menu, - actions: options - .mapTo( - (name, value) => M3EToggleButtonGroupAction( - checkedLabel: Text( - "$name${switch (membersData) { - AsyncData(:final value) || AsyncLoading(:final value?) => " (${value.values.expand((element) => element).length})", - _ => "", - }}", - ), - label: Text(name), - ), - ) - .toList(), + Wrap( + alignment: .center, + spacing: 8, + runSpacing: 8, + children: [ + FilterChip( + label: Text("Joined"), + onSelected: (value) => status.value = .join, + selected: status.value == .join, + ), + FilterChip( + label: Text("Invited"), + onSelected: (value) => status.value = .invite, + selected: status.value == .invite, + ), + FilterChip( + label: Text("Banned"), + onSelected: (value) => status.value = .ban, + selected: status.value == .ban, + ), + ], ), - - switch (membersData) { + switch (membersProvider) { AsyncError(:final error, :final stackTrace) => ErrorDialog( error, stackTrace, ), - AsyncData(:final value) || AsyncLoading(:final value?) => - value.isEmpty - ? Center( - child: Padding( - padding: .symmetric(vertical: 18), - child: Text( - "No ${options.keys.toIList()[options.values.toIList().indexOf(status.value)]} Members", - style: Theme.of(context).textTheme.headlineSmall, - ), - ), - ) - : Expanded( - child: ListView( - padding: .all(12), - children: [ - for (final MapEntry(key: powerLevel, value: members) - in value.toEntryIList( - compare: (a, b) => (b?.key ?? double.infinity) - .compareTo(a?.key ?? double.infinity), - )) ...[ - Padding( - padding: .symmetric(horizontal: 4), - child: DividerText( - powerLevel == null - ? "Creators" - : "Power Level $powerLevel", + AsyncData(:final value) || AsyncLoading(:final value?) => Expanded( + child: ListView( + children: value + .map( + (member) => switch (member.content) { + MembershipContent( + :final avatarUrl, + :final displayName, + ) => + InkWell( + onTapUp: (details) => context.showUserPopover( + member.content as MembershipContent, + member.stateKey!, + roomId: roomId, + globalPosition: details.globalPosition, + ), + child: ListTile( + leading: AvatarOrHash( + avatarUrl, + displayName ?? member.sender.localpart, + ), + title: Text( + displayName ?? member.stateKey!.localpart, + overflow: .ellipsis, + style: .new( + color: member.stateKey!.colorHash, + fontWeight: .bold, + ), + ), + subtitle: Text( + member.stateKey!, + overflow: .ellipsis, ), ), - SegmentedListSection( - children: members - .map( - (member) => switch (member.content) { - MembershipContent( - :final avatarUrl, - :final displayName, - ) => - SegmentedListTile( - onTap: () {}, - // context.showUserPopover( - // member.content as MembershipContent, - // member.stateKey!, - // roomId: roomId, - // globalPosition: details.globalPosition, - // ), - title: Text( - displayName ?? - member.stateKey!.localpart, - overflow: .ellipsis, - style: .new( - color: member.stateKey!.colorHash, - fontWeight: .bold, - ), - ), - subtitle: Text( - member.stateKey!, - overflow: .ellipsis, - ), - leading: AvatarOrHash( - avatarUrl, - displayName ?? - member.sender.localpart, - ), - ), - _ => throw Exception( - "Member content was not MembershipContent", - ), - }, - ) - .toList(), - ), - SizedBox(height: 4), - ], - ], - ), - ), + ), + _ => SizedBox.shrink(), + }, + ) + .toList(), + ), + ), AsyncLoading _ => Loading(), }, ], diff --git a/lib/widgets/room_appbar.dart b/lib/widgets/room_appbar.dart index e1d5708..d16c2df 100644 --- a/lib/widgets/room_appbar.dart +++ b/lib/widgets/room_appbar.dart @@ -1,3 +1,4 @@ +import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:nexus/controllers/rooms_controller.dart"; @@ -92,15 +93,13 @@ class RoomAppbar extends ConsumerWidget implements PreferredSizeWidget { ), ), ), - leading: isDesktop - ? room == null - ? null - : AvatarOrHash( - room.metadata?.avatar, - room.metadata?.name ?? "Unnamed Room", - height: 24, - fallback: Icon(Icons.numbers), - ) + leading: isDesktop && room != null + ? AvatarOrHash( + room.metadata?.avatar, + room.metadata?.name ?? "Unnamed Room", + height: 24, + fallback: Icon(Icons.numbers), + ) : DrawerButton(onPressed: () => onOpenDrawer(context)), scrolledUnderElevation: 0, title: room == null @@ -124,21 +123,19 @@ class RoomAppbar extends ConsumerWidget implements PreferredSizeWidget { ), ], ), - actions: room == null - ? .new() - : .new([ - IconButton( - onPressed: null, - icon: Icon(Icons.push_pin), - tooltip: "Open pinned messages", - ), - IconButton( - onPressed: () => onOpenMemberList?.call(context), - tooltip: "Open member list", - icon: Icon(Icons.people), - ), - RoomMenu(room), - ]), + actions: [ + IconButton( + onPressed: null, + icon: Icon(Icons.push_pin), + tooltip: "Open pinned messages", + ), + IconButton( + onPressed: () => onOpenMemberList?.call(context), + tooltip: "Open member list", + icon: Icon(Icons.people), + ), + if (room != null) RoomMenu(room), + ].toIList(), ); } } diff --git a/lib/widgets/room_chat.dart b/lib/widgets/room_chat.dart index 2ab2cf7..9e3d281 100644 --- a/lib/widgets/room_chat.dart +++ b/lib/widgets/room_chat.dart @@ -22,6 +22,7 @@ import "package:nexus/widgets/member_list.dart"; import "package:nexus/widgets/room_appbar.dart"; import "package:nexus/widgets/flash_wrapper.dart"; import "package:nexus/widgets/error_dialog.dart"; +import "package:nexus/widgets/form_text_input.dart"; import "package:nexus/main.dart"; import "package:nexus/widgets/loading.dart"; import "package:super_sliver_list/super_sliver_list.dart"; @@ -50,12 +51,6 @@ class RoomChat extends HookConsumerWidget { final userId = ref.watch(ClientStateController.provider)?.userId; final theme = Theme.of(context); - final nothing = Center( - child: Text( - "Nothing to see here...", - style: theme.textTheme.headlineMedium, - ), - ); if (userId == null || this.roomId == null) { return Scaffold( appBar: RoomAppbar( @@ -64,7 +59,12 @@ class RoomChat extends HookConsumerWidget { onOpenDrawer: (_) => Scaffold.of(context).openDrawer(), onOpenMemberList: null, ), - body: nothing, + body: Center( + child: Text( + "Nothing to see here...", + style: theme.textTheme.headlineMedium, + ), + ), ); } @@ -82,7 +82,7 @@ class RoomChat extends HookConsumerWidget { final topEventBeforeLoad = useState(null); Future loadOlder() async { - if (controllerData case AsyncData(:final value?)) { + if (controllerData case AsyncData(:final value)) { topEventBeforeLoad.value = value.firstOrNull?.eventId; await notifier.loadOlder(); } @@ -106,7 +106,7 @@ class RoomChat extends HookConsumerWidget { useEffect(() { if (controllerData case AsyncData( - :final value?, + :final value, ) when scrollController.hasClients) { if (topEventBeforeLoad.value != null) { WidgetsBinding.instance.addPostFrameCallback((_) { @@ -288,12 +288,11 @@ class RoomChat extends HookConsumerWidget { "Are you sure you want to delete this message? This can not be reversed.", ), SizedBox(height: 12), - TextField( + FormTextInput( + required: false, + capitalize: true, controller: deleteReasonController, - textCapitalization: .sentences, - decoration: .new( - labelText: "Reason for deletion (optional)", - ), + title: "Reason for deletion (optional)", ), ], ), @@ -341,12 +340,11 @@ class RoomChat extends HookConsumerWidget { ), SizedBox(height: 12), - TextField( + FormTextInput( + required: false, + capitalize: true, controller: reasonController, - textCapitalization: .sentences, - decoration: .new( - labelText: "Reason for report (optional)", - ), + title: "Reason for report (optional)", ), ], ), @@ -402,7 +400,7 @@ class RoomChat extends HookConsumerWidget { child: Padding( padding: .symmetric(horizontal: 12), child: switch (controllerData) { - AsyncData(:final value?) || + AsyncData(:final value) || AsyncLoading(:final value?) => CustomScrollView( controller: scrollController, slivers: [ @@ -468,7 +466,6 @@ class RoomChat extends HookConsumerWidget { ), ], ), - AsyncData() => nothing, AsyncLoading() => Loading(), AsyncError(:final error, :final stackTrace) => ErrorDialog(error, stackTrace), diff --git a/lib/widgets/sidebar.dart b/lib/widgets/sidebar.dart index d3f76ae..3217173 100644 --- a/lib/widgets/sidebar.dart +++ b/lib/widgets/sidebar.dart @@ -1,11 +1,8 @@ import "package:collection/collection.dart"; -import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:flutter/material.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:navigation_rail_m3e/navigation_rail_m3e.dart"; import "package:nexus/controllers/key_controller.dart"; import "package:nexus/controllers/spaces_controller.dart"; -import "package:nexus/models/room.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/join_dialog.dart"; import "package:nexus/widgets/room_menu.dart"; @@ -42,136 +39,88 @@ class Sidebar extends HookConsumerWidget { (room) => room.metadata?.id == selectedRoomId, ); final selectedRoomIndex = indexOfSelectedRoom == -1 - ? null + ? selectedSpace.children.isEmpty + ? null + : 0 : indexOfSelectedRoom; - List roomsToDestinations(IList rooms) => - rooms - .map( - (room) => NavigationRailM3EDestination( - label: room.metadata?.name ?? "Unnamed Room", - badgeCount: switch (room.metadata?.unreadNotifications) { - 0 || null => room.metadata?.unreadMessages == 0 ? null : 0, - int unread => unread, - }, - icon: AvatarOrHash( - room.metadata?.avatar, - room.metadata?.name ?? "Unnamed Room", - fallback: selectedSpaceId == "dms" - ? null - : Icon(Icons.numbers), - // space.client.headers, - ), - ), - ) - .toList(); - return Drawer( - width: 340, shape: Border(), child: Row( children: [ - Theme( - data: Theme.of(context).copyWith( - extensions: [ - NavigationRailM3ETheme( - itemCollapsedHeight: 48, - itemVerticalGap: 0, - ), - ], - ), - child: Container( - color: NavigationRailTokensAdapter(context).containerColor, - padding: EdgeInsets.only(top: 16), - child: NavigationRailM3E( - type: .alwaysCollapse, - labelBehavior: .alwaysHide, - scrollable: true, - onDestinationSelected: (value) { - selectedSpaceIdNotifier.set(spaces[value].id); - selectedRoomIdNotifier.set( - spaces[value].children.firstOrNull?.metadata?.id, - ); - }, - sections: [ - .new( - destinations: spaces - .map( - (space) => NavigationRailM3EDestination( - badgeCount: switch (space.children.fold( - 0, - (previousValue, room) => - previousValue + - (room.metadata?.unreadNotifications ?? 0), - )) { - 0 => - space.children.any( - (room) => - room.metadata?.unreadMessages != 0, - ) - ? 0 - : null, - int badgeCount => badgeCount, - }, - short: true, - icon: AvatarOrHash( - space.room?.metadata?.avatar, - fallback: space.icon == null - ? null - : Icon(space.icon), - space.title, - ), - label: space.title, - ), - ) - .toList(), + NavigationRail( + scrollable: true, + onDestinationSelected: (value) { + selectedSpaceIdNotifier.set(spaces[value].id); + selectedRoomIdNotifier.set( + spaces[value].children.firstOrNull?.metadata?.id, + ); + }, + destinations: spaces + .map( + (space) => NavigationRailDestination( + icon: AvatarOrHash( + space.room?.metadata?.avatar, + fallback: space.icon == null ? null : Icon(space.icon), + space.title, + hasBadge: space.children.any( + (room) => room.metadata?.unreadMessages != 0, + ), + badgeNumber: space.children.fold( + 0, + (previousValue, room) => + previousValue + + (room.metadata?.unreadNotifications ?? 0), + ), + ), + label: Text(space.title), + padding: .only(top: 4), ), - ], - selectedIndex: selectedIndex, - trailingAtBottom: true, - trailing: Padding( - padding: .symmetric(vertical: 16), - child: Column( - spacing: 8, - children: [ - PopupMenuButton( - itemBuilder: (_) => [ - PopupMenuItem( - onTap: () => showDialog( - context: context, - builder: (_) => JoinDialog(ref), - ), - child: ListTile( - title: Text("Join an existing room (or space)"), - leading: Icon(Icons.numbers), - ), - ), - PopupMenuItem( - onTap: null, - child: ListTile( - title: Text("Create a new room"), - leading: Icon(Icons.add), - ), - ), - ], - icon: Icon(Icons.add), + ) + .toList(), + selectedIndex: selectedIndex, + trailingAtBottom: true, + trailing: Padding( + padding: .symmetric(vertical: 16), + child: Column( + spacing: 8, + children: [ + PopupMenuButton( + itemBuilder: (_) => [ + PopupMenuItem( + onTap: () => showDialog( + context: context, + builder: (_) => JoinDialog(ref), + ), + child: ListTile( + title: Text("Join an existing room (or space)"), + leading: Icon(Icons.numbers), + ), ), - IconButton( - tooltip: "Explore other rooms", - onPressed: null, - icon: Icon(Icons.explore), - ), - IconButton( - tooltip: "Open settings", - onPressed: null, - // () => Navigator.of( - // context, - // ).push(MaterialPageRoute(builder: (_) => SettingsPage())), - icon: Icon(Icons.settings), + PopupMenuItem( + onTap: null, + child: ListTile( + title: Text("Create a new room"), + leading: Icon(Icons.add), + ), ), ], + icon: Icon(Icons.add), ), - ), + IconButton( + tooltip: "Explore other rooms", + onPressed: null, + icon: Icon(Icons.explore), + ), + IconButton( + tooltip: "Open settings", + onPressed: null, + // () => Navigator.of( + // context, + // ).push(MaterialPageRoute(builder: (_) => SettingsPage())), + icon: Icon(Icons.settings), + ), + ], ), ), ), @@ -196,40 +145,34 @@ class Sidebar extends HookConsumerWidget { ), ], ), - body: Theme( - data: Theme.of(context).copyWith( - extensions: [ - NavigationRailM3ETheme( - itemExpandedHeight: 48, - iconLabelGap: 16, - ), - ], - ), - child: NavigationRailM3E( - expandedWidth: 360, - scrollable: true, - background: Colors.transparent, - type: .alwaysExpand, - selectedIndex: selectedRoomIndex ?? 0, - sections: [ - .new( - destinations: roomsToDestinations(selectedSpace.children), - ), - for (final subSpace in selectedSpace.subSpaces) - .new( - header: Text( - subSpace.room.metadata?.name ?? "Unnamed Room", + body: NavigationRail( + scrollable: true, + backgroundColor: Colors.transparent, + extended: true, + selectedIndex: selectedRoomIndex, + destinations: selectedSpace.children + .map( + (room) => NavigationRailDestination( + label: Text(room.metadata?.name ?? "Unnamed Room"), + icon: AvatarOrHash( + room.metadata?.avatar, + hasBadge: room.metadata?.unreadMessages != 0, + badgeNumber: room.metadata?.unreadNotifications ?? 0, + room.metadata?.name ?? "Unnamed Room", + fallback: selectedSpaceId == "dms" + ? null + : Icon(Icons.numbers), + // space.client.headers, ), - destinations: roomsToDestinations(subSpace.children), ), - ], - onDestinationSelected: (value) { - selectedRoomIdNotifier.set( - selectedSpace.children[value].metadata?.id, - ); - if (!isDesktop) Navigator.of(context).pop(); - }, - ), + ) + .toList(), + onDestinationSelected: (value) { + selectedRoomIdNotifier.set( + selectedSpace.children[value].metadata?.id, + ); + if (!isDesktop) Navigator.of(context).pop(); + }, ), ), ), diff --git a/lib/widgets/user_popover.dart b/lib/widgets/user_popover.dart index 97d88c4..65fff87 100644 --- a/lib/widgets/user_popover.dart +++ b/lib/widgets/user_popover.dart @@ -14,6 +14,7 @@ import "package:nexus/models/requests/membership_action.dart"; import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/main.dart"; import "package:nexus/widgets/expandable_image.dart"; +import "package:nexus/widgets/form_text_input.dart"; class UserPopover extends ConsumerWidget { final MembershipContent member; @@ -40,12 +41,11 @@ class UserPopover extends ConsumerWidget { children: [ Text("Are you sure you want to ${action.name} $userId?"), SizedBox(height: 12), - TextField( - textCapitalization: .sentences, + FormTextInput( + required: false, + capitalize: true, controller: actionReasonController, - decoration: .new( - labelText: "Reason for ${action.name} (optional)", - ), + title: "Reason for ${action.name} (optional)", ), ], ), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 755a54e..45c0f94 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,7 +6,7 @@ #include "generated_plugin_registrant.h" -#include +#include #include #include #include @@ -15,9 +15,9 @@ #include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) dynamic_color_registrar = + g_autoptr(FlPluginRegistrar) dynamic_system_colors_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin"); - dynamic_color_plugin_register_with_registrar(dynamic_color_registrar); + dynamic_color_plugin_register_with_registrar(dynamic_system_colors_registrar); g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index b9ca03c..4e3b41b 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,7 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST - dynamic_color + dynamic_system_colors file_selector_linux media_kit_libs_linux media_kit_video diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index 7e7b427..091f625 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -30,9 +30,9 @@ flutter.buildFlutterApplication { gitHashes = { window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; + dynamic_system_colors = "sha256-GInPqU7r4Kj7+CNBQnf95u0BiagOUI6EtcW0A18pfd0="; emoji_text_field = "sha256-3TOys09EP2GRo6pUBGPXaqBlE39O2Cmwt42Hs1cTDKo="; linkify = "sha256-mxV/XHLxF9cn7sUPr2SUNjVmDr5lbxkuGCbNdyiZi2c="; - navigation_rail_m3e = "sha256-Zkqo8RkNSWiELB+Bk6iLsgft9THuJiMtysEwXNS/ZgY="; }; postInstall = '' diff --git a/pubspec.lock b/pubspec.lock index f44a05d..108474b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -121,14 +121,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.12.6" - button_m3e: - dependency: transitive - description: - name: button_m3e - sha256: "6754ddeb9068ad2005bd26d5ceabc41268029465095686d7d228296c2e706909" - url: "https://pub.dev" - source: hosted - version: "0.1.2" characters: dependency: transitive description: @@ -281,14 +273,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" - dynamic_color: - dependency: "direct main" - description: - name: dynamic_color - sha256: "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c" - url: "https://pub.dev" - source: hosted - version: "1.8.1" dynamic_polls: dependency: "direct main" description: @@ -297,6 +281,15 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.7" + dynamic_system_colors: + dependency: "direct main" + description: + path: "." + ref: HEAD + resolved-ref: fc7eea96556aebb1a7cd3272929277bc6d136233 + url: "https://github.com/hasali19/flutter_dynamic_system_colors" + source: git + version: "1.9.0" emoji_text_field: dependency: "direct main" description: @@ -306,22 +299,6 @@ packages: url: "https://github.com/Henry-Hiles/emoji_text_field" source: git version: "1.0.0" - equatable: - dependency: transitive - description: - name: equatable - sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b" - url: "https://pub.dev" - source: hosted - version: "2.0.8" - fab_m3e: - dependency: transitive - description: - name: fab_m3e - sha256: e4f5abfa3c8c092005449d56dcac45b85e2dbe9c32789d672c5ed71428e43b59 - url: "https://pub.dev" - source: hosted - version: "0.1.1" fake_async: dependency: transitive description: @@ -606,14 +583,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.2" - icon_button_m3e: - dependency: transitive - description: - name: icon_button_m3e - sha256: c4524d6141a468679821bbb635b833ac6831925d8a6ae4a4511430b0e4ab9c67 - url: "https://pub.dev" - source: hosted - version: "0.2.1" idb_shim: dependency: transitive description: @@ -775,22 +744,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" - m3e_buttons: - dependency: "direct main" - description: - name: m3e_buttons - sha256: "50cdf9ba30fb3ab529afafb0e837484549f8599f1f109ac07da50951febaace1" - url: "https://pub.dev" - source: hosted - version: "0.0.3" - m3e_design: - dependency: transitive - description: - name: m3e_design - sha256: "15ff0ef4c43553d855c5e866a9aee8231d44919fe2bb354b1259337bdfd659b4" - url: "https://pub.dev" - source: hosted - version: "0.2.1" matcher: dependency: transitive description: @@ -807,14 +760,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" - material_segmented_list: - dependency: "direct main" - description: - name: material_segmented_list - sha256: "384bfd41a78e745397ceff1dd39700961e6a5419ad911d1797bcc13ea3824241" - url: "https://pub.dev" - source: hosted - version: "1.0.5" measure_size: dependency: "direct main" description: @@ -903,14 +848,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - motor: - dependency: transitive - description: - name: motor - sha256: cbd49f21b00e568c2b1a55f134ed803614a107782f4fea7769693bca32940c58 - url: "https://pub.dev" - source: hosted - version: "1.1.0" native_toolchain_c: dependency: transitive description: @@ -919,15 +856,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.17.6" - navigation_rail_m3e: - dependency: "direct main" - description: - path: "packages/navigation_rail_m3e" - ref: HEAD - resolved-ref: "667b0bc8526fd53296778903b6ef3f22424f3aa4" - url: "https://github.com/Henry-Hiles/material_3_expressive" - source: git - version: "0.3.5" node_preamble: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7c95a5a..0ce2a30 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,7 +33,9 @@ dependencies: image_picker: 1.2.2 file_picker: 11.0.2 path: 1.9.1 - dynamic_color: 1.8.1 + dynamic_system_colors: + git: + url: https://github.com/hasali19/flutter_dynamic_system_colors collection: 1.19.1 window_manager: 0.5.1 color_hash: 1.0.1 @@ -62,12 +64,6 @@ dependencies: media_kit_video: 2.0.1 media_kit_libs_video: 1.0.7 measure_size: ^5.0.2 - material_segmented_list: ^1.0.5 - m3e_buttons: ^0.0.3 - navigation_rail_m3e: - git: - url: https://github.com/Henry-Hiles/material_3_expressive - path: packages/navigation_rail_m3e dev_dependencies: build_runner: 2.15.0 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 7938787..8c54692 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,7 +6,7 @@ #include "generated_plugin_registrant.h" -#include +#include #include #include #include diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 64ef5b5..f769d6e 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST - dynamic_color + dynamic_system_colors file_selector_windows media_kit_libs_windows_video media_kit_video