From 978dc545a049b8ddd3e6ace8a07df539e9279781 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Wed, 4 Feb 2026 14:25:04 -0500
Subject: [PATCH] fluffychat merge

---
 lib/config/app_config.dart                                   | 1 -
 lib/config/setting_keys.dart                                 | 2 +-
 lib/pages/settings_notifications/settings_notifications.dart | 3 +--
 lib/pages/settings_style/settings_style.dart                 | 5 +++--
 lib/pangea/analytics_misc/level_up/level_up_banner.dart      | 3 ++-
 lib/pangea/common/utils/play_click_sound.dart                | 4 ++--
 lib/widgets/local_notifications_extension.dart               | 3 +--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index 099555dfb..84e552f08 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -102,7 +102,6 @@ abstract class AppConfig {
       "https://play.google.com/store/account/orderhistory";
   static bool useActivityImageAsChatBackground = true;
   static const int overlayAnimationDuration = 250;
-  static double volume = 1.0;
   static const Color gold = Color.fromARGB(255, 253, 191, 1);
   static const Color goldLight = Color.fromARGB(255, 254, 223, 73);
   static const Color success = Color(0xFF33D057);
diff --git a/lib/config/setting_keys.dart b/lib/config/setting_keys.dart
index 08f4fefc9..f96c3f694 100644
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@@ -72,7 +72,7 @@ enum AppSettings<T> {
     // Pangea#
   ),
   // #Pangea
-  volume<double>('pangea.value', 1.0),
+  volume<double>('pangea.volume', 1.0),
   // Pangea#
   enableSoftLogout<bool>('chat.fluffy.enable_soft_logout', false);
 
diff --git a/lib/pages/settings_notifications/settings_notifications.dart b/lib/pages/settings_notifications/settings_notifications.dart
index 162cc881e..06d3f7348 100644
--- a/lib/pages/settings_notifications/settings_notifications.dart
+++ b/lib/pages/settings_notifications/settings_notifications.dart
@@ -196,11 +196,10 @@ class SettingsNotificationsController extends State<SettingsNotifications> {
 
   // #Pangea
   final ValueNotifier<double> volumeNotifier =
-      ValueNotifier<double>(AppConfig.volume);
+      ValueNotifier<double>(AppSettings.volume.value);
 
   void updateVolume(double value) {
     volumeNotifier.value = value;
-    AppConfig.volume = value;
     AppSettings.volume.setItem(value);
   }
 
diff --git a/lib/pages/settings_style/settings_style.dart b/lib/pages/settings_style/settings_style.dart
index 968759ad4..3ec628c53 100644
--- a/lib/pages/settings_style/settings_style.dart
+++ b/lib/pages/settings_style/settings_style.dart
@@ -157,8 +157,9 @@ class SettingsStyleController extends State<SettingsStyle> {
     setState(() {});
   }
 
-  void changeFontSizeFactor(double d) {
-    AppSettings.fontSizeFactor.setItem(d);
+  void changeFontSizeFactor(double d) async {
+    await AppSettings.fontSizeFactor.setItem(d);
+    setState(() {});
   }
 
   @override
diff --git a/lib/pangea/analytics_misc/level_up/level_up_banner.dart b/lib/pangea/analytics_misc/level_up/level_up_banner.dart
index a242bac38..7f3c7e949 100644
--- a/lib/pangea/analytics_misc/level_up/level_up_banner.dart
+++ b/lib/pangea/analytics_misc/level_up/level_up_banner.dart
@@ -6,6 +6,7 @@ import 'package:audioplayers/audioplayers.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 
 import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/analytics_misc/analytics_constants.dart';
@@ -30,7 +31,7 @@ class LevelUpUtil {
   ) async {
     // Remove delay since GetAnalyticsController._onLevelUp is already async
     final player = AudioPlayer();
-    player.setVolume(AppConfig.volume);
+    player.setVolume(AppSettings.volume.value);
 
     // Wait for any existing snackbars to dismiss
     await _waitForSnackbars(context);
diff --git a/lib/pangea/common/utils/play_click_sound.dart b/lib/pangea/common/utils/play_click_sound.dart
index 2edb51bde..7787103bf 100644
--- a/lib/pangea/common/utils/play_click_sound.dart
+++ b/lib/pangea/common/utils/play_click_sound.dart
@@ -2,7 +2,7 @@ import 'dart:math';
 
 import 'package:audioplayers/audioplayers.dart';
 
-import 'package:fluffychat/config/app_config.dart';
+import 'package:fluffychat/config/setting_keys.dart';
 
 class ClickPlayer {
   late AudioPlayer _player;
@@ -10,7 +10,7 @@ class ClickPlayer {
   ClickPlayer() {
     _player = AudioPlayer();
     _player.setPlayerMode(PlayerMode.lowLatency);
-    _player.setVolume(min(0.5, AppConfig.volume));
+    _player.setVolume(min(0.5, AppSettings.volume.value));
   }
 
   Future<void> play() async {
diff --git a/lib/widgets/local_notifications_extension.dart b/lib/widgets/local_notifications_extension.dart
index 87e17f40d..4d1a0e00f 100644
--- a/lib/widgets/local_notifications_extension.dart
+++ b/lib/widgets/local_notifications_extension.dart
@@ -10,7 +10,6 @@ import 'package:matrix/matrix.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:universal_html/html.dart' as html;
 
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pangea/common/utils/error_handler.dart';
@@ -78,7 +77,7 @@ extension LocalNotificationsExtension on MatrixState {
       }
 
       // #Pangea
-      _audioPlayer.volume = AppConfig.volume;
+      _audioPlayer.volume = AppSettings.volume.value;
       // Pangea#
       _audioPlayer.play();