chore: Improve avatar designg
Signed-off-by: Krille <c.kussowski@famedly.com>
This commit is contained in:
parent
782d0577a2
commit
e0525940ba
2 changed files with 54 additions and 53 deletions
|
|
@ -1,15 +1,14 @@
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
|
||||||
import 'package:matrix/matrix.dart';
|
|
||||||
|
|
||||||
import 'package:fluffychat/config/app_config.dart';
|
import 'package:fluffychat/config/app_config.dart';
|
||||||
import 'package:fluffychat/utils/date_time_extension.dart';
|
import 'package:fluffychat/utils/date_time_extension.dart';
|
||||||
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
|
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
|
||||||
import 'package:fluffychat/widgets/avatar.dart';
|
import 'package:fluffychat/widgets/avatar.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||||
|
import 'package:matrix/matrix.dart';
|
||||||
|
|
||||||
class RoomCreationStateEvent extends StatelessWidget {
|
class RoomCreationStateEvent extends StatelessWidget {
|
||||||
final Event event;
|
final Event event;
|
||||||
|
|
||||||
const RoomCreationStateEvent({required this.event, super.key});
|
const RoomCreationStateEvent({required this.event, super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|
@ -21,28 +20,32 @@ class RoomCreationStateEvent extends StatelessWidget {
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.only(bottom: 32.0),
|
padding: const EdgeInsets.only(bottom: 32.0),
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Material(
|
child: ConstrainedBox(
|
||||||
color: theme.colorScheme.surface.withAlpha(128),
|
constraints: const BoxConstraints(maxWidth: 256),
|
||||||
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
child: Material(
|
||||||
child: Padding(
|
color: theme.colorScheme.surfaceContainer,
|
||||||
padding: const EdgeInsets.all(16.0),
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
||||||
child: Column(
|
child: Padding(
|
||||||
mainAxisSize: MainAxisSize.min,
|
padding: const EdgeInsets.all(16.0),
|
||||||
children: [
|
child: Column(
|
||||||
Avatar(
|
mainAxisSize: MainAxisSize.min,
|
||||||
mxContent: event.room.avatar,
|
children: [
|
||||||
name: roomName,
|
Avatar(
|
||||||
size: Avatar.defaultSize * 2,
|
mxContent: event.room.avatar,
|
||||||
),
|
name: roomName,
|
||||||
Text(
|
size: Avatar.defaultSize * 2,
|
||||||
roomName,
|
),
|
||||||
style: theme.textTheme.headlineSmall,
|
Text(
|
||||||
),
|
roomName,
|
||||||
Text(
|
style: theme.textTheme.bodyLarge,
|
||||||
'${event.originServerTs.localizedTime(context)} | ${l10n.countParticipants((event.room.summary.mJoinedMemberCount ?? 1) + (event.room.summary.mInvitedMemberCount ?? 0))}',
|
),
|
||||||
style: theme.textTheme.labelSmall,
|
const SizedBox(height: 8),
|
||||||
),
|
Text(
|
||||||
],
|
'${event.originServerTs.localizedTime(context)} | ${l10n.countParticipants((event.room.summary.mJoinedMemberCount ?? 1) + (event.room.summary.mInvitedMemberCount ?? 0))}',
|
||||||
|
style: theme.textTheme.labelSmall,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
import 'package:matrix/matrix.dart';
|
|
||||||
|
|
||||||
import 'package:fluffychat/utils/string_color.dart';
|
import 'package:fluffychat/utils/string_color.dart';
|
||||||
import 'package:fluffychat/widgets/mxc_image.dart';
|
import 'package:fluffychat/widgets/mxc_image.dart';
|
||||||
import 'package:fluffychat/widgets/presence_builder.dart';
|
import 'package:fluffychat/widgets/presence_builder.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:matrix/matrix.dart';
|
||||||
|
|
||||||
class Avatar extends StatelessWidget {
|
class Avatar extends StatelessWidget {
|
||||||
final Uri? mxContent;
|
final Uri? mxContent;
|
||||||
|
|
@ -37,31 +35,13 @@ class Avatar extends StatelessWidget {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final theme = Theme.of(context);
|
final theme = Theme.of(context);
|
||||||
|
|
||||||
var fallbackLetters = '@';
|
|
||||||
final name = this.name;
|
final name = this.name;
|
||||||
if (name != null) {
|
final fallbackLetters =
|
||||||
if (name.runes.length >= 2) {
|
name == null || name.isEmpty ? '@' : name.substring(0, 1);
|
||||||
fallbackLetters = String.fromCharCodes(name.runes, 0, 2);
|
|
||||||
} else if (name.runes.length == 1) {
|
|
||||||
fallbackLetters = name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
final noPic = mxContent == null ||
|
final noPic = mxContent == null ||
|
||||||
mxContent.toString().isEmpty ||
|
mxContent.toString().isEmpty ||
|
||||||
mxContent.toString() == 'null';
|
mxContent.toString() == 'null';
|
||||||
final textColor = name?.lightColorAvatar;
|
|
||||||
final textWidget = Container(
|
|
||||||
color: textColor,
|
|
||||||
alignment: Alignment.center,
|
|
||||||
child: Text(
|
|
||||||
fallbackLetters,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Colors.white,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
fontSize: (size / 3).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 container = Stack(
|
final container = Stack(
|
||||||
|
|
@ -79,7 +59,25 @@ class Avatar extends StatelessWidget {
|
||||||
),
|
),
|
||||||
clipBehavior: Clip.hardEdge,
|
clipBehavior: Clip.hardEdge,
|
||||||
child: noPic
|
child: noPic
|
||||||
? textWidget
|
? Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
colors: [name!.lightColorAvatar, name.color],
|
||||||
|
begin: Alignment.topLeft,
|
||||||
|
end: Alignment.bottomRight,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Text(
|
||||||
|
fallbackLetters,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
fontSize: (size / 2.5).roundToDouble(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
: MxcImage(
|
: MxcImage(
|
||||||
client: client,
|
client: client,
|
||||||
key: ValueKey(mxContent.toString()),
|
key: ValueKey(mxContent.toString()),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue