talksik/flutter-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: migrate to latest dependencies

Browse Source
This commit is contained in:
Sahil Kumar
2021-10-05 16:23:30 +05:30
committed by xsahil03x
parent 38a6884465
commit 865ae2cbd7
22 changed files with 142 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/chatty/lib/ui/common/my_channel_preview.dart
+48 -30
View File
@@ -80,7 +80,7 @@ class MyChannelPreview extends StatelessWidget {
tag: heroTag!,
child: StreamChannel(
channel: channel,
child: ChannelImage(
child: ChannelAvatar(
onTap: onImageTap,
),
),
@@ -91,8 +91,9 @@ class MyChannelPreview extends StatelessWidget {
children: <Widget>[
Flexible(
child: ChannelName(
textStyle:
StreamChatTheme.of(context).channelPreviewTheme.title,
textStyle: StreamChatTheme.of(context)
.channelPreviewTheme
.titleStyle,
),
),
StreamBuilder<List<Member>>(
@@ -102,7 +103,8 @@ class MyChannelPreview extends StatelessWidget {
if (!snapshot.hasData ||
snapshot.data!.isEmpty ||
!snapshot.data!.any((Member e) =>
e.user!.id == channel.client.state.user!.id)) {
e.user!.id ==
channel.client.state.currentUser!.id)) {
return SizedBox();
}
return ChannelUnreadIndicator(
@@ -122,7 +124,7 @@ class MyChannelPreview extends StatelessWidget {
(m) => !m.isDeleted && m.shadowed != true,
);
if (lastMessage?.user?.id ==
StreamChat.of(context).user!.id) {
StreamChat.of(context).currentUser!.id) {
return Padding(
padding: const EdgeInsets.only(right: 4.0),
child: SendingIndicator(
@@ -131,9 +133,9 @@ class MyChannelPreview extends StatelessWidget {
.channelPreviewTheme
.indicatorIconSize,
isMessageRead: channel.state!.read
?.where((element) =>
.where((element) =>
element.user.id !=
channel.client.state.user!.id)
channel.client.state.currentUser!.id)
.where((element) => element.lastRead
.isAfter(lastMessage.createdAt))
.isNotEmpty ==
@@ -181,7 +183,9 @@ class MyChannelPreview extends StatelessWidget {
return Text(
stringDate,
style: StreamChatTheme.of(context).channelPreviewTheme.lastMessageAt,
style: StreamChatTheme.of(context)
.channelPreviewTheme
.lastMessageAtStyle,
);
},
);
@@ -199,23 +203,29 @@ class MyChannelPreview extends StatelessWidget {
' Channel is muted',
style: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle!
.subtitleStyle!
.copyWith(
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle!
.subtitleStyle!
.color,
),
),
],
);
}
// TODO
return TypingIndicator(
channel: channel,
alternativeWidget: _buildLastMessage(context),
style: StreamChatTheme.of(context).channelPreviewTheme.subtitle!.copyWith(
color:
StreamChatTheme.of(context).channelPreviewTheme.subtitle!.color,
style: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.copyWith(
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.color,
),
);
}
@@ -255,23 +265,31 @@ class MyChannelPreview extends StatelessWidget {
text,
lastMessage.mentionedUsers,
lastMessage.attachments,
StreamChatTheme.of(context).channelPreviewTheme.subtitle!.copyWith(
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle!
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal),
StreamChatTheme.of(context).channelPreviewTheme.subtitle!.copyWith(
color: StreamChatTheme.of(context)
.channelPreviewTheme
.subtitle!
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal,
fontWeight: FontWeight.bold),
StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.copyWith(
color:
StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal),
StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.copyWith(
color:
StreamChatTheme.of(context)
.channelPreviewTheme
.subtitleStyle!
.color,
fontStyle: (lastMessage.isSystem || lastMessage.isDeleted)
? FontStyle.italic
: FontStyle.normal,
fontWeight: FontWeight.bold),
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
packages/chatty/lib/ui/home/chat/chat_view.dart
+5 -4
View File
@@ -25,7 +25,7 @@ class ChatView extends StatelessWidget {
child: ChannelListView(
filter: Filter.in_(
'members',
[StreamChat.of(context).user!.id],
[StreamChat.of(context).currentUser!.id],
),
sort: [SortOption('last_message_at')],
channelPreviewBuilder: (context, channel) {
@@ -37,10 +37,11 @@ class ChatView extends StatelessWidget {
onImageTap: () {
String? name;
String? image;
final currentUser = StreamChat.of(context).client.state.user;
final currentUser =
StreamChat.of(context).client.state.currentUser;
if (channel.isGroup) {
name = channel.extraData['name'];
image = channel.extraData['image'];
name = channel.extraData['name'] as String?;
image = channel.extraData['image'] as String?;
} else {
final friend = channel.state!.members
.where((element) => element.userId != currentUser!.id)
packages/chatty/lib/ui/home/settings/settings_view.dart
+2 -2
View File
@@ -10,9 +10,9 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
class SettingsView extends StatelessWidget {
@override
Widget build(BuildContext context) {
final user = StreamChat.of(context).client.state.user!;
final user = StreamChat.of(context).client.state.currentUser!;
final image = user.extraData['image'];
final textColor = Theme.of(context).appBarTheme.color;
final textColor = Theme.of(context).appBarTheme.backgroundColor;
return MultiBlocProvider(
providers: [
BlocProvider(