twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-10-09 02:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix color and layout issue

Browse source
This commit is contained in:
otsmr 2026-10-06 23:00:25 +02:00
parent 3efaea3175
commit 078676c8b9
4 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/src/visual/themes/colors.dart
View file

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

6
lib/src/visual/views/camera/camera_preview_components/zoom_selector.dart
View file

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

44
lib/src/visual/views/settings/privacy/public_profile.view.dart
View file

@ -105,30 +105,26 @@ class _PublicProfilePrivacyViewState extends State<PublicProfilePrivacyView> {
ListTile(
title: Text(context.lang.customAvatarPhotoTab),
subtitle: Text(context.lang.customAvatarExplanation),
trailing: SizedBox(
width: 180,
child: DropdownButtonHideUnderline(
child: DropdownButton<bool>(
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<bool>(
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);
}
},
),
),
),

5
test/visual/theme_colors_test.dart
View file

@ -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));
});
}