TW-1025: recolor active status and chat list typing

linagora · Nov 24, 2023 · bdc34d0 · bdc34d0
1 parent 3c1ec25
commit bdc34d0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart
@@ -240,8 +240,9 @@ class _ChatAppBarTitleText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final TextStyle? statusTextStyle =
-        ChatAppBarTitleStyle.statusTextStyle(context);
+    final TextStyle? statusTextStyle = text == L10n.of(context)!.activeNow
+        ? ChatAppBarTitleStyle.onlineStatusTextStyle(context)
+        : ChatAppBarTitleStyle.offlineStatusTextStyle(context);
 
     return Text(
       text,
@@ -262,7 +263,7 @@ class _ChatAppBarTitleTyping extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final TextStyle? statusTextStyle =
-        ChatAppBarTitleStyle.statusTextStyle(context);
+        ChatAppBarTitleStyle.onlineStatusTextStyle(context);
 
     return IntrinsicWidth(
       child: Row(

diff --git a/lib/pages/chat/chat_app_bar_title_style.dart b/lib/pages/chat/chat_app_bar_title_style.dart
@@ -30,7 +30,7 @@ class ChatAppBarTitleStyle {
                 letterSpacing: ChatAppBarTitleStyle.letterSpacingRoomName,
               );
 
-  static TextStyle? statusTextStyle(BuildContext context) =>
+  static TextStyle? offlineStatusTextStyle(BuildContext context) =>
       responsive.isMobile(context)
           ? Theme.of(context).textTheme.labelMedium?.copyWith(
                 color: LinagoraRefColors.material().tertiary[30],
@@ -40,4 +40,15 @@ class ChatAppBarTitleStyle {
                 color: LinagoraRefColors.material().neutral[50],
                 letterSpacing: ChatAppBarTitleStyle.letterSpacingRoomName,
               );
+
+  static TextStyle? onlineStatusTextStyle(BuildContext context) =>
+      responsive.isMobile(context)
+          ? Theme.of(context).textTheme.labelMedium?.copyWith(
+                color: LinagoraRefColors.material().secondary,
+                letterSpacing: ChatAppBarTitleStyle.letterSpacingStatusContent,
+              )
+          : Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: LinagoraRefColors.material().secondary,
+                letterSpacing: ChatAppBarTitleStyle.letterSpacingRoomName,
+              );
 }
diff --git a/lib/presentation/mixins/chat_list_item_mixin.dart b/lib/presentation/mixins/chat_list_item_mixin.dart
@@ -2,6 +2,7 @@ import 'package:fluffychat/presentation/decorators/chat_list/subtitle_text_style
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
 import 'package:matrix/matrix.dart';
 
 mixin ChatListItemMixin {
@@ -49,7 +50,7 @@ mixin ChatListItemMixin {
       style: Theme.of(context).textTheme.labelLarge?.merge(
             TextStyle(
               overflow: TextOverflow.ellipsis,
-              color: Theme.of(context).colorScheme.primary,
+              color: LinagoraRefColors.material().secondary,
             ),
           ),
       maxLines: 2,