fix: Minor regressions
This commit is contained in:
parent
2d3c8eed84
commit
4509ace93b
6 changed files with 15 additions and 13 deletions
|
|
@ -25,9 +25,7 @@ enum SelectMode { normal, share, select }
|
|||
enum PopupMenuAction { settings, invite, newGroup, setStatus, archive }
|
||||
|
||||
class ChatList extends StatefulWidget {
|
||||
final String activeChat;
|
||||
|
||||
const ChatList({this.activeChat, Key key}) : super(key: key);
|
||||
const ChatList({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
ChatListController createState() => ChatListController();
|
||||
|
|
@ -42,6 +40,8 @@ class ChatListController extends State<ChatList> {
|
|||
|
||||
final selectedRoomIds = <String>{};
|
||||
|
||||
String get activeChat => VRouter.of(context).pathParameters['roomid'];
|
||||
|
||||
void _processIncomingSharedFiles(List<SharedMediaFile> files) {
|
||||
if (files?.isEmpty ?? true) return;
|
||||
VRouter.of(context).push('/rooms');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/config/themes.dart';
|
||||
import 'package:fluffychat/pages/chat_list.dart';
|
||||
import 'package:fluffychat/widgets/connection_status_header.dart';
|
||||
import 'package:fluffychat/widgets/list_items/chat_list_item.dart';
|
||||
|
|
@ -27,10 +28,10 @@ class ChatListView extends StatelessWidget {
|
|||
: SelectMode.select;
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
elevation:
|
||||
MediaQuery.of(context).size.width > AppConfig.columnWidth * 2
|
||||
? 1
|
||||
: null,
|
||||
elevation: MediaQuery.of(context).size.width >
|
||||
FluffyThemes.columnWidth * 2
|
||||
? 1
|
||||
: null,
|
||||
leading: selectMode == SelectMode.normal
|
||||
? null
|
||||
: IconButton(
|
||||
|
|
@ -210,7 +211,7 @@ class ChatListView extends StatelessWidget {
|
|||
onLongPress: () =>
|
||||
controller.toggleSelection(rooms[i].id),
|
||||
activeChat:
|
||||
controller.widget.activeChat == rooms[i].id,
|
||||
controller.activeChat == rooms[i].id,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ class ChatView extends StatelessWidget {
|
|||
tooltip: L10n.of(context).close,
|
||||
)
|
||||
: UnreadBadgeBackButton(roomId: controller.roomId),
|
||||
titleSpacing: 0,
|
||||
title: controller.selectedEvents.isEmpty
|
||||
? StreamBuilder(
|
||||
stream: controller.room.onUpdate.stream,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue