diff --git a/fonts/Ubuntu/Ubuntu-Medium.ttf b/fonts/Ubuntu/Ubuntu-Medium.ttf new file mode 100644 index 000000000..7340a40aa Binary files /dev/null and b/fonts/Ubuntu/Ubuntu-Medium.ttf differ diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 18133dadf..ffe989c89 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -210,7 +210,7 @@ class ChatListViewBody extends StatelessWidget { style: TextStyle( fontWeight: filter == controller.activeFilter - ? FontWeight.bold + ? FontWeight.w500 : FontWeight.normal, color: filter == controller.activeFilter diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 84cf032e1..cad59b480 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -216,9 +216,7 @@ class ChatListItem extends StatelessWidget { maxLines: 1, overflow: TextOverflow.ellipsis, softWrap: false, - style: unread || room.hasNewMessages - ? const TextStyle(fontWeight: FontWeight.bold) - : null, + style: const TextStyle(fontWeight: FontWeight.w500), ), ), if (isMuted) @@ -249,10 +247,8 @@ class ChatListItem extends StatelessWidget { child: Text( lastEvent.originServerTs.localizedTimeShort(context), style: TextStyle( - fontSize: 13, - color: unread - ? theme.colorScheme.secondary - : theme.textTheme.bodyMedium!.color, + fontSize: 12, + color: theme.colorScheme.outline, ), ), ), @@ -293,6 +289,8 @@ class ChatListItem extends StatelessWidget { (room.summary.mJoinedMemberCount ?? 1) .toString(), ), + style: + TextStyle(color: theme.colorScheme.outline), ) : typingText.isNotEmpty ? Text( @@ -344,9 +342,11 @@ class ChatListItem extends StatelessWidget { overflow: TextOverflow.ellipsis, style: TextStyle( fontWeight: unread || room.hasNewMessages - ? FontWeight.bold + ? FontWeight.w500 : null, - color: theme.colorScheme.onSurfaceVariant, + color: unread || room.hasNewMessages + ? theme.colorScheme.onSurfaceVariant + : theme.colorScheme.outline, decoration: room.lastEvent?.redacted == true ? TextDecoration.lineThrough diff --git a/pubspec.yaml b/pubspec.yaml index 606b7e961..40e1c488c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -124,6 +124,8 @@ flutter: - family: Ubuntu fonts: - asset: fonts/Ubuntu/Ubuntu-Regular.ttf + - asset: fonts/Ubuntu/Ubuntu-Medium.ttf + weight: 500 - asset: fonts/Ubuntu/Ubuntu-Bold.ttf weight: 600 - asset: fonts/Ubuntu/Ubuntu-Italic.ttf