From a7009e7b36d30ebea4694100cd6ba28b2cd1a617 Mon Sep 17 00:00:00 2001
From: wcjord <32568597+wcjord@users.noreply.github.com>
Date: Wed, 20 Nov 2024 15:45:24 -0500
Subject: [PATCH] changing mute and chat details icons (#1080)

* changing mute and chat details icons

* update notifications icons and copy

---------

Co-authored-by: ggurdin <ggurdin@gmail.com>
---
 assets/l10n/intl_en.arb                        |  4 +++-
 lib/pages/chat/chat_view.dart                  |  2 +-
 lib/pages/chat_list/chat_list.dart             | 18 ++++++++++++++----
 .../chat_details/pangea_chat_details.dart      |  8 +++++---
 lib/widgets/chat_settings_popup_menu.dart      |  2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index ef4e74caf..f3e646016 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -4515,5 +4515,7 @@
   "noCapacityLimit": "No capacity limit",
   "downloadGroupText": "Download group text",
   "spaceDescription": "Space description",
-  "addSpaceDescription": "Add a space description"
+  "addSpaceDescription": "Add a space description",
+  "notificationsOn": "Notifications on",
+  "notificationsOff": "Notifications off"
 }
\ No newline at end of file
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 8d3fc747e..c1ef18db6 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -123,7 +123,7 @@ class ChatView extends StatelessWidget {
           },
         ),
         IconButton(
-          icon: const Icon(Icons.info_outline),
+          icon: const Icon(Icons.settings_outlined),
           tooltip: L10n.of(context)!.chatDetails,
           onPressed: () {
             if (GoRouterState.of(context).uri.path.endsWith('/details')) {
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 19eb99149..1a6d09373 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -748,15 +748,25 @@ class ChatListController extends State<ChatList>
             mainAxisSize: MainAxisSize.min,
             children: [
               Icon(
+                // #Pangea
+                // room.pushRuleState == PushRuleState.notify
+                //     ? Icons.notifications_off_outlined
+                //     : Icons.notifications_off,
                 room.pushRuleState == PushRuleState.notify
-                    ? Icons.notifications_off_outlined
-                    : Icons.notifications_off,
+                    ? Icons.notifications_on_outlined
+                    : Icons.notifications_off_outlined,
+                // Pangea#
               ),
               const SizedBox(width: 12),
               Text(
+                // #Pangea
+                // room.pushRuleState == PushRuleState.notify
+                //     ? L10n.of(context)!.muteChat
+                //     : L10n.of(context)!.unmuteChat,
                 room.pushRuleState == PushRuleState.notify
-                    ? L10n.of(context)!.muteChat
-                    : L10n.of(context)!.unmuteChat,
+                    ? L10n.of(context)!.notificationsOn
+                    : L10n.of(context)!.notificationsOff,
+                // Pangea#
               ),
             ],
           ),
diff --git a/lib/pangea/pages/chat_details/pangea_chat_details.dart b/lib/pangea/pages/chat_details/pangea_chat_details.dart
index 4c3c1b2a0..4685c4896 100644
--- a/lib/pangea/pages/chat_details/pangea_chat_details.dart
+++ b/lib/pangea/pages/chat_details/pangea_chat_details.dart
@@ -350,7 +350,9 @@ class PangeaChatDetailsView extends StatelessWidget {
                         if (isGroupChat)
                           ListTile(
                             title: Text(
-                              L10n.of(context)!.muteChat,
+                              room.pushRuleState == PushRuleState.notify
+                                  ? L10n.of(context)!.notificationsOn
+                                  : L10n.of(context)!.notificationsOff,
                               style: TextStyle(
                                 color: Theme.of(context).colorScheme.secondary,
                                 fontWeight: FontWeight.bold,
@@ -362,8 +364,8 @@ class PangeaChatDetailsView extends StatelessWidget {
                               foregroundColor: iconColor,
                               child: Icon(
                                 room.pushRuleState == PushRuleState.notify
-                                    ? Icons.volume_up
-                                    : Icons.volume_off,
+                                    ? Icons.notifications_on_outlined
+                                    : Icons.notifications_off_outlined,
                               ),
                             ),
                             onTap: controller.toggleMute,
diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart
index 8d71a2859..748af6735 100644
--- a/lib/widgets/chat_settings_popup_menu.dart
+++ b/lib/widgets/chat_settings_popup_menu.dart
@@ -162,7 +162,7 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
                 value: ChatPopupMenuActions.details,
                 child: Row(
                   children: [
-                    const Icon(Icons.info_outline_rounded),
+                    const Icon(Icons.settings_outlined),
                     const SizedBox(width: 12),
                     Text(L10n.of(context)!.chatDetails),
                   ],