From a4d60e6c835c9c1d77adf760c508f5f3f62552fc Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 3 Dec 2025 22:21:42 -0500 Subject: [PATCH] Fix DMs --- lib/widgets/avatar_or_hash.dart | 1 - lib/widgets/chat_page/sidebar.dart | 4 +-- lib/widgets/radio_dialog.dart | 54 ------------------------------ 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 lib/widgets/radio_dialog.dart diff --git a/lib/widgets/avatar_or_hash.dart b/lib/widgets/avatar_or_hash.dart index a6e267f..41bd002 100644 --- a/lib/widgets/avatar_or_hash.dart +++ b/lib/widgets/avatar_or_hash.dart @@ -1,6 +1,5 @@ import "package:color_hash/color_hash.dart"; import "package:flutter/material.dart"; -import "package:flutter/widgets.dart"; class AvatarOrHash extends StatelessWidget { final Uri? avatar; diff --git a/lib/widgets/chat_page/sidebar.dart b/lib/widgets/chat_page/sidebar.dart index aa39ce3..7703c5e 100644 --- a/lib/widgets/chat_page/sidebar.dart +++ b/lib/widgets/chat_page/sidebar.dart @@ -50,7 +50,7 @@ class Sidebar extends HookConsumerWidget { return NavigationRail( scrollable: true, onDestinationSelected: (value) { - selectedSpaceNotifier.set(spaces[value].roomData?.id); + selectedSpaceNotifier.set(spaces[value].id); selectedRoomNotifier.set( spaces[value].children.firstOrNull?.roomData.id, ); @@ -151,7 +151,7 @@ class Sidebar extends HookConsumerWidget { hasBadge: room.roomData.hasNewMessages, room.avatar, room.title, - fallback: selectedSpace == 1 + fallback: selectedSpace == "dms" ? null : Icon(Icons.numbers), headers: space.client.headers, diff --git a/lib/widgets/radio_dialog.dart b/lib/widgets/radio_dialog.dart deleted file mode 100644 index f36962f..0000000 --- a/lib/widgets/radio_dialog.dart +++ /dev/null @@ -1,54 +0,0 @@ -import "package:flutter/material.dart"; -import "package:flutter_hooks/flutter_hooks.dart"; - -class RadioDialog extends HookWidget { - final T? value; - final String title; - final List options; - final void Function(T value)? onChanged; - final String Function(T option) getName; - const RadioDialog({ - super.key, - required this.title, - required this.value, - required this.options, - required this.onChanged, - required this.getName, - }); - - @override - Widget build(BuildContext context) { - final mutValue = useState(null); - return AlertDialog( - title: Text(title), - content: Column( - mainAxisSize: MainAxisSize.min, - children: options - .map( - (option) => RadioListTile( - value: option, - groupValue: mutValue.value ?? value, - onChanged: onChanged == null - ? null - : (value) => - mutValue.value = value ?? mutValue.value ?? value, - title: Text(getName(option)), - dense: true, - ), - ) - .toList(), - ), - actions: [ - TextButton(onPressed: Navigator.of(context).pop, child: Text("Cancel")), - if (onChanged != null) - TextButton( - onPressed: () { - if (mutValue.value != null) onChanged!(mutValue.value as T); - Navigator.of(context).pop(); - }, - child: Text("OK"), - ), - ], - ); - } -}