From 93a6726aeb51ff3d33a5df97908bc5cd3e3fa5bb Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 23 May 2021 20:13:10 +0200
Subject: [PATCH] fix: Minor regressions

---
 lib/main.dart                              |  2 +-
 lib/pages/chat_list.dart                   |  6 +++---
 lib/pages/views/chat_list_view.dart        | 11 ++++++-----
 lib/pages/views/chat_view.dart             |  1 +
 lib/widgets/layouts/side_view_layout.dart  |  4 ++--
 lib/widgets/layouts/two_column_layout.dart |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index fbeef66a..fe3cebe5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -78,7 +78,7 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
       builder: (theme, darkTheme) => LayoutBuilder(
         builder: (context, constraints) {
           var newColumns =
-              (constraints.maxWidth / AppConfig.columnWidth).floor();
+              (constraints.maxWidth / FluffyThemes.columnWidth).floor();
           if (newColumns > 3) newColumns = 3;
           columnMode ??= newColumns > 1;
           _router ??= GlobalKey<VRouterState>();
diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart
index ed56564d..32d947d0 100644
--- a/lib/pages/chat_list.dart
+++ b/lib/pages/chat_list.dart
@@ -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');
diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/views/chat_list_view.dart
index 5011cfce..9880f3e4 100644
--- a/lib/pages/views/chat_list_view.dart
+++ b/lib/pages/views/chat_list_view.dart
@@ -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 {
diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart
index ed2d196c..ed73d112 100644
--- a/lib/pages/views/chat_view.dart
+++ b/lib/pages/views/chat_view.dart
@@ -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,
diff --git a/lib/widgets/layouts/side_view_layout.dart b/lib/widgets/layouts/side_view_layout.dart
index e7713d91..92fb0744 100644
--- a/lib/widgets/layouts/side_view_layout.dart
+++ b/lib/widgets/layouts/side_view_layout.dart
@@ -1,4 +1,4 @@
-import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/themes.dart';
 import 'package:flutter/material.dart';
 import 'package:vrouter/vrouter.dart';
 
@@ -15,7 +15,7 @@ class SideViewLayout extends StatelessWidget {
     final hideSideView = currentUrl.split('/').length == 4;
     return sideView == null
         ? mainView
-        : MediaQuery.of(context).size.width < AppConfig.columnWidth * 3 &&
+        : MediaQuery.of(context).size.width < FluffyThemes.columnWidth * 3 &&
                 !hideSideView
             ? sideView
             : Row(
diff --git a/lib/widgets/layouts/two_column_layout.dart b/lib/widgets/layouts/two_column_layout.dart
index 15802e12..c319bd66 100644
--- a/lib/widgets/layouts/two_column_layout.dart
+++ b/lib/widgets/layouts/two_column_layout.dart
@@ -1,4 +1,4 @@
-import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/themes.dart';
 import 'package:flutter/material.dart';
 
 class TwoColumnLayout extends StatelessWidget {
@@ -10,7 +10,7 @@ class TwoColumnLayout extends StatelessWidget {
       : super(key: key);
   @override
   Widget build(BuildContext context) {
-    if (MediaQuery.of(context).size.width <= AppConfig.columnWidth * 2) {
+    if (MediaQuery.of(context).size.width <= FluffyThemes.columnWidth * 2) {
       return mainView;
     }
     return Scaffold(