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

Minor merge fixes

Browse Source
This commit is contained in:
xsahil03x
2020-11-25 11:41:07 +05:30
parent f08976fad1
commit 3cda66a255
2 changed files with 331 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/lib/group_chat_details_screen.dart
+9 -3
View File
@@ -52,7 +52,12 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
return WillPopScope(
onWillPop: () async {
Navigator.pop(context, _selectedUsers);
return false;
},
child: Scaffold(
backgroundColor: Color.fromRGBO(252, 252, 252, 1),
appBar: AppBar(
elevation: 1,
@@ -102,7 +107,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
),
),
actions: [
NeumorphicButton(
StreamNeumorphicButton(
child: IconButton(
padding: const EdgeInsets.all(0),
icon: StreamSvgIcon.check(
@@ -206,7 +211,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
_selectedUsers.remove(user);
});
if (_selectedUsers.isEmpty) {
Navigator.pop(context);
Navigator.pop(context, _selectedUsers);
}
},
),
@@ -216,6 +221,7 @@ class _GroupChatDetailsScreenState extends State<GroupChatDetailsScreen> {
),
],
),
),
);
}
}
example/lib/new_group_chat_screen.dart
+6 -8
View File
@@ -50,13 +50,11 @@ class _NewGroupChatScreenState extends State<NewGroupChatScreen> {
@override
Widget build(BuildContext context) {
return SafeArea(
child: UsersBloc(
child: Scaffold(
backgroundColor: Color.fromRGBO(252, 252, 252, 1),
body: NestedScrollView(
floatHeaderSlivers: true,
headerSliverBuilder:
(BuildContext context, bool innerBoxIsScrolled) {
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
// floating: true,
@@ -151,8 +149,7 @@ class _NewGroupChatScreenState extends State<NewGroupChatScreen> {
Stack(
children: [
UserAvatar(
onlineIndicatorAlignment:
Alignment(0.9, 0.9),
onlineIndicatorAlignment: Alignment(0.9, 0.9),
user: user,
showOnlineStatus: true,
borderRadius: BorderRadius.circular(32),
@@ -167,8 +164,8 @@ class _NewGroupChatScreenState extends State<NewGroupChatScreen> {
child: GestureDetector(
onTap: () {
if (_selectedUsers.contains(user)) {
setState(() =>
_selectedUsers.remove(user));
setState(
() => _selectedUsers.remove(user));
}
},
child: Container(
@@ -241,7 +238,8 @@ class _NewGroupChatScreenState extends State<NewGroupChatScreen> {
),
];
},
body: UserListView(
body: UsersBloc(
child: UserListView(
selectedUsers: _selectedUsers,
pullToRefresh: false,
groupAlphabetically: _isSearchActive ? false : true,