diff --git a/lib/screens/chat.dart b/lib/screens/chat.dart index e41517c..7264e83 100644 --- a/lib/screens/chat.dart +++ b/lib/screens/chat.dart @@ -125,7 +125,11 @@ class _ChatScreenState extends State { child: Obx( () => ChannelListWidget( noCategory: true, - channels: _channels.directChannels, + channels: List.from([ + ..._channels.groupChannels + .where((x) => x.realmId == null), + ..._channels.directChannels + ]), selfId: selfId, useReplace: true, ), diff --git a/lib/widgets/channel/channel_list.dart b/lib/widgets/channel/channel_list.dart index de2f405..cd2b3b9 100644 --- a/lib/widgets/channel/channel_list.dart +++ b/lib/widgets/channel/channel_list.dart @@ -1,5 +1,8 @@ +import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:solian/controllers/chat_events_controller.dart'; import 'package:solian/models/channel.dart'; @@ -213,6 +216,7 @@ class _ChannelListWidgetState extends State { return _buildEntry(element); }, ), + SliverGap(max(16, MediaQuery.of(context).padding.bottom)), ], ); }