Merge pull request #31 from ente-io/tweak-trailing-margin-theme-picker

Increase trailing margin for the theme picker selection checkmark
This commit is contained in:
Vishnu Mohandas 2023-01-08 16:47:31 +05:30 committed by GitHub
commit 91fffc8b04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

View file

@ -12,6 +12,9 @@ class MenuItemWidget extends StatefulWidget {
final IconData? trailingIcon;
final Widget? trailingSwitch;
final bool trailingIconIsMuted;
/// If provided, add this much extra spacing to the right of the trailing icon.
final double trailingExtraMargin;
final VoidCallback? onTap;
final VoidCallback? onDoubleTap;
final Color? menuItemColor;
@ -27,6 +30,7 @@ class MenuItemWidget extends StatefulWidget {
this.trailingIcon,
this.trailingSwitch,
this.trailingIconIsMuted = false,
this.trailingExtraMargin = 0.0,
this.onTap,
this.onDoubleTap,
this.menuItemColor,
@ -141,11 +145,15 @@ class _MenuItemWidgetState extends State<MenuItemWidget> {
),
)
: widget.trailingIcon != null
? Icon(
widget.trailingIcon,
color: widget.trailingIconIsMuted
? enteColorScheme.strokeMuted
: null,
? Padding(
padding:
EdgeInsets.only(right: widget.trailingExtraMargin),
child: Icon(
widget.trailingIcon,
color: widget.trailingIconIsMuted
? enteColorScheme.strokeMuted
: null,
),
)
: widget.trailingSwitch ?? const SizedBox.shrink(),
],

View file

@ -73,6 +73,7 @@ class _ThemeSwitchWidgetState extends State<ThemeSwitchWidget> {
pressedColor: getEnteColorScheme(context).fillFaint,
isExpandable: false,
trailingIcon: currentThemeMode == themeMode ? Icons.check : null,
trailingExtraMargin: 4,
onTap: () async {
AdaptiveTheme.of(context).setThemeMode(themeMode);
currentThemeMode = themeMode;