Merge pull request #3219 from pangeachat/find-people-default-avatars

Adds default avatars to spaces in find your people
This commit is contained in:
ggurdin 2025-06-26 11:56:27 -04:00 committed by GitHub
commit 3797c80054
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 42 additions and 22 deletions

View file

@ -0,0 +1,16 @@
import 'dart:math';
import 'package:matrix/matrix_api_lite/generated/model.dart';
import 'package:fluffychat/pangea/spaces/constants/space_constants.dart';
extension PangeaRoomsChunk on PublicRoomsChunk {
/// Use Random with a seed to get the default
/// avatar associated with this space
String defaultAvatar() {
final int seed = roomId.hashCode;
return SpaceConstants.publicSpaceIcons[Random(seed).nextInt(
SpaceConstants.publicSpaceIcons.length,
)];
}
}

View file

@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/analytics_summary/learning_progress_indicator_button.dart';
import 'package:fluffychat/pangea/extensions/pangea_rooms_chunk_extension.dart';
import 'package:fluffychat/pangea/public_spaces/public_room_bottom_sheet.dart';
import 'package:fluffychat/widgets/avatar.dart';
@ -35,14 +37,26 @@ class PublicSpaceTile extends StatelessWidget {
height: isColumnMode ? 80.0 : 58.0,
child: Row(
children: [
Avatar(
mxContent: space.avatarUrl,
name: space.name,
size: isColumnMode ? 80.0 : 58.0,
borderRadius: BorderRadius.circular(
10,
),
),
(space.avatarUrl != null)
? Avatar(
mxContent: space.avatarUrl,
name: space.name,
size: isColumnMode ? 80.0 : 58.0,
borderRadius: BorderRadius.circular(
10,
),
)
: ClipRRect(
borderRadius: BorderRadius.circular(
10,
),
child: CachedNetworkImage(
imageUrl: space.defaultAvatar(),
width: isColumnMode ? 80.0 : 58.0,
height: isColumnMode ? 80.0 : 58.0,
fit: BoxFit.cover,
),
),
Flexible(
child: Padding(
padding: const EdgeInsets.all(8.0),

View file

@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
@ -9,7 +7,7 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/common/config/environment.dart';
import 'package:fluffychat/pangea/spaces/constants/space_constants.dart';
import 'package:fluffychat/pangea/extensions/pangea_rooms_chunk_extension.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/utils/fluffy_share.dart';
import 'package:fluffychat/widgets/avatar.dart';
@ -212,10 +210,7 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
: ClipRRect(
borderRadius: BorderRadius.circular(24.0),
child: CachedNetworkImage(
imageUrl: SpaceConstants
.publicSpaceIcons[Random().nextInt(
SpaceConstants.publicSpaceIcons.length,
)],
imageUrl: chunk!.defaultAvatar(),
width: 160.0,
height: 160.0,
fit: BoxFit.cover,

View file

@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';
@ -7,8 +5,8 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/common/widgets/pressable_button.dart';
import 'package:fluffychat/pangea/extensions/pangea_rooms_chunk_extension.dart';
import 'package:fluffychat/pangea/public_spaces/public_room_bottom_sheet.dart';
import 'package:fluffychat/pangea/spaces/constants/space_constants.dart';
import 'package:fluffychat/widgets/mxc_image.dart';
class PublicSpaceCard extends StatelessWidget {
@ -71,10 +69,7 @@ class PublicSpaceCard extends StatelessWidget {
fit: BoxFit.cover,
)
: CachedNetworkImage(
imageUrl: SpaceConstants
.publicSpaceIcons[Random().nextInt(
SpaceConstants.publicSpaceIcons.length,
)],
imageUrl: space.defaultAvatar(),
width: width,
height: width,
fit: BoxFit.cover,