diff --git a/filcnaplo/lib/ui/widgets/message/message_tile.dart b/filcnaplo/lib/ui/widgets/message/message_tile.dart index 4247fc9..5afb4a7 100644 --- a/filcnaplo/lib/ui/widgets/message/message_tile.dart +++ b/filcnaplo/lib/ui/widgets/message/message_tile.dart @@ -1,6 +1,5 @@ import 'package:filcnaplo/models/settings.dart'; import 'package:filcnaplo/theme/colors/colors.dart'; -import 'package:filcnaplo/utils/color.dart'; import 'package:filcnaplo/utils/format.dart'; import 'package:filcnaplo_kreta_api/models/message.dart'; import 'package:filcnaplo_mobile_ui/common/profile_image/profile_image.dart'; @@ -34,19 +33,23 @@ class MessageTile extends StatelessWidget { onTap: onTap, visualDensity: VisualDensity.compact, contentPadding: const EdgeInsets.only(left: 8.0, right: 4.0), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)), - leading: !Provider.of(context, listen: false).presentationMode + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)), + leading: !Provider.of(context, listen: false) + .presentationMode ? ProfileImage( name: message.author, - radius: 22.0, - backgroundColor: ColorUtils.stringToColor(message.author), + radius: 19.2, + backgroundColor: Theme.of(context).colorScheme.secondary, censored: censored, + isNotePfp: true, ) : ProfileImage( name: "Béla", - radius: 22.0, + radius: 19.2, backgroundColor: Theme.of(context).colorScheme.secondary, censored: censored, + isNotePfp: true, ), title: censored ? Wrap( @@ -65,13 +68,18 @@ class MessageTile extends StatelessWidget { children: [ Expanded( child: Text( - !Provider.of(context, listen: false).presentationMode ? message.author : "Béla", + !Provider.of(context, listen: false) + .presentationMode + ? message.author + : "Béla", maxLines: 2, overflow: TextOverflow.ellipsis, - style: const TextStyle(fontWeight: FontWeight.w600, fontSize: 15.5), + style: const TextStyle( + fontWeight: FontWeight.w600, fontSize: 15.5), ), ), - if (message.attachments.isNotEmpty) const Icon(FeatherIcons.paperclip, size: 16.0) + if (message.attachments.isNotEmpty) + const Icon(FeatherIcons.paperclip, size: 16.0) ], ), subtitle: censored @@ -91,7 +99,8 @@ class MessageTile extends StatelessWidget { message.subject, maxLines: 1, overflow: TextOverflow.ellipsis, - style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14.0), + style: const TextStyle( + fontWeight: FontWeight.w500, fontSize: 14.0), ), trailing: censored ? Wrap( diff --git a/filcnaplo_mobile_ui/lib/common/profile_image/profile_image.dart b/filcnaplo_mobile_ui/lib/common/profile_image/profile_image.dart index 8be0567..3854042 100755 --- a/filcnaplo_mobile_ui/lib/common/profile_image/profile_image.dart +++ b/filcnaplo_mobile_ui/lib/common/profile_image/profile_image.dart @@ -20,6 +20,7 @@ class ProfileImage extends StatefulWidget { this.role = Role.student, this.censored = false, this.profilePictureString = "", + this.isNotePfp = false, }); final void Function()? onTap; @@ -33,6 +34,7 @@ class ProfileImage extends StatefulWidget { final Role? role; final bool censored; final String profilePictureString; + final bool isNotePfp; @override State createState() => _ProfileImageState(); @@ -86,8 +88,11 @@ class _ProfileImageState extends State { Material( clipBehavior: Clip.hardEdge, shape: const CircleBorder(), - color: widget.backgroundColor ?? - AppColors.of(context).text.withOpacity(.15), + color: widget.name != null && widget.name! == 'Rendszerüzenet' + ? widget.backgroundColor?.withOpacity(0.5) ?? + AppColors.of(context).text.withOpacity(0.5) + : widget.backgroundColor ?? + AppColors.of(context).text.withOpacity(.15), child: InkWell( onTap: widget.onTap, onDoubleTap: widget.onDoubleTap, @@ -119,7 +124,8 @@ class _ProfileImageState extends State { style: TextStyle( color: color, fontWeight: FontWeight.w600, - fontSize: 18.0 * (widget.radius / 20.0), + fontSize: (widget.isNotePfp ? 20 : 18.0) * + (widget.radius / 20.0), ), ), ) diff --git a/filcnaplo_mobile_ui/lib/common/widgets/note/note_tile.dart b/filcnaplo_mobile_ui/lib/common/widgets/note/note_tile.dart index 276d7c8..8ac2040 100755 --- a/filcnaplo_mobile_ui/lib/common/widgets/note/note_tile.dart +++ b/filcnaplo_mobile_ui/lib/common/widgets/note/note_tile.dart @@ -1,4 +1,3 @@ -import 'package:filcnaplo/utils/color.dart'; import 'package:filcnaplo_kreta_api/models/note.dart'; import 'package:filcnaplo_mobile_ui/common/profile_image/profile_image.dart'; import 'package:flutter/material.dart'; @@ -23,17 +22,13 @@ class NoteTile extends StatelessWidget { shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)), leading: ProfileImage( + isNotePfp: true, name: (note.teacher.isRenamed ? note.teacher.renamedTo : note.teacher.name) ?? '', - radius: 22.0, - backgroundColor: ColorUtils.stringToColor( - (note.teacher.isRenamed - ? note.teacher.renamedTo - : note.teacher.name) ?? - '', - ), + radius: 19.2, + backgroundColor: Theme.of(context).colorScheme.secondary, ), title: Text( note.title,