From 078676c8b9d2b3c6b58c463cdc23e3706a26d7bc Mon Sep 17 00:00:00 2001 From: otsmr Date: Tue, 6 Oct 2026 23:00:25 +0200 Subject: [PATCH] fix color and layout issue --- lib/src/visual/themes/colors.dart | 1 + .../zoom_selector.dart | 6 +-- .../settings/privacy/public_profile.view.dart | 44 +++++++++---------- test/visual/theme_colors_test.dart | 5 +++ 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/src/visual/themes/colors.dart b/lib/src/visual/themes/colors.dart index 753ba977..1b6b4a9a 100644 --- a/lib/src/visual/themes/colors.dart +++ b/lib/src/visual/themes/colors.dart @@ -42,6 +42,7 @@ enum AppColor { mediaForegroundMuted(light: Color(0xB3FFFFFF), dark: Color(0xB3FFFFFF)), mediaBackground(light: Color(0xFF000000), dark: Color(0xFF000000)), mediaScrim(light: Color(0x8A000000), dark: Color(0x8A000000)), + selectedZoom(light: Color(0xFFFFEB3B), dark: Color(0xFFFFEB3B)), recording(light: Color(0xFFD32F2F), dark: Color(0xFFFF5252)), scanHighlight(light: Color(0xFF76FF03), dark: Color(0xFF76FF03)), diff --git a/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart b/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart index 3df41b23..81a9c843 100644 --- a/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart +++ b/lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart @@ -100,7 +100,7 @@ class CameraZoomButtons extends StatelessWidget { style: zoomButtonStyle.copyWith( foregroundColor: WidgetStateProperty.all( isSmallerFocused - ? context.appColor(AppColor.warning) + ? context.appColor(AppColor.selectedZoom) : context.appColor(AppColor.mediaForeground), ), ), @@ -125,7 +125,7 @@ class CameraZoomButtons extends StatelessWidget { style: zoomButtonStyle.copyWith( foregroundColor: WidgetStateProperty.all( isMiddleFocused - ? context.appColor(AppColor.warning) + ? context.appColor(AppColor.selectedZoom) : context.appColor(AppColor.mediaForeground), ), ), @@ -148,7 +148,7 @@ class CameraZoomButtons extends StatelessWidget { style: zoomButtonStyle.copyWith( foregroundColor: WidgetStateProperty.all( (scaleFactor >= 2) - ? context.appColor(AppColor.warning) + ? context.appColor(AppColor.selectedZoom) : context.appColor(AppColor.mediaForeground), ), ), diff --git a/lib/src/visual/views/settings/privacy/public_profile.view.dart b/lib/src/visual/views/settings/privacy/public_profile.view.dart index c76c31a2..b34e8e76 100644 --- a/lib/src/visual/views/settings/privacy/public_profile.view.dart +++ b/lib/src/visual/views/settings/privacy/public_profile.view.dart @@ -105,30 +105,26 @@ class _PublicProfilePrivacyViewState extends State { ListTile( title: Text(context.lang.customAvatarPhotoTab), subtitle: Text(context.lang.customAvatarExplanation), - trailing: SizedBox( - width: 180, - child: DropdownButtonHideUnderline( - child: DropdownButton( - isExpanded: true, - value: _customAvatar?.acceptedContactsOnly ?? true, - items: [ - DropdownMenuItem( - value: true, - child: Text(context.lang.customAvatarAcceptedOnly), - ), - DropdownMenuItem( - value: false, - child: Text(context.lang.privacyVisibilityEveryone), - ), - ], - onChanged: _customAvatar == null || _updatingAvatarVisibility - ? null - : (acceptedOnly) { - if (acceptedOnly != null) { - _setCustomAvatarVisibility(acceptedOnly); - } - }, - ), + trailing: DropdownButtonHideUnderline( + child: DropdownButton( + value: _customAvatar?.acceptedContactsOnly ?? true, + items: [ + DropdownMenuItem( + value: true, + child: Text(context.lang.customAvatarAcceptedOnly), + ), + DropdownMenuItem( + value: false, + child: Text(context.lang.privacyVisibilityEveryone), + ), + ], + onChanged: _customAvatar == null || _updatingAvatarVisibility + ? null + : (acceptedOnly) { + if (acceptedOnly != null) { + _setCustomAvatarVisibility(acceptedOnly); + } + }, ), ), ), diff --git a/test/visual/theme_colors_test.dart b/test/visual/theme_colors_test.dart index 28d88b84..c234f891 100644 --- a/test/visual/theme_colors_test.dart +++ b/test/visual/theme_colors_test.dart @@ -64,4 +64,9 @@ void main() { expect(color.dark, expected); } }); + + test('selected zoom uses yellow in both themes', () { + expect(AppColor.selectedZoom.light, const Color(0xFFFFEB3B)); + expect(AppColor.selectedZoom.dark, const Color(0xFFFFEB3B)); + }); }