Henry-Hiles/nexus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add unreads back

Browse source
This commit is contained in:
Henry Hiles 2025-11-23 14:07:47 -05:00
commit 76b81ab8c4
No known key found for this signature in database
4 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/widgets/avatar_or_hash.dart
View file

@ -1,16 +1,19 @@
import "package:color_hash/color_hash.dart";
import "package:flutter/material.dart";
import "package:flutter/widgets.dart";
class AvatarOrHash extends StatelessWidget {
final Uri? avatar;
final String title;
final Widget? fallback;
final bool hasBadge;
final double height;
final Map<String, String> headers;
const AvatarOrHash(
this.avatar,
this.title, {
this.fallback,
this.hasBadge = false,
this.height = 24,
required this.headers,
super.key,
@ -22,18 +25,24 @@ class AvatarOrHash extends StatelessWidget {
color: ColorHash(title).color,
child: Center(child: Text(title[0])),
);
return ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(4)),
child: SizedBox(
height: height,
width: height,
child: avatar == null
? fallback ?? box
: Image.network(
avatar.toString(),
headers: headers,
errorBuilder: (_, _, _) => box,
),
return Center(
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(4)),
child: Badge(
isLabelVisible: hasBadge,
smallSize: 10,
backgroundColor: Theme.of(context).colorScheme.primary,
child: avatar == null
? fallback ?? box
: Image.network(
avatar.toString(),
headers: headers,
width: height,
height: height,
fit: BoxFit.contain,
errorBuilder: (_, _, _) => box,
),
),
),
);
}

2
lib/widgets/chat_page/room_appbar.dart
View file

@ -26,7 +26,7 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget {
? AvatarOrHash(
room.avatar,
room.title,
height: 32,
height: 24,
fallback: Icon(Icons.numbers),
headers: room.roomData.client.headers,
)

33
lib/widgets/chat_page/sidebar.dart
View file

@ -8,7 +8,6 @@ import "package:nexus/controllers/spaces_controller.dart";
import "package:nexus/helpers/extension_helper.dart";
import "package:nexus/pages/settings_page.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/chat_page/unread.dart";
class Sidebar extends HookConsumerWidget {
const Sidebar({super.key});
@ -47,18 +46,16 @@ class Sidebar extends HookConsumerWidget {
destinations: spaces
.map(
(space) => NavigationRailDestination(
icon: Unread(
isUnread:
icon: AvatarOrHash(
space.avatar,
fallback: space.icon,
space.title,
headers: space.client.headers,
hasBadge:
space.children.firstWhereOrNull(
(room) => room.roomData.hasNewMessages,
) !=
null,
child: AvatarOrHash(
space.avatar,
fallback: space.icon,
space.title,
headers: space.client.headers,
),
),
label: Text(space.title),
padding: EdgeInsets.only(top: 4),
@ -110,16 +107,14 @@ class Sidebar extends HookConsumerWidget {
.map(
(room) => NavigationRailDestination(
label: Text(room.title),
icon: Unread(
isUnread: room.roomData.hasNewMessages,
child: AvatarOrHash(
room.avatar,
room.title,
fallback: selectedSpace == 1
? null
: Icon(Icons.numbers),
headers: space.client.headers,
),
icon: AvatarOrHash(
hasBadge: room.roomData.hasNewMessages,
room.avatar,
room.title,
fallback: selectedSpace == 1
? null
: Icon(Icons.numbers),
headers: space.client.headers,
),
),
)

15
lib/widgets/chat_page/unread.dart
View file

@ -1,15 +0,0 @@
import "package:flutter/material.dart";
class Unread extends StatelessWidget {
final bool isUnread;
final Widget child;
const Unread({required this.isUnread, required this.child, super.key});
@override
Widget build(BuildContext context) => Badge(
smallSize: 8,
backgroundColor: Theme.of(context).colorScheme.primary,
isLabelVisible: isUnread,
child: child,
);
}