Merge remote-tracking branch 'ggurdin/display-navigation-rail-setting'

lib/pages/chat_list/chat_list_body.dart

@@ -165,7 +165,8 @@ class ChatListViewBody extends StatelessWidget {
                             ActiveFilter.groups,
                             ActiveFilter.unread,
                             if (spaceDelegateCandidates.isNotEmpty &&
-                                !controller.widget.displayNavigationRail)
+                                !AppConfig.displayNavigationRail &&
+                                !FluffyThemes.isColumnMode(context))
                               ActiveFilter.spaces,
                           ]
                               .map(

lib/pages/chat_list/chat_list_view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'package:go_router/go_router.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
@@ -30,8 +31,8 @@ class ChatListView extends StatelessWidget {
       },
       child: Row(
         children: [
-          if (FluffyThemes.isColumnMode(context) &&
-              controller.widget.displayNavigationRail) ...[
+          if (FluffyThemes.isColumnMode(context) ||
+              AppConfig.displayNavigationRail) ...[
             SpacesNavigationRail(
               activeSpaceId: controller.activeSpaceId,
               onGoToChats: controller.clearActiveSpace,

lib/pages/chat_list/navi_rail_item.dart

@@ -44,7 +44,11 @@ class NaviRailItem extends StatelessWidget {
                 bottom: 8,
                 left: 0,
                 child: AnimatedContainer(
-                  width: isSelected ? 8 : 0,
+                  width: isSelected
+                      ? FluffyThemes.isColumnMode(context)
+                          ? 8
+                          : 4
+                      : 0,
                   duration: FluffyThemes.animationDuration,
                   curve: FluffyThemes.animationCurve,
                   decoration: BoxDecoration(

lib/pages/settings_style/settings_style_view.dart

@@ -359,6 +359,12 @@ class SettingsStyleView extends StatelessWidget {
               storeKey: SettingKeys.separateChatTypes,
               defaultValue: AppConfig.separateChatTypes,
             ),
+            SettingsSwitchListTile.adaptive(
+              title: L10n.of(context).displayNavigationRail,
+              onChanged: (b) => AppConfig.displayNavigationRail = b,
+              storeKey: SettingKeys.displayNavigationRail,
+              defaultValue: AppConfig.displayNavigationRail,
+            ),
           ],
         ),
       ),