fix passing an mxc to expandableimage

This commit is contained in:
Henry Hiles 2026-05-20 10:26:33 -04:00
commit 740ab2fb9f
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 21 additions and 2 deletions

View file

@ -1,7 +1,9 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart"; import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/client_state_controller.dart";
import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart";
import "package:nexus/helpers/extensions/mxc_to_https.dart";
import "package:nexus/widgets/appbar.dart"; import "package:nexus/widgets/appbar.dart";
import "package:nexus/widgets/avatar_or_hash.dart"; import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/expandable_image.dart"; import "package:nexus/widgets/expandable_image.dart";
@ -29,7 +31,15 @@ class RoomAppbar extends ConsumerWidget implements PreferredSizeWidget {
? room == null ? room == null
? null ? null
: ExpandableImage( : ExpandableImage(
room.metadata?.avatar?.toString(), room.metadata?.avatar
?.mxcToHttps(
ref.watch(
ClientStateController.provider.select(
(value) => value!.homeserverUrl!,
),
),
)
.toString(),
child: AvatarOrHash( child: AvatarOrHash(
room.metadata?.avatar, room.metadata?.avatar,
room.metadata?.name ?? "Unnamed Rooms", room.metadata?.name ?? "Unnamed Rooms",

View file

@ -9,6 +9,7 @@ import "package:nexus/controllers/profile_controller.dart";
import "package:nexus/controllers/selected_room_controller.dart"; import "package:nexus/controllers/selected_room_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/helpers/extensions/get_localpart.dart"; import "package:nexus/helpers/extensions/get_localpart.dart";
import "package:nexus/helpers/extensions/mxc_to_https.dart";
import "package:nexus/models/configs/power_level_config.dart"; import "package:nexus/models/configs/power_level_config.dart";
import "package:nexus/models/content/membership.dart"; import "package:nexus/models/content/membership.dart";
import "package:nexus/models/membership_status.dart"; import "package:nexus/models/membership_status.dart";
@ -91,7 +92,15 @@ class UserPopover extends ConsumerWidget {
runSpacing: 8, runSpacing: 8,
children: [ children: [
ExpandableImage( ExpandableImage(
member.avatarUrl?.toString(), member.avatarUrl
?.mxcToHttps(
ref.watch(
ClientStateController.provider.select(
(value) => value!.homeserverUrl!,
),
),
)
.toString(),
child: AvatarOrHash( child: AvatarOrHash(
member.avatarUrl, member.avatarUrl,
member.displayName ?? userId.localpart, member.displayName ?? userId.localpart,