diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart index 43303fea3..9f052678f 100644 --- a/lib/config/app_config.dart +++ b/lib/config/app_config.dart @@ -196,7 +196,7 @@ abstract class AppConfig { static String errorSubscriptionId = "pangea_subscription_error"; static double volume = 1.0; - static bool showedActivityMenuTutorial = false; + static bool showedActivityMenu = false; // Pangea# static void loadFromJson(Map json) { diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart index 458f5356d..c37e79f13 100644 --- a/lib/config/setting_keys.dart +++ b/lib/config/setting_keys.dart @@ -36,7 +36,7 @@ abstract class SettingKeys { 'chat.fluffy.display_navigation_rail'; // #Pangea static const String volume = 'pangea.volume'; - static const String showedActivityMenuTutorial = + static const String showedActivityMenu = 'pangea.showed_activity_menu_tutorial'; // Pangea# } diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index 225558353..139380aa0 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -2321,6 +2321,14 @@ class ChatController extends State void toggleShowDropdown() { inputFocus.unfocus(); activityController.toggleShowDropdown(); + + if (!AppConfig.showedActivityMenu) { + AppConfig.showedActivityMenu = true; + Matrix.of(context).store.setBool( + SettingKeys.showedActivityMenu, + AppConfig.showedActivityMenu, + ); + } } // Pangea# diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart index 9c033cbed..c059ca826 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart @@ -8,7 +8,7 @@ import 'package:fluffychat/widgets/matrix.dart'; extension ActivityMenuLogic on ChatController { bool get shouldShowActivityInstructions { - if (AppConfig.showedActivityMenuTutorial || + if (AppConfig.showedActivityMenu || InstructionsEnum.activityStatsMenu.isToggledOff || MatrixState.pAnyState.isOverlayOpen(RegExp(r"^word-zoom-card-.*$")) || timeline == null) { diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart index 9a6d5533f..c1af0d4d1 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart @@ -5,7 +5,6 @@ import 'package:flutter/material.dart'; import 'package:shimmer/shimmer.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/config/setting_keys.dart'; import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart'; @@ -13,7 +12,6 @@ import 'package:fluffychat/pangea/common/utils/overlay.dart'; import 'package:fluffychat/pangea/common/widgets/tutorial_overlay_message.dart'; import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/instructions/instructions_enum.dart'; -import 'package:fluffychat/widgets/matrix.dart'; class ActivityMenuButton extends StatefulWidget { final ChatController controller; @@ -90,12 +88,6 @@ class _ActivityMenuButtonState extends State { }, ); - AppConfig.showedActivityMenuTutorial = true; - Matrix.of(context).store.setBool( - SettingKeys.showedActivityMenuTutorial, - AppConfig.showedActivityMenuTutorial, - ); - setState(() => _showShimmer = true); } diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index bf5dfbcf9..6044442eb 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -549,9 +549,9 @@ class MatrixState extends State with WidgetsBindingObserver { // #Pangea AppConfig.volume = store.getDouble(SettingKeys.volume) ?? AppConfig.volume; - AppConfig.showedActivityMenuTutorial = - store.getBool(SettingKeys.showedActivityMenuTutorial) ?? - AppConfig.showedActivityMenuTutorial; + AppConfig.showedActivityMenu = + store.getBool(SettingKeys.showedActivityMenu) ?? + AppConfig.showedActivityMenu; // Pangea# }