ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: set showed menu on show menu instead of on show tutorial popup

Browse source
This commit is contained in:
ggurdin 2025-12-02 11:21:51 -05:00
parent c5349df838
commit a484c38be1
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/config/app_config.dart
View file

@ -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<String, dynamic> json) {

2
lib/config/setting_keys.dart
View file

@ -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#
}

8
lib/pages/chat/chat.dart
View file

@ -2321,6 +2321,14 @@ class ChatController extends State<ChatPageWithRoom>
void toggleShowDropdown() {
inputFocus.unfocus();
activityController.toggleShowDropdown();
if (!AppConfig.showedActivityMenu) {
AppConfig.showedActivityMenu = true;
Matrix.of(context).store.setBool(
SettingKeys.showedActivityMenu,
AppConfig.showedActivityMenu,
);
}
}
// Pangea#

2
lib/pangea/activity_sessions/activity_session_chat/activity_chat_extension.dart
View file

@ -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) {

8
lib/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart
View file

@ -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<ActivityMenuButton> {
},
);
AppConfig.showedActivityMenuTutorial = true;
Matrix.of(context).store.setBool(
SettingKeys.showedActivityMenuTutorial,
AppConfig.showedActivityMenuTutorial,
);
setState(() => _showShimmer = true);
}

6
lib/widgets/matrix.dart
View file

@ -549,9 +549,9 @@ class MatrixState extends State<Matrix> 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#
}