Merge remote-tracking branch 'origin/develop' into feat/localization
# Conflicts: # packages/stream_chat_flutter/example/lib/main.dart # packages/stream_chat_flutter/example/pubspec.yaml # packages/stream_chat_flutter/lib/src/channel_bottom_sheet.dart # packages/stream_chat_flutter/lib/src/channel_list_view.dart # packages/stream_chat_flutter/lib/src/gallery_footer.dart # packages/stream_chat_flutter/lib/src/message_input.dart # packages/stream_chat_flutter/lib/src/message_list_view.dart # packages/stream_chat_flutter/lib/src/user_item.dart
This commit is contained in:
@@ -76,7 +76,7 @@ class UserItem extends StatelessWidget {
|
||||
),
|
||||
trailing: selected
|
||||
? StreamSvgIcon.checkSend(
|
||||
color: chatThemeData.colorTheme.accentBlue,
|
||||
color: chatThemeData.colorTheme.accentPrimary,
|
||||
)
|
||||
: null,
|
||||
title: Text(
|
||||
@@ -94,8 +94,8 @@ class UserItem extends StatelessWidget {
|
||||
? context.translations.userOnlineText
|
||||
: context.translations.userLastOnlineText +
|
||||
Jiffy(user.lastActive).fromNow(),
|
||||
style: chatTheme.textTheme.footnote
|
||||
.copyWith(color: chatTheme.colorTheme.black.withOpacity(.5)),
|
||||
style: chatTheme.textTheme.footnote.copyWith(
|
||||
color: chatTheme.colorTheme.textHighEmphasis.withOpacity(.5)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user