diff --git a/lib/ui/advanced_settings_screen.dart b/lib/ui/advanced_settings_screen.dart index 04d5d7fa6..e3f6192bb 100644 --- a/lib/ui/advanced_settings_screen.dart +++ b/lib/ui/advanced_settings_screen.dart @@ -72,7 +72,7 @@ class _AdvancedSettingsScreenState extends State { title: "Album grid size", ), menuItemColor: colorScheme.fillFaint, - trailingSwitch: Row( + trailingWidget: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ diff --git a/lib/ui/backup_settings_screen.dart b/lib/ui/backup_settings_screen.dart index 4e9b053c6..8b838bb81 100644 --- a/lib/ui/backup_settings_screen.dart +++ b/lib/ui/backup_settings_screen.dart @@ -54,7 +54,7 @@ class BackupSettingsScreen extends StatelessWidget { title: "Backup over mobile data", ), menuItemColor: colorScheme.fillFaint, - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => Configuration.instance .shouldBackupOverMobileData(), onChanged: () async { @@ -79,7 +79,7 @@ class BackupSettingsScreen extends StatelessWidget { title: "Backup videos", ), menuItemColor: colorScheme.fillFaint, - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => Configuration.instance.shouldBackupVideos(), onChanged: () => Configuration.instance @@ -104,7 +104,7 @@ class BackupSettingsScreen extends StatelessWidget { title: "Disable auto lock", ), menuItemColor: colorScheme.fillFaint, - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => Configuration.instance .shouldKeepDeviceAwake(), onChanged: () { diff --git a/lib/ui/components/menu_item_widget.dart b/lib/ui/components/menu_item_widget.dart index 718deafaf..47dba4edf 100644 --- a/lib/ui/components/menu_item_widget.dart +++ b/lib/ui/components/menu_item_widget.dart @@ -14,7 +14,7 @@ class MenuItemWidget extends StatefulWidget { /// trailing icon can be passed without size as default size set by /// flutter is what this component expects final IconData? trailingIcon; - final Widget? trailingSwitch; + final Widget? trailingWidget; final bool trailingIconIsMuted; final VoidCallback? onTap; final VoidCallback? onDoubleTap; @@ -34,7 +34,7 @@ class MenuItemWidget extends StatefulWidget { this.leadingIcon, this.leadingIconColor, this.trailingIcon, - this.trailingSwitch, + this.trailingWidget, this.trailingIconIsMuted = false, this.onTap, this.onDoubleTap, @@ -163,7 +163,7 @@ class _MenuItemWidgetState extends State { ? enteColorScheme.strokeMuted : null, ) - : widget.trailingSwitch ?? const SizedBox.shrink(), + : widget.trailingWidget ?? const SizedBox.shrink(), ], ), ); diff --git a/lib/ui/settings/security_section_widget.dart b/lib/ui/settings/security_section_widget.dart index 014b8f1e3..3b1e7ef81 100644 --- a/lib/ui/settings/security_section_widget.dart +++ b/lib/ui/settings/security_section_widget.dart @@ -68,7 +68,7 @@ class _SecuritySectionWidgetState extends State { captionedTextWidget: const CaptionedTextWidget( title: "Two-factor", ), - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => UserService.instance.hasEnabledTwoFactor(), onChanged: () async { final hasAuthenticated = await LocalAuthenticationService @@ -101,7 +101,7 @@ class _SecuritySectionWidgetState extends State { captionedTextWidget: const CaptionedTextWidget( title: "Lockscreen", ), - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => _config.shouldShowLockScreen(), onChanged: () async { await LocalAuthenticationService.instance @@ -123,7 +123,7 @@ class _SecuritySectionWidgetState extends State { captionedTextWidget: const CaptionedTextWidget( title: "Hide from recents", ), - trailingSwitch: ToggleSwitchWidget( + trailingWidget: ToggleSwitchWidget( value: () => _config.shouldHideFromRecents(), onChanged: _hideFromRecentsOnChanged, ),