aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fluffychat merge - resolve conflicts

Browse Source
pull/1384/head
ggurdin 1 year ago
parent 8de69e4c03 b8345e2ca6
commit 4b15b8fab4
No known key found for this signature in database
GPG Key ID: A01CB41737CBB478
8 changed files with 427 additions and 336 deletions
Show Stats Download Patch File Download Diff File

2
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -18,14 +18,12 @@
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"/> <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" <uses-permission android:name="android.permission.READ_PHONE_STATE"
android:maxSdkVersion="29" /> android:maxSdkVersion="29" />
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" /> <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
<uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<!-- #Pangea --> <!-- #Pangea -->
<uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="com.android.vending.BILLING" />

32
lib/pages/chat_list/chat_list_item.dart
Unescape Escape View File

@ -144,14 +144,7 @@ class ChatListItem extends StatelessWidget {
right: 0, right: 0,
child: Avatar( child: Avatar(
border: space == null border: space == null
? room.isSpace ? null
? BorderSide(
width: 0,
color: Theme.of(context)
.colorScheme
.outline,
)
: null
: BorderSide( : BorderSide(
width: 2, width: 2,
color: backgroundColor ?? color: backgroundColor ??
@ -175,16 +168,19 @@ class ChatListItem extends StatelessWidget {
Positioned( Positioned(
top: 0, top: 0,
right: 0, right: 0,
child: AnimatedScale( child: GestureDetector(
duration: FluffyThemes.animationDuration, onTap: () => onLongPress?.call(context),
curve: FluffyThemes.animationCurve, child: AnimatedScale(
scale: listTileHovered ? 1.0 : 0.0, duration: FluffyThemes.animationDuration,
child: Material( curve: FluffyThemes.animationCurve,
color: backgroundColor, scale: listTileHovered ? 1.0 : 0.0,
borderRadius: BorderRadius.circular(16), child: Material(
child: const Icon( color: backgroundColor,
Icons.arrow_drop_down_circle_outlined, borderRadius: BorderRadius.circular(16),
size: 18, child: const Icon(
Icons.arrow_drop_down_circle_outlined,
size: 18,
),
), ),
), ),
), ),

157
lib/pages/chat_list/chat_list_view.dart
Unescape Escape View File

@ -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/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/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.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 '../../widgets/matrix.dart';
import 'chat_list_body.dart'; import 'chat_list_body.dart';
@ -12,6 +20,7 @@ class ChatListView extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final client = Matrix.of(context).client;
return StreamBuilder<Object?>( return StreamBuilder<Object?>(
stream: Matrix.of(context).onShareContentChanged.stream, stream: Matrix.of(context).onShareContentChanged.stream,
builder: (_, __) { builder: (_, __) {
@ -19,9 +28,13 @@ class ChatListView extends StatelessWidget {
return PopScope( return PopScope(
canPop: controller.selectMode == SelectMode.normal && canPop: controller.selectMode == SelectMode.normal &&
!controller.isSearchMode && !controller.isSearchMode &&
controller.activeFilter == ActiveFilter.allChats, controller.activeSpaceId == null,
onPopInvoked: (pop) async { onPopInvoked: (pop) {
if (pop) return; if (pop) return;
if (controller.activeSpaceId != null) {
controller.clearActiveSpace();
return;
}
final selMode = controller.selectMode; final selMode = controller.selectMode;
if (controller.isSearchMode) { if (controller.isSearchMode) {
controller.cancelSearch(); controller.cancelSearch();
@ -32,34 +45,122 @@ class ChatListView extends StatelessWidget {
return; return;
} }
}, },
child: GestureDetector( child: Row(
onTap: FocusManager.instance.primaryFocus?.unfocus, children: [
excludeFromSemantics: true, if (FluffyThemes.isColumnMode(context) &&
behavior: HitTestBehavior.translucent, controller.widget.displayNavigationRail) ...[
child: Scaffold( StreamBuilder(
body: ChatListViewBody(controller), key: ValueKey(
floatingActionButton: client.userID.toString(),
// #Pangea ),
// KeyBoardShortcuts( stream: client.onSync.stream
// keysToPress: { .where((s) => s.hasRoomUpdate)
// LogicalKeyboardKey.controlLeft, .rateLimit(const Duration(seconds: 1)),
// LogicalKeyboardKey.keyN, builder: (context, _) {
// }, final allSpaces = Matrix.of(context)
// onKeysPressed: () => context.go('/rooms/newprivatechat'), .client
// helpLabel: L10n.of(context)!.newChat, .rooms
// child: .where((room) => room.isSpace);
// Pangea# final rootSpaces = allSpaces
selectMode == SelectMode.normal && !controller.isSearchMode .where(
? FloatingActionButton.extended( (space) => !allSpaces.any(
onPressed: controller.addChatAction, (parentSpace) => parentSpace.spaceChildren
icon: const Icon(Icons.add_outlined), .any((child) => child.roomId == space.id),
label: Text(
L10n.of(context)!.chat,
overflow: TextOverflow.fade,
), ),
) )
: 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(),
),
),
),
],
), ),
); );
}, },

543
lib/pages/chat_list/space_view.dart
Unescape Escape View File

@ -163,315 +163,310 @@ class _SpaceViewState extends State<SpaceView> {
final room = Matrix.of(context).client.getRoomById(widget.spaceId); final room = Matrix.of(context).client.getRoomById(widget.spaceId);
final displayname = final displayname =
room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound; room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
return PopScope( return Scaffold(
canPop: false, appBar: AppBar(
onPopInvoked: (_) => widget.onBack(), leading: Center(
child: Scaffold( child: CloseButton(
appBar: AppBar( onPressed: widget.onBack,
leading: Center(
child: CloseButton(
onPressed: widget.onBack,
),
), ),
titleSpacing: 0, ),
title: ListTile( titleSpacing: 0,
contentPadding: EdgeInsets.zero, title: ListTile(
leading: Avatar( contentPadding: EdgeInsets.zero,
mxContent: room?.avatar, leading: Avatar(
name: displayname, mxContent: room?.avatar,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2), name: displayname,
), borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
title: Text( ),
displayname, title: Text(
maxLines: 1, displayname,
overflow: TextOverflow.ellipsis, 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,
),
), ),
actions: [ subtitle: room == null
PopupMenuButton<SpaceActions>( ? null
onSelected: _onSpaceAction, : Text(
itemBuilder: (context) => [ L10n.of(context)!.countChatsAndCountParticipants(
PopupMenuItem( room.spaceChildren.length,
value: SpaceActions.settings, room.summary.mJoinedMemberCount ?? 1,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
), ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
PopupMenuItem( ),
value: SpaceActions.invite, actions: [
child: Row( PopupMenuButton<SpaceActions>(
mainAxisSize: MainAxisSize.min, onSelected: _onSpaceAction,
children: [ itemBuilder: (context) => [
const Icon(Icons.person_add_outlined), PopupMenuItem(
const SizedBox(width: 12), value: SpaceActions.settings,
Text(L10n.of(context)!.invite), child: Row(
], mainAxisSize: MainAxisSize.min,
), children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
), ),
PopupMenuItem( ),
value: SpaceActions.leave, PopupMenuItem(
child: Row( value: SpaceActions.invite,
mainAxisSize: MainAxisSize.min, child: Row(
children: [ mainAxisSize: MainAxisSize.min,
const Icon(Icons.delete_outlined), children: [
const SizedBox(width: 12), const Icon(Icons.person_add_outlined),
Text(L10n.of(context)!.leave), const SizedBox(width: 12),
], Text(L10n.of(context)!.invite),
), ],
), ),
], ),
), PopupMenuItem(
], value: SpaceActions.leave,
), child: Row(
body: room == null mainAxisSize: MainAxisSize.min,
? const Center( children: [
child: Icon( const Icon(Icons.delete_outlined),
Icons.search_outlined, const SizedBox(width: 12),
size: 80, Text(L10n.of(context)!.leave),
],
), ),
) ),
: StreamBuilder( ],
stream: room.client.onSync.stream ),
.where((s) => s.hasRoomUpdate) ],
.rateLimit(const Duration(seconds: 1)), ),
builder: (context, snapshot) { body: room == null
final childrenIds = room.spaceChildren ? const Center(
.map((c) => c.roomId) child: Icon(
.whereType<String>() Icons.search_outlined,
.toSet(); 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<String>()
.toSet();
final joinedRooms = room.client.rooms final joinedRooms = room.client.rooms
.where((room) => childrenIds.remove(room.id)) .where((room) => childrenIds.remove(room.id))
.toList(); .toList();
final joinedParents = room.spaceParents final joinedParents = room.spaceParents
.map((parent) { .map((parent) {
final roomId = parent.roomId; final roomId = parent.roomId;
if (roomId == null) return null; if (roomId == null) return null;
return room.client.getRoomById(roomId); return room.client.getRoomById(roomId);
}) })
.whereType<Room>() .whereType<Room>()
.toList(); .toList();
final filter = _filterController.text.trim().toLowerCase(); final filter = _filterController.text.trim().toLowerCase();
return CustomScrollView( return CustomScrollView(
slivers: [ slivers: [
SliverAppBar( SliverAppBar(
floating: true, floating: true,
toolbarHeight: 72, toolbarHeight: 72,
scrolledUnderElevation: 0, scrolledUnderElevation: 0,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: TextField( title: TextField(
controller: _filterController, controller: _filterController,
onChanged: (_) => setState(() {}), onChanged: (_) => setState(() {}),
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Theme.of(context) 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 .colorScheme
.secondaryContainer, .onPrimaryContainer,
border: OutlineInputBorder( fontWeight: FontWeight.normal,
borderSide: BorderSide.none, ),
borderRadius: BorderRadius.circular(99), floatingLabelBehavior: FloatingLabelBehavior.never,
), prefixIcon: IconButton(
contentPadding: EdgeInsets.zero, onPressed: () {},
hintText: L10n.of(context)!.search, icon: Icon(
hintStyle: TextStyle( Icons.search_outlined,
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onPrimaryContainer, .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, SliverList.builder(
itemBuilder: (context, i) { itemCount: joinedParents.length,
final displayname = itemBuilder: (context, i) {
joinedParents[i].getLocalizedDisplayname(); final displayname =
return Padding( joinedParents[i].getLocalizedDisplayname();
padding: const EdgeInsets.symmetric( return Padding(
horizontal: 8, padding: const EdgeInsets.symmetric(
vertical: 1, horizontal: 8,
), vertical: 1,
child: Material( ),
borderRadius: child: Material(
BorderRadius.circular(AppConfig.borderRadius), borderRadius:
clipBehavior: Clip.hardEdge, BorderRadius.circular(AppConfig.borderRadius),
child: ListTile( clipBehavior: Clip.hardEdge,
minVerticalPadding: 0, child: ListTile(
leading: Icon( minVerticalPadding: 0,
Icons.adaptive.arrow_back_outlined, leading: Icon(
size: 16, Icons.adaptive.arrow_back_outlined,
), size: 16,
title: Row( ),
children: [ title: Row(
Avatar( children: [
mxContent: joinedParents[i].avatar, Avatar(
name: displayname, mxContent: joinedParents[i].avatar,
size: Avatar.defaultSize / 2, name: displayname,
borderRadius: BorderRadius.circular( size: Avatar.defaultSize / 2,
AppConfig.borderRadius / 4, borderRadius: BorderRadius.circular(
), AppConfig.borderRadius / 4,
), ),
const SizedBox(width: 8), ),
Expanded(child: Text(displayname)), const SizedBox(width: 8),
], Expanded(child: Text(displayname)),
), ],
onTap: () =>
widget.toParentSpace(joinedParents[i].id),
), ),
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),
); );
}, }
), i--;
SliverList.builder( final room = joinedRooms[i];
itemCount: joinedRooms.length + 1, return ChatListItem(
itemBuilder: (context, i) { room,
if (i == 0) { filter: filter,
return SearchTitle( onTap: () => widget.onChatTab(room),
title: L10n.of(context)!.joinedChats, onLongPress: (context) => widget.onChatContext(
icon: const Icon(Icons.chat_outlined),
);
}
i--;
final room = joinedRooms[i];
return ChatListItem(
room, room,
filter: filter, context,
onTap: () => widget.onChatTab(room), ),
onLongPress: (context) => widget.onChatContext( activeChat: widget.activeChat == room.id,
room, );
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),
); );
}, }
), i--;
SliverList.builder( if (i == _discoveredChildren.length) {
itemCount: _discoveredChildren.length + 2, if (_noMoreRooms) {
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),
),
),
);
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.all(12.0),
horizontal: 12.0, child: Center(
vertical: 2.0, child: Text(
), L10n.of(context)!.noMoreChatsFound,
child: TextButton( style: const TextStyle(fontSize: 13),
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( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8, horizontal: 12.0,
vertical: 1, vertical: 2.0,
), ),
child: Material( child: TextButton(
borderRadius: onPressed: _isLoading ? null : _loadHierarchy,
BorderRadius.circular(AppConfig.borderRadius), child: _isLoading
clipBehavior: Clip.hardEdge, ? LinearProgressIndicator(
child: ListTile( borderRadius: BorderRadius.circular(
onTap: () => _joinChildRoom(item), AppConfig.borderRadius,
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,
), ),
)
: 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( const SizedBox(width: 8),
Icons.add_circle_outline_outlined, const Icon(
Icons.add_circle_outline_outlined,
),
],
),
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
), ),
], maxLines: 1,
), overflow: TextOverflow.ellipsis,
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
), ),
), ),
); ),
}, );
), },
], ),
); ],
}, );
), },
), ),
); );
} }
} }

14
lib/widgets/avatar.dart
Unescape Escape View File

@ -45,26 +45,26 @@ class Avatar extends StatelessWidget {
final noPic = mxContent == null || final noPic = mxContent == null ||
mxContent.toString().isEmpty || mxContent.toString().isEmpty ||
mxContent.toString() == 'null'; mxContent.toString() == 'null';
final textWidget = Center( final textWidget = Container(
color: name?.lightColorAvatar,
alignment: Alignment.center,
child: Text( child: Text(
fallbackLetters, fallbackLetters,
style: TextStyle( style: TextStyle(
color: noPic ? Colors.white : null, color: Colors.white,
fontSize: (size / 2.5).roundToDouble(), fontSize: (size / 2.5).roundToDouble(),
), ),
), ),
); );
final borderRadius = this.borderRadius ?? BorderRadius.circular(size / 2); final borderRadius = this.borderRadius ?? BorderRadius.circular(size / 2);
final presenceUserId = this.presenceUserId; final presenceUserId = this.presenceUserId;
final color =
noPic ? name?.lightColorAvatar : Theme.of(context).secondaryHeaderColor;
final container = Stack( final container = Stack(
children: [ children: [
SizedBox( SizedBox(
width: size, width: size,
height: size, height: size,
child: Material( child: Material(
color: color, color: Theme.of(context).colorScheme.surfaceContainerLowest,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: borderRadius, borderRadius: borderRadius,
side: border ?? BorderSide.none, side: border ?? BorderSide.none,
@ -73,13 +73,13 @@ class Avatar extends StatelessWidget {
child: noPic child: noPic
? textWidget ? textWidget
: MxcImage( : MxcImage(
key: Key(mxContent.toString()), key: ValueKey(mxContent.toString()),
cacheKey: '${mxContent}_$size',
uri: mxContent, uri: mxContent,
fit: BoxFit.cover, fit: BoxFit.cover,
width: size, width: size,
height: size, height: size,
placeholder: (_) => textWidget, placeholder: (_) => textWidget,
cacheKey: mxContent.toString(),
), ),
), ),
), ),

8
lib/widgets/mxc_image.dart
Unescape Escape View File

@ -48,10 +48,10 @@ class MxcImage extends StatefulWidget {
class _MxcImageState extends State<MxcImage> { class _MxcImageState extends State<MxcImage> {
static final Map<String, Uint8List> _imageDataCache = {}; static final Map<String, Uint8List> _imageDataCache = {};
Uint8List? _imageDataNoCache; Uint8List? _imageDataNoCache;
Uint8List? get _imageData {
final cacheKey = widget.cacheKey; Uint8List? get _imageData => widget.cacheKey == null
return cacheKey == null ? _imageDataNoCache : _imageDataCache[cacheKey]; ? _imageDataNoCache
} : _imageDataCache[widget.cacheKey];
set _imageData(Uint8List? data) { set _imageData(Uint8List? data) {
if (data == null) return; if (data == null) return;

6
pubspec.lock
Unescape Escape View File

@ -2692,13 +2692,13 @@ packages:
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
win32: win32:
dependency: transitive dependency: "direct overridden"
description: description:
name: win32 name: win32
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.5.1" version: "5.5.0"
win32_registry: win32_registry:
dependency: transitive dependency: transitive
description: description:

1
pubspec.yaml
Unescape Escape View File

@ -216,3 +216,4 @@ dependency_overrides:
git: git:
url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git
ref: null-safety ref: null-safety
win32: 5.5.0
Write Preview
Loading…
Cancel
Save