mirror of
https://github.com/twonlyapp/twonly-app.git
synced 2026-10-09 02:54:14 +00:00
fix color and layout issue
This commit is contained in:
parent
3efaea3175
commit
078676c8b9
4 changed files with 29 additions and 27 deletions
|
|
@ -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)),
|
||||
|
||||
|
|
|
|||
|
|
@ -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),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -105,11 +105,8 @@ class _PublicProfilePrivacyViewState extends State<PublicProfilePrivacyView> {
|
|||
ListTile(
|
||||
title: Text(context.lang.customAvatarPhotoTab),
|
||||
subtitle: Text(context.lang.customAvatarExplanation),
|
||||
trailing: SizedBox(
|
||||
width: 180,
|
||||
child: DropdownButtonHideUnderline(
|
||||
trailing: DropdownButtonHideUnderline(
|
||||
child: DropdownButton<bool>(
|
||||
isExpanded: true,
|
||||
value: _customAvatar?.acceptedContactsOnly ?? true,
|
||||
items: [
|
||||
DropdownMenuItem(
|
||||
|
|
@ -131,7 +128,6 @@ class _PublicProfilePrivacyViewState extends State<PublicProfilePrivacyView> {
|
|||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue