From 2ad6d6f1c5c8517094053b6fad84d50b6b3604bd Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Mon, 27 Jan 2025 09:31:37 +0100
Subject: [PATCH] chore: Adjust colors

---
 lib/config/themes.dart                                  | 6 ++++++
 lib/pages/chat_details/chat_details_view.dart           | 2 ++
 lib/pages/settings/settings_view.dart                   | 2 ++
 lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart | 3 +++
 lib/widgets/public_room_bottom_sheet.dart               | 2 ++
 5 files changed, 15 insertions(+)

diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index beed70ffb..28848845d 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -84,6 +84,12 @@ abstract class FluffyThemes {
           borderRadius: BorderRadius.circular(AppConfig.borderRadius),
         ),
       ),
+      segmentedButtonTheme: SegmentedButtonThemeData(
+        style: SegmentedButton.styleFrom(
+          iconColor: colorScheme.onSurface,
+          disabledIconColor: colorScheme.onSurface,
+        ),
+      ),
       textSelectionTheme: TextSelectionThemeData(
         selectionColor: colorScheme.onSurface.withAlpha(128),
         selectionHandleColor: colorScheme.secondary,
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index 0108ac7ff..e80201492 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -148,6 +148,7 @@ class ChatDetailsView extends StatelessWidget {
                                     style: TextButton.styleFrom(
                                       foregroundColor:
                                           theme.colorScheme.onSurface,
+                                      iconColor: theme.colorScheme.onSurface,
                                     ),
                                     label: Text(
                                       room.isDirectChat
@@ -171,6 +172,7 @@ class ChatDetailsView extends StatelessWidget {
                                     style: TextButton.styleFrom(
                                       foregroundColor:
                                           theme.colorScheme.secondary,
+                                      iconColor: theme.colorScheme.secondary,
                                     ),
                                     label: Text(
                                       L10n.of(context).countParticipants(
diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart
index 00b8fe7c2..3b5b02902 100644
--- a/lib/pages/settings/settings_view.dart
+++ b/lib/pages/settings/settings_view.dart
@@ -86,6 +86,7 @@ class SettingsView extends StatelessWidget {
                                 ),
                                 style: TextButton.styleFrom(
                                   foregroundColor: theme.colorScheme.onSurface,
+                                  iconColor: theme.colorScheme.onSurface,
                                 ),
                                 label: Text(
                                   displayname,
@@ -105,6 +106,7 @@ class SettingsView extends StatelessWidget {
                                 ),
                                 style: TextButton.styleFrom(
                                   foregroundColor: theme.colorScheme.secondary,
+                                  iconColor: theme.colorScheme.secondary,
                                 ),
                                 label: Text(
                                   mxid,
diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
index 17d899799..2974dec47 100644
--- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
+++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
@@ -83,6 +83,7 @@ class UserBottomSheetView extends StatelessWidget {
                             style: TextButton.styleFrom(
                               backgroundColor: theme.colorScheme.surface,
                               foregroundColor: theme.colorScheme.primary,
+                              iconColor: theme.colorScheme.primary,
                             ),
                             onPressed: controller.knockAccept,
                             icon: const Icon(Icons.check_outlined),
@@ -94,6 +95,7 @@ class UserBottomSheetView extends StatelessWidget {
                               backgroundColor: theme.colorScheme.errorContainer,
                               foregroundColor:
                                   theme.colorScheme.onErrorContainer,
+                              iconColor: theme.colorScheme.onErrorContainer,
                             ),
                             onPressed: controller.knockDecline,
                             icon: const Icon(Icons.cancel_outlined),
@@ -132,6 +134,7 @@ class UserBottomSheetView extends StatelessWidget {
                           ),
                           style: TextButton.styleFrom(
                             foregroundColor: theme.colorScheme.onSurface,
+                            iconColor: theme.colorScheme.onSurface,
                           ),
                           label: Text(
                             userId,
diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart
index cabcaecfd..47f64839b 100644
--- a/lib/widgets/public_room_bottom_sheet.dart
+++ b/lib/widgets/public_room_bottom_sheet.dart
@@ -156,6 +156,7 @@ class PublicRoomBottomSheet extends StatelessWidget {
                             ),
                             style: TextButton.styleFrom(
                               foregroundColor: theme.colorScheme.onSurface,
+                              iconColor: theme.colorScheme.onSurface,
                             ),
                             label: Text(
                               roomLink ?? '...',
@@ -171,6 +172,7 @@ class PublicRoomBottomSheet extends StatelessWidget {
                             ),
                             style: TextButton.styleFrom(
                               foregroundColor: theme.colorScheme.onSurface,
+                              iconColor: theme.colorScheme.onSurface,
                             ),
                             label: Text(
                               L10n.of(context).countParticipants(