Merge branch 'feature/new-ui' into feature/group-info-screen

This commit is contained in:
Deven Joshi
2021-01-01 13:53:41 +05:30
committed by GitHub
17 changed files with 486 additions and 438 deletions
+26 -1
View File
@@ -385,6 +385,10 @@ class _ChannelListViewState extends State<ChannelListView>
width: 40,
),
),
contentPadding: const EdgeInsets.only(
left: 8,
right: 8,
),
title: Align(
alignment: Alignment.centerLeft,
child: Container(
@@ -399,6 +403,7 @@ class _ChannelListViewState extends State<ChannelListView>
),
),
subtitle: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Align(
alignment: Alignment.centerLeft,
@@ -572,7 +577,27 @@ class _ChannelListViewState extends State<ChannelListView>
context: context,
builder: (context) {
return StreamChannel(
child: ChannelBottomSheet(),
child: ChannelBottomSheet(
onViewInfoTap: () {
if (channel.memberCount == 2 &&
channel.isDistinct) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StreamChannel(
channel: channel,
child: ChatInfoScreen(
user:
channel.state.members.first.user,
),
),
),
);
}
// TODO: Add group screen
},
),
channel: channel,
);
},