feat: restore latest filter on app start

krille-chan · Jul 28, 2023 · 280357d · 280357d
1 parent 4bb3434
commit 280357d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
@@ -2,6 +2,8 @@ import 'dart:ui';
 
 import 'package:matrix/matrix.dart';
 
+import '../pages/chat_list/chat_list.dart';
+
 abstract class AppConfig {
   static String _applicationName = 'FluffyChat';
   static String get applicationName => _applicationName;
@@ -48,6 +50,7 @@ abstract class AppConfig {
   static bool hideUnimportantStateEvents = true;
   static bool showDirectChatsInSpaces = true;
   static bool separateChatTypes = false;
+  static ActiveFilter startFilter = ActiveFilter.allChats;
   static bool autoplayImages = true;
   static bool sendOnEnter = false;
   static bool experimentalVoip = false;

diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
@@ -8,6 +8,7 @@ abstract class SettingKeys {
   static const String showDirectChatsInSpaces =
       'chat.fluffy.showDirectChatsInSpaces';
   static const String separateChatTypes = 'chat.fluffy.separateChatTypes';
+  static const String startFilter = 'chat.fluffy.startFilter';
   static const String sentry = 'sentry';
   static const String theme = 'theme';
   static const String amoledEnabled = 'amoled_enabled';

diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
@@ -22,6 +22,7 @@ import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import '../../../utils/account_bundles.dart';
+import '../../config/setting_keys.dart';
 import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart';
 import '../../utils/url_launcher.dart';
 import '../../utils/voip/callkeep_manager.dart';
@@ -124,11 +125,14 @@ class ChatListController extends State<ChatList>
     setState(() {
       activeFilter = getActiveFilterByDestination(i);
     });
+    AppConfig.startFilter = activeFilter;
+    Matrix.of(context).store.setItem(
+          SettingKeys.startFilter,
+          activeFilter.name,
+        );
   }
 
-  ActiveFilter activeFilter = AppConfig.separateChatTypes
-      ? ActiveFilter.messages
-      : ActiveFilter.allChats;
+  ActiveFilter activeFilter = AppConfig.startFilter;
 
   bool Function(Room) getRoomFilterByActiveFilter(ActiveFilter activeFilter) {
     switch (activeFilter) {

diff --git a/lib/pages/settings_chat/settings_chat_view.dart b/lib/pages/settings_chat/settings_chat_view.dart
@@ -6,6 +6,7 @@ import 'package:vrouter/vrouter.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
+import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/voip/callkeep_manager.dart';
 import 'package:fluffychat/widgets/layouts/max_width_body.dart';
@@ -95,7 +96,16 @@ class SettingsChatView extends StatelessWidget {
                 ),
               SettingsSwitchListTile.adaptive(
                 title: L10n.of(context)!.separateChatTypes,
-                onChanged: (b) => AppConfig.separateChatTypes = b,
+                onChanged: (b) {
+                  AppConfig.separateChatTypes = b;
+                  // the filter on the app start must be one of the visible filters
+                  AppConfig.startFilter =
+                      b ? ActiveFilter.messages : ActiveFilter.allChats;
+                  Matrix.of(context).store.setItem(
+                        SettingKeys.startFilter,
+                        AppConfig.startFilter.name,
+                      );
+                },
                 storeKey: SettingKeys.separateChatTypes,
                 defaultValue: AppConfig.separateChatTypes,
               ),

diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
@@ -29,6 +29,7 @@ import 'package:fluffychat/utils/uia_request_manager.dart';
 import 'package:fluffychat/utils/voip_plugin.dart';
 import '../config/app_config.dart';
 import '../config/setting_keys.dart';
+import '../pages/chat_list/chat_list.dart';
 import '../pages/key_verification/key_verification_dialog.dart';
 import '../utils/account_bundles.dart';
 import '../utils/background_push.dart';
@@ -486,6 +487,10 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
     store
         .getItemBool(SettingKeys.separateChatTypes, AppConfig.separateChatTypes)
         .then((value) => AppConfig.separateChatTypes = value);
+    store.getItem(SettingKeys.startFilter).then(
+          (value) => AppConfig.startFilter =
+              ActiveFilter.values.byName(value ?? AppConfig.startFilter.name),
+        );
     store
         .getItemBool(SettingKeys.autoplayImages, AppConfig.autoplayImages)
         .then((value) => AppConfig.autoplayImages = value);