refactor: minor profile loader improvement

This commit is contained in:
2025-05-28 11:40:53 +01:00
parent c6b76bc64d
commit 2ec17c6c41
4 changed files with 157 additions and 145 deletions

View File

@ -23,33 +23,31 @@ class ChatMessageWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return FutureBuilder(
future: ndk.metadata.loadMetadata(msg.pubKey),
builder: (ctx, state) {
final profile = state.data ?? Metadata(pubKey: msg.pubKey);
return GestureDetector(
onLongPress: () {
if (ndk.accounts.canSign) {
showModalBottomSheet(
context: context,
constraints: BoxConstraints.expand(),
builder:
(ctx) => ChatModalWidget(
profile: profile,
event: msg,
stream: stream,
),
);
}
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 2, vertical: 4),
child: Column(
spacing: 2,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_chatText(profile),
/*RxFilter<Nip01Event>(
return ProfileLoaderWidget(msg.pubKey, (ctx, state) {
final profile = state.data ?? Metadata(pubKey: msg.pubKey);
return GestureDetector(
onLongPress: () {
if (ndk.accounts.canSign) {
showModalBottomSheet(
context: context,
constraints: BoxConstraints.expand(),
builder:
(ctx) => ChatModalWidget(
profile: profile,
event: msg,
stream: stream,
),
);
}
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 2, vertical: 4),
child: Column(
spacing: 2,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_chatText(profile),
/*RxFilter<Nip01Event>(
Key(msg.id),
filters: [
Filter(kinds: [9735, 7], eTags: [msg.id]),
@ -58,12 +56,11 @@ class ChatMessageWidget extends StatelessWidget {
return ChatReactions(msg: msg, events: state ?? []);
},
),*/
],
),
],
),
);
},
);
),
);
});
}
Widget _chatText(Metadata profile) {

View File

@ -5,6 +5,9 @@ import 'package:ndk/shared/nips/nip19/nip19.dart';
import 'package:zap_stream_flutter/const.dart';
import 'package:zap_stream_flutter/widgets/avatar.dart';
// create simple sync cache to avoid extra re-draw
final Map<String, Metadata> syncProfileCache = {};
class ProfileLoaderWidget extends StatelessWidget {
final String pubkey;
final AsyncWidgetBuilder<Metadata?> builder;
@ -14,8 +17,18 @@ class ProfileLoaderWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return FutureBuilder(
key: super.key ?? Key("profile-loader:$pubkey"),
future: ndk.metadata.loadMetadata(pubkey),
key: super.key,
initialData:
syncProfileCache.containsKey(pubkey)
? syncProfileCache[pubkey]
: null,
future: () async {
final profile = await ndk.metadata.loadMetadata(pubkey);
if (profile != null) {
syncProfileCache[pubkey] = profile;
}
return profile;
}(),
builder: builder,
);
}

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:ndk/ndk.dart';
import 'package:zap_stream_flutter/i18n/strings.g.dart';
import 'package:zap_stream_flutter/imgproxy.dart';
import 'package:zap_stream_flutter/theme.dart';
@ -79,28 +80,31 @@ class StreamTileWidget extends StatelessWidget {
),
),
),
Row(
spacing: 8,
children: [
AvatarWidget.pubkey(stream.info.host),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
stream.info.title ?? "",
overflow: TextOverflow.clip,
style: TextStyle(fontWeight: FontWeight.w500),
),
ProfileNameWidget.pubkey(
stream.info.host,
style: TextStyle(color: LAYER_4),
),
],
ProfileLoaderWidget(stream.info.host, (context, state) {
final profile = state.data ?? Metadata(pubKey: stream.info.host);
return Row(
spacing: 8,
children: [
AvatarWidget(profile: profile),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
stream.info.title ?? "",
overflow: TextOverflow.clip,
style: TextStyle(fontWeight: FontWeight.w500),
),
ProfileNameWidget(
profile: profile,
style: TextStyle(color: LAYER_4),
),
],
),
),
),
],
),
],
);
}),
],
),
);