diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 9e52b2a59..2eb411a23 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -18,14 +18,12 @@
-
-
diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
index acc8270ca..e24cfdb70 100644
--- a/lib/pages/chat_list/chat_list_item.dart
+++ b/lib/pages/chat_list/chat_list_item.dart
@@ -144,14 +144,7 @@ class ChatListItem extends StatelessWidget {
right: 0,
child: Avatar(
border: space == null
- ? room.isSpace
- ? BorderSide(
- width: 0,
- color: Theme.of(context)
- .colorScheme
- .outline,
- )
- : null
+ ? null
: BorderSide(
width: 2,
color: backgroundColor ??
@@ -175,16 +168,19 @@ class ChatListItem extends StatelessWidget {
Positioned(
top: 0,
right: 0,
- child: AnimatedScale(
- duration: FluffyThemes.animationDuration,
- curve: FluffyThemes.animationCurve,
- scale: listTileHovered ? 1.0 : 0.0,
- child: Material(
- color: backgroundColor,
- borderRadius: BorderRadius.circular(16),
- child: const Icon(
- Icons.arrow_drop_down_circle_outlined,
- size: 18,
+ child: GestureDetector(
+ onTap: () => onLongPress?.call(context),
+ child: AnimatedScale(
+ duration: FluffyThemes.animationDuration,
+ curve: FluffyThemes.animationCurve,
+ scale: listTileHovered ? 1.0 : 0.0,
+ child: Material(
+ color: backgroundColor,
+ borderRadius: BorderRadius.circular(16),
+ child: const Icon(
+ Icons.arrow_drop_down_circle_outlined,
+ size: 18,
+ ),
),
),
),
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 06e41bd77..683b372de 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -1,6 +1,14 @@
+import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat_list/chat_list.dart';
+import 'package:fluffychat/pages/chat_list/navi_rail_item.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/stream_extension.dart';
+import 'package:fluffychat/widgets/avatar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:go_router/go_router.dart';
+import 'package:matrix/matrix.dart';
import '../../widgets/matrix.dart';
import 'chat_list_body.dart';
@@ -12,6 +20,7 @@ class ChatListView extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ final client = Matrix.of(context).client;
return StreamBuilder(
stream: Matrix.of(context).onShareContentChanged.stream,
builder: (_, __) {
@@ -19,9 +28,13 @@ class ChatListView extends StatelessWidget {
return PopScope(
canPop: controller.selectMode == SelectMode.normal &&
!controller.isSearchMode &&
- controller.activeFilter == ActiveFilter.allChats,
- onPopInvoked: (pop) async {
+ controller.activeSpaceId == null,
+ onPopInvoked: (pop) {
if (pop) return;
+ if (controller.activeSpaceId != null) {
+ controller.clearActiveSpace();
+ return;
+ }
final selMode = controller.selectMode;
if (controller.isSearchMode) {
controller.cancelSearch();
@@ -32,34 +45,122 @@ class ChatListView extends StatelessWidget {
return;
}
},
- child: GestureDetector(
- onTap: FocusManager.instance.primaryFocus?.unfocus,
- excludeFromSemantics: true,
- behavior: HitTestBehavior.translucent,
- child: Scaffold(
- body: ChatListViewBody(controller),
- floatingActionButton:
- // #Pangea
- // KeyBoardShortcuts(
- // keysToPress: {
- // LogicalKeyboardKey.controlLeft,
- // LogicalKeyboardKey.keyN,
- // },
- // onKeysPressed: () => context.go('/rooms/newprivatechat'),
- // helpLabel: L10n.of(context)!.newChat,
- // child:
- // Pangea#
- selectMode == SelectMode.normal && !controller.isSearchMode
- ? FloatingActionButton.extended(
- onPressed: controller.addChatAction,
- icon: const Icon(Icons.add_outlined),
- label: Text(
- L10n.of(context)!.chat,
- overflow: TextOverflow.fade,
+ child: Row(
+ children: [
+ if (FluffyThemes.isColumnMode(context) &&
+ controller.widget.displayNavigationRail) ...[
+ StreamBuilder(
+ key: ValueKey(
+ client.userID.toString(),
+ ),
+ stream: client.onSync.stream
+ .where((s) => s.hasRoomUpdate)
+ .rateLimit(const Duration(seconds: 1)),
+ builder: (context, _) {
+ final allSpaces = Matrix.of(context)
+ .client
+ .rooms
+ .where((room) => room.isSpace);
+ final rootSpaces = allSpaces
+ .where(
+ (space) => !allSpaces.any(
+ (parentSpace) => parentSpace.spaceChildren
+ .any((child) => child.roomId == space.id),
),
)
- : const SizedBox.shrink(),
- ),
+ .toList();
+
+ return SizedBox(
+ width: FluffyThemes.navRailWidth,
+ child: ListView.builder(
+ scrollDirection: Axis.vertical,
+ itemCount: rootSpaces.length + 2,
+ itemBuilder: (context, i) {
+ if (i == 0) {
+ return NaviRailItem(
+ isSelected: controller.activeSpaceId == null,
+ onTap: controller.clearActiveSpace,
+ icon: const Icon(Icons.forum_outlined),
+ selectedIcon: const Icon(Icons.forum),
+ toolTip: L10n.of(context)!.chats,
+ unreadBadgeFilter: (room) => true,
+ );
+ }
+ i--;
+ if (i == rootSpaces.length) {
+ return NaviRailItem(
+ isSelected: false,
+ onTap: () => context.go('/rooms/newspace'),
+ icon: const Icon(Icons.add),
+ toolTip: L10n.of(context)!.createNewSpace,
+ );
+ }
+ final space = rootSpaces[i];
+ final displayname =
+ rootSpaces[i].getLocalizedDisplayname(
+ MatrixLocals(L10n.of(context)!),
+ );
+ final spaceChildrenIds =
+ space.spaceChildren.map((c) => c.roomId).toSet();
+ return NaviRailItem(
+ toolTip: displayname,
+ isSelected: controller.activeSpaceId == space.id,
+ onTap: () =>
+ controller.setActiveSpace(rootSpaces[i].id),
+ unreadBadgeFilter: (room) =>
+ spaceChildrenIds.contains(room.id),
+ icon: Avatar(
+ mxContent: rootSpaces[i].avatar,
+ name: displayname,
+ size: 32,
+ borderRadius: BorderRadius.circular(
+ AppConfig.borderRadius / 4,
+ ),
+ ),
+ );
+ },
+ ),
+ );
+ },
+ ),
+ Container(
+ color: Theme.of(context).dividerColor,
+ width: 1,
+ ),
+ ],
+ Expanded(
+ child: GestureDetector(
+ onTap: FocusManager.instance.primaryFocus?.unfocus,
+ excludeFromSemantics: true,
+ behavior: HitTestBehavior.translucent,
+ child: Scaffold(
+ body: ChatListViewBody(controller),
+ floatingActionButton:
+ // #Pangea
+ // KeyBoardShortcuts(
+ // keysToPress: {
+ // LogicalKeyboardKey.controlLeft,
+ // LogicalKeyboardKey.keyN,
+ // },
+ // onKeysPressed: () => context.go('/rooms/newprivatechat'),
+ // helpLabel: L10n.of(context)!.newChat,
+ // child:
+ // Pangea#
+ selectMode == SelectMode.normal &&
+ !controller.isSearchMode
+ ? FloatingActionButton.extended(
+ onPressed: controller.addChatAction,
+ icon: const Icon(Icons.add_outlined),
+ label: Text(
+ L10n.of(context)!.chat,
+ overflow: TextOverflow.fade,
+ ),
+ )
+ : const SizedBox.shrink(),
+ ),
+ ),
+ ),
+ ],
),
);
},
diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 6b11eae26..987ee5dbb 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -163,315 +163,310 @@ class _SpaceViewState extends State {
final room = Matrix.of(context).client.getRoomById(widget.spaceId);
final displayname =
room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
- return PopScope(
- canPop: false,
- onPopInvoked: (_) => widget.onBack(),
- child: Scaffold(
- appBar: AppBar(
- leading: Center(
- child: CloseButton(
- onPressed: widget.onBack,
- ),
+ return Scaffold(
+ appBar: AppBar(
+ leading: Center(
+ child: CloseButton(
+ onPressed: widget.onBack,
),
- titleSpacing: 0,
- title: ListTile(
- contentPadding: EdgeInsets.zero,
- leading: Avatar(
- mxContent: room?.avatar,
- name: displayname,
- borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
- ),
- title: Text(
- displayname,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- subtitle: room == null
- ? null
- : Text(
- L10n.of(context)!.countChatsAndCountParticipants(
- room.spaceChildren.length,
- room.summary.mJoinedMemberCount ?? 1,
- ),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
+ ),
+ titleSpacing: 0,
+ title: ListTile(
+ contentPadding: EdgeInsets.zero,
+ leading: Avatar(
+ mxContent: room?.avatar,
+ name: displayname,
+ borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
+ ),
+ title: Text(
+ displayname,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
- actions: [
- PopupMenuButton(
- onSelected: _onSpaceAction,
- itemBuilder: (context) => [
- PopupMenuItem(
- value: SpaceActions.settings,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- const Icon(Icons.settings_outlined),
- const SizedBox(width: 12),
- Text(L10n.of(context)!.settings),
- ],
+ subtitle: room == null
+ ? null
+ : Text(
+ L10n.of(context)!.countChatsAndCountParticipants(
+ room.spaceChildren.length,
+ room.summary.mJoinedMemberCount ?? 1,
),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
- PopupMenuItem(
- value: SpaceActions.invite,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- const Icon(Icons.person_add_outlined),
- const SizedBox(width: 12),
- Text(L10n.of(context)!.invite),
- ],
- ),
+ ),
+ actions: [
+ PopupMenuButton(
+ onSelected: _onSpaceAction,
+ itemBuilder: (context) => [
+ PopupMenuItem(
+ value: SpaceActions.settings,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Icon(Icons.settings_outlined),
+ const SizedBox(width: 12),
+ Text(L10n.of(context)!.settings),
+ ],
),
- PopupMenuItem(
- value: SpaceActions.leave,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- const Icon(Icons.delete_outlined),
- const SizedBox(width: 12),
- Text(L10n.of(context)!.leave),
- ],
- ),
+ ),
+ PopupMenuItem(
+ value: SpaceActions.invite,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Icon(Icons.person_add_outlined),
+ const SizedBox(width: 12),
+ Text(L10n.of(context)!.invite),
+ ],
),
- ],
- ),
- ],
- ),
- body: room == null
- ? const Center(
- child: Icon(
- Icons.search_outlined,
- size: 80,
+ ),
+ PopupMenuItem(
+ value: SpaceActions.leave,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Icon(Icons.delete_outlined),
+ const SizedBox(width: 12),
+ Text(L10n.of(context)!.leave),
+ ],
),
- )
- : StreamBuilder(
- stream: room.client.onSync.stream
- .where((s) => s.hasRoomUpdate)
- .rateLimit(const Duration(seconds: 1)),
- builder: (context, snapshot) {
- final childrenIds = room.spaceChildren
- .map((c) => c.roomId)
- .whereType()
- .toSet();
+ ),
+ ],
+ ),
+ ],
+ ),
+ body: room == null
+ ? const Center(
+ child: Icon(
+ Icons.search_outlined,
+ size: 80,
+ ),
+ )
+ : StreamBuilder(
+ stream: room.client.onSync.stream
+ .where((s) => s.hasRoomUpdate)
+ .rateLimit(const Duration(seconds: 1)),
+ builder: (context, snapshot) {
+ final childrenIds = room.spaceChildren
+ .map((c) => c.roomId)
+ .whereType()
+ .toSet();
- final joinedRooms = room.client.rooms
- .where((room) => childrenIds.remove(room.id))
- .toList();
+ final joinedRooms = room.client.rooms
+ .where((room) => childrenIds.remove(room.id))
+ .toList();
- final joinedParents = room.spaceParents
- .map((parent) {
- final roomId = parent.roomId;
- if (roomId == null) return null;
- return room.client.getRoomById(roomId);
- })
- .whereType()
- .toList();
- final filter = _filterController.text.trim().toLowerCase();
- return CustomScrollView(
- slivers: [
- SliverAppBar(
- floating: true,
- toolbarHeight: 72,
- scrolledUnderElevation: 0,
- backgroundColor: Colors.transparent,
- automaticallyImplyLeading: false,
- title: TextField(
- controller: _filterController,
- onChanged: (_) => setState(() {}),
- textInputAction: TextInputAction.search,
- decoration: InputDecoration(
- fillColor: Theme.of(context)
+ final joinedParents = room.spaceParents
+ .map((parent) {
+ final roomId = parent.roomId;
+ if (roomId == null) return null;
+ return room.client.getRoomById(roomId);
+ })
+ .whereType()
+ .toList();
+ final filter = _filterController.text.trim().toLowerCase();
+ return CustomScrollView(
+ slivers: [
+ SliverAppBar(
+ floating: true,
+ toolbarHeight: 72,
+ scrolledUnderElevation: 0,
+ backgroundColor: Colors.transparent,
+ automaticallyImplyLeading: false,
+ title: TextField(
+ controller: _filterController,
+ onChanged: (_) => setState(() {}),
+ textInputAction: TextInputAction.search,
+ decoration: InputDecoration(
+ fillColor:
+ Theme.of(context).colorScheme.secondaryContainer,
+ border: OutlineInputBorder(
+ borderSide: BorderSide.none,
+ borderRadius: BorderRadius.circular(99),
+ ),
+ contentPadding: EdgeInsets.zero,
+ hintText: L10n.of(context)!.search,
+ hintStyle: TextStyle(
+ color: Theme.of(context)
.colorScheme
- .secondaryContainer,
- border: OutlineInputBorder(
- borderSide: BorderSide.none,
- borderRadius: BorderRadius.circular(99),
- ),
- contentPadding: EdgeInsets.zero,
- hintText: L10n.of(context)!.search,
- hintStyle: TextStyle(
+ .onPrimaryContainer,
+ fontWeight: FontWeight.normal,
+ ),
+ floatingLabelBehavior: FloatingLabelBehavior.never,
+ prefixIcon: IconButton(
+ onPressed: () {},
+ icon: Icon(
+ Icons.search_outlined,
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
- fontWeight: FontWeight.normal,
- ),
- floatingLabelBehavior: FloatingLabelBehavior.never,
- prefixIcon: IconButton(
- onPressed: () {},
- icon: Icon(
- Icons.search_outlined,
- color: Theme.of(context)
- .colorScheme
- .onPrimaryContainer,
- ),
),
),
),
),
- SliverList.builder(
- itemCount: joinedParents.length,
- itemBuilder: (context, i) {
- final displayname =
- joinedParents[i].getLocalizedDisplayname();
- return Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 8,
- vertical: 1,
- ),
- child: Material(
- borderRadius:
- BorderRadius.circular(AppConfig.borderRadius),
- clipBehavior: Clip.hardEdge,
- child: ListTile(
- minVerticalPadding: 0,
- leading: Icon(
- Icons.adaptive.arrow_back_outlined,
- size: 16,
- ),
- title: Row(
- children: [
- Avatar(
- mxContent: joinedParents[i].avatar,
- name: displayname,
- size: Avatar.defaultSize / 2,
- borderRadius: BorderRadius.circular(
- AppConfig.borderRadius / 4,
- ),
+ ),
+ SliverList.builder(
+ itemCount: joinedParents.length,
+ itemBuilder: (context, i) {
+ final displayname =
+ joinedParents[i].getLocalizedDisplayname();
+ return Padding(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 8,
+ vertical: 1,
+ ),
+ child: Material(
+ borderRadius:
+ BorderRadius.circular(AppConfig.borderRadius),
+ clipBehavior: Clip.hardEdge,
+ child: ListTile(
+ minVerticalPadding: 0,
+ leading: Icon(
+ Icons.adaptive.arrow_back_outlined,
+ size: 16,
+ ),
+ title: Row(
+ children: [
+ Avatar(
+ mxContent: joinedParents[i].avatar,
+ name: displayname,
+ size: Avatar.defaultSize / 2,
+ borderRadius: BorderRadius.circular(
+ AppConfig.borderRadius / 4,
),
- const SizedBox(width: 8),
- Expanded(child: Text(displayname)),
- ],
- ),
- onTap: () =>
- widget.toParentSpace(joinedParents[i].id),
+ ),
+ const SizedBox(width: 8),
+ Expanded(child: Text(displayname)),
+ ],
),
+ onTap: () =>
+ widget.toParentSpace(joinedParents[i].id),
),
+ ),
+ );
+ },
+ ),
+ SliverList.builder(
+ itemCount: joinedRooms.length + 1,
+ itemBuilder: (context, i) {
+ if (i == 0) {
+ return SearchTitle(
+ title: L10n.of(context)!.joinedChats,
+ icon: const Icon(Icons.chat_outlined),
);
- },
- ),
- SliverList.builder(
- itemCount: joinedRooms.length + 1,
- itemBuilder: (context, i) {
- if (i == 0) {
- return SearchTitle(
- title: L10n.of(context)!.joinedChats,
- icon: const Icon(Icons.chat_outlined),
- );
- }
- i--;
- final room = joinedRooms[i];
- return ChatListItem(
+ }
+ i--;
+ final room = joinedRooms[i];
+ return ChatListItem(
+ room,
+ filter: filter,
+ onTap: () => widget.onChatTab(room),
+ onLongPress: (context) => widget.onChatContext(
room,
- filter: filter,
- onTap: () => widget.onChatTab(room),
- onLongPress: (context) => widget.onChatContext(
- room,
- context,
- ),
- activeChat: widget.activeChat == room.id,
+ context,
+ ),
+ activeChat: widget.activeChat == room.id,
+ );
+ },
+ ),
+ SliverList.builder(
+ itemCount: _discoveredChildren.length + 2,
+ itemBuilder: (context, i) {
+ if (i == 0) {
+ return SearchTitle(
+ title: L10n.of(context)!.discover,
+ icon: const Icon(Icons.explore_outlined),
);
- },
- ),
- SliverList.builder(
- itemCount: _discoveredChildren.length + 2,
- itemBuilder: (context, i) {
- if (i == 0) {
- return SearchTitle(
- title: L10n.of(context)!.discover,
- icon: const Icon(Icons.explore_outlined),
- );
- }
- i--;
- if (i == _discoveredChildren.length) {
- if (_noMoreRooms) {
- return Padding(
- padding: const EdgeInsets.all(12.0),
- child: Center(
- child: Text(
- L10n.of(context)!.noMoreChatsFound,
- style: const TextStyle(fontSize: 13),
- ),
- ),
- );
- }
+ }
+ i--;
+ if (i == _discoveredChildren.length) {
+ if (_noMoreRooms) {
return Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 12.0,
- vertical: 2.0,
- ),
- child: TextButton(
- onPressed: _isLoading ? null : _loadHierarchy,
- child: _isLoading
- ? LinearProgressIndicator(
- borderRadius: BorderRadius.circular(
- AppConfig.borderRadius,
- ),
- )
- : Text(L10n.of(context)!.loadMore),
+ padding: const EdgeInsets.all(12.0),
+ child: Center(
+ child: Text(
+ L10n.of(context)!.noMoreChatsFound,
+ style: const TextStyle(fontSize: 13),
+ ),
),
);
}
- final item = _discoveredChildren[i];
- final displayname = item.name ??
- item.canonicalAlias ??
- L10n.of(context)!.emptyChat;
- if (!displayname.toLowerCase().contains(filter)) {
- return const SizedBox.shrink();
- }
return Padding(
padding: const EdgeInsets.symmetric(
- horizontal: 8,
- vertical: 1,
+ horizontal: 12.0,
+ vertical: 2.0,
),
- child: Material(
- borderRadius:
- BorderRadius.circular(AppConfig.borderRadius),
- clipBehavior: Clip.hardEdge,
- child: ListTile(
- onTap: () => _joinChildRoom(item),
- leading: Avatar(
- mxContent: item.avatarUrl,
- name: displayname,
- borderRadius: item.roomType == 'm.space'
- ? BorderRadius.circular(
- AppConfig.borderRadius / 2,
- )
- : null,
- ),
- title: Row(
- children: [
- Expanded(
- child: Text(
- displayname,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
+ child: TextButton(
+ onPressed: _isLoading ? null : _loadHierarchy,
+ child: _isLoading
+ ? LinearProgressIndicator(
+ borderRadius: BorderRadius.circular(
+ AppConfig.borderRadius,
),
+ )
+ : Text(L10n.of(context)!.loadMore),
+ ),
+ );
+ }
+ final item = _discoveredChildren[i];
+ final displayname = item.name ??
+ item.canonicalAlias ??
+ L10n.of(context)!.emptyChat;
+ if (!displayname.toLowerCase().contains(filter)) {
+ return const SizedBox.shrink();
+ }
+ return Padding(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 8,
+ vertical: 1,
+ ),
+ child: Material(
+ borderRadius:
+ BorderRadius.circular(AppConfig.borderRadius),
+ clipBehavior: Clip.hardEdge,
+ child: ListTile(
+ onTap: () => _joinChildRoom(item),
+ leading: Avatar(
+ mxContent: item.avatarUrl,
+ name: displayname,
+ borderRadius: item.roomType == 'm.space'
+ ? BorderRadius.circular(
+ AppConfig.borderRadius / 2,
+ )
+ : null,
+ ),
+ title: Row(
+ children: [
+ Expanded(
+ child: Text(
+ displayname,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
- const SizedBox(width: 8),
- const Icon(
- Icons.add_circle_outline_outlined,
+ ),
+ const SizedBox(width: 8),
+ const Icon(
+ Icons.add_circle_outline_outlined,
+ ),
+ ],
+ ),
+ subtitle: Text(
+ item.topic ??
+ L10n.of(context)!.countParticipants(
+ item.numJoinedMembers,
),
- ],
- ),
- subtitle: Text(
- item.topic ??
- L10n.of(context)!.countParticipants(
- item.numJoinedMembers,
- ),
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
),
),
- );
- },
- ),
- ],
- );
- },
- ),
- ),
+ ),
+ );
+ },
+ ),
+ ],
+ );
+ },
+ ),
);
}
}
diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart
index 2db15e96f..64453070e 100644
--- a/lib/widgets/avatar.dart
+++ b/lib/widgets/avatar.dart
@@ -45,26 +45,26 @@ class Avatar extends StatelessWidget {
final noPic = mxContent == null ||
mxContent.toString().isEmpty ||
mxContent.toString() == 'null';
- final textWidget = Center(
+ final textWidget = Container(
+ color: name?.lightColorAvatar,
+ alignment: Alignment.center,
child: Text(
fallbackLetters,
style: TextStyle(
- color: noPic ? Colors.white : null,
+ color: Colors.white,
fontSize: (size / 2.5).roundToDouble(),
),
),
);
final borderRadius = this.borderRadius ?? BorderRadius.circular(size / 2);
final presenceUserId = this.presenceUserId;
- final color =
- noPic ? name?.lightColorAvatar : Theme.of(context).secondaryHeaderColor;
final container = Stack(
children: [
SizedBox(
width: size,
height: size,
child: Material(
- color: color,
+ color: Theme.of(context).colorScheme.surfaceContainerLowest,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
side: border ?? BorderSide.none,
@@ -73,13 +73,13 @@ class Avatar extends StatelessWidget {
child: noPic
? textWidget
: MxcImage(
- key: Key(mxContent.toString()),
+ key: ValueKey(mxContent.toString()),
+ cacheKey: '${mxContent}_$size',
uri: mxContent,
fit: BoxFit.cover,
width: size,
height: size,
placeholder: (_) => textWidget,
- cacheKey: mxContent.toString(),
),
),
),
diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart
index 9290156bf..34c53cb57 100644
--- a/lib/widgets/mxc_image.dart
+++ b/lib/widgets/mxc_image.dart
@@ -48,10 +48,10 @@ class MxcImage extends StatefulWidget {
class _MxcImageState extends State {
static final Map _imageDataCache = {};
Uint8List? _imageDataNoCache;
- Uint8List? get _imageData {
- final cacheKey = widget.cacheKey;
- return cacheKey == null ? _imageDataNoCache : _imageDataCache[cacheKey];
- }
+
+ Uint8List? get _imageData => widget.cacheKey == null
+ ? _imageDataNoCache
+ : _imageDataCache[widget.cacheKey];
set _imageData(Uint8List? data) {
if (data == null) return;
diff --git a/pubspec.lock b/pubspec.lock
index e55fd6fb7..0f7a9ba52 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -2692,13 +2692,13 @@ packages:
source: hosted
version: "1.2.0"
win32:
- dependency: transitive
+ dependency: "direct overridden"
description:
name: win32
- sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+ sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
url: "https://pub.dev"
source: hosted
- version: "5.5.1"
+ version: "5.5.0"
win32_registry:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 47eae5224..f8706bb85 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -216,3 +216,4 @@ dependency_overrides:
git:
url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git
ref: null-safety
+ win32: 5.5.0
\ No newline at end of file