From f74d02a8a78742759150925c7d5a74273225a064 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 18 Jul 2022 19:16:25 +0200 Subject: [PATCH] fixes --- .../settings/home_widget_settings_page.dart | 72 +++++++------- .../settings/screen_saver_settings_page.dart | 95 ++++++++++--------- 2 files changed, 86 insertions(+), 81 deletions(-) diff --git a/lib/widgets/settings/home_widget_settings_page.dart b/lib/widgets/settings/home_widget_settings_page.dart index 1e59efbde..3d18b18ea 100644 --- a/lib/widgets/settings/home_widget_settings_page.dart +++ b/lib/widgets/settings/home_widget_settings_page.dart @@ -9,6 +9,7 @@ import 'package:aves/utils/constants.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves/widgets/common/fx/borders.dart'; import 'package:aves/widgets/common/identity/buttons.dart'; +import 'package:aves/widgets/common/providers/media_query_data_provider.dart'; import 'package:aves/widgets/home_widget.dart'; import 'package:aves/widgets/settings/common/collection_tile.dart'; import 'package:collection/collection.dart'; @@ -60,44 +61,45 @@ class _HomeWidgetSettingsPageState extends State { @override Widget build(BuildContext context) { final l10n = context.l10n; - - return Scaffold( - appBar: AppBar( - title: Text(l10n.settingsWidgetPageTitle), - ), - body: SafeArea( - child: Column( - children: [ - Expanded( - child: ListView( - children: [ - _buildShapeSelector(), - ListTile( - title: Text(l10n.settingsWidgetShowOutline), - trailing: HomeWidgetOutlineSelector( - getter: () => _outline, - setter: (v) => setState(() => _outline = v), + return MediaQueryDataProvider( + child: Scaffold( + appBar: AppBar( + title: Text(l10n.settingsWidgetPageTitle), + ), + body: SafeArea( + child: Column( + children: [ + Expanded( + child: ListView( + children: [ + _buildShapeSelector(), + ListTile( + title: Text(l10n.settingsWidgetShowOutline), + trailing: HomeWidgetOutlineSelector( + getter: () => _outline, + setter: (v) => setState(() => _outline = v), + ), ), - ), - SettingsCollectionTile( - filters: _collectionFilters, - onSelection: (v) => setState(() => _collectionFilters = v), - ), - ], + SettingsCollectionTile( + filters: _collectionFilters, + onSelection: (v) => setState(() => _collectionFilters = v), + ), + ], + ), ), - ), - const Divider(height: 0), - Padding( - padding: const EdgeInsets.all(8), - child: AvesOutlinedButton( - label: l10n.saveTooltip, - onPressed: () { - _saveSettings(); - WidgetService.configure(); - }, + const Divider(height: 0), + Padding( + padding: const EdgeInsets.all(8), + child: AvesOutlinedButton( + label: l10n.saveTooltip, + onPressed: () { + _saveSettings(); + WidgetService.configure(); + }, + ), ), - ), - ], + ], + ), ), ), ); diff --git a/lib/widgets/settings/screen_saver_settings_page.dart b/lib/widgets/settings/screen_saver_settings_page.dart index 58b0f71bf..bc7c17fe6 100644 --- a/lib/widgets/settings/screen_saver_settings_page.dart +++ b/lib/widgets/settings/screen_saver_settings_page.dart @@ -5,6 +5,7 @@ import 'package:aves/model/settings/enums/slideshow_video_playback.dart'; import 'package:aves/model/settings/enums/viewer_transition.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; +import 'package:aves/widgets/common/providers/media_query_data_provider.dart'; import 'package:aves/widgets/settings/common/collection_tile.dart'; import 'package:aves/widgets/settings/common/tiles.dart'; import 'package:flutter/material.dart'; @@ -18,52 +19,54 @@ class ScreenSaverSettingsPage extends StatelessWidget { @override Widget build(BuildContext context) { final l10n = context.l10n; - return Scaffold( - appBar: AppBar( - title: Text(l10n.settingsScreenSaverPageTitle), - ), - body: SafeArea( - child: ListView( - children: [ - SettingsSwitchListTile( - selector: (context, s) => s.screenSaverFillScreen, - onChanged: (v) => settings.screenSaverFillScreen = v, - title: context.l10n.settingsSlideshowFillScreen, - ), - SettingsSelectionListTile( - values: ViewerTransition.values, - getName: (context, v) => v.getName(context), - selector: (context, s) => s.screenSaverTransition, - onSelection: (v) => settings.screenSaverTransition = v, - tileTitle: l10n.settingsSlideshowTransitionTile, - dialogTitle: l10n.settingsSlideshowTransitionTitle, - ), - SettingsSelectionListTile( - values: SlideshowInterval.values, - getName: (context, v) => v.getName(context), - selector: (context, s) => s.screenSaverInterval, - onSelection: (v) => settings.screenSaverInterval = v, - tileTitle: l10n.settingsSlideshowIntervalTile, - dialogTitle: l10n.settingsSlideshowIntervalTitle, - ), - SettingsSelectionListTile( - values: SlideshowVideoPlayback.values, - getName: (context, v) => v.getName(context), - selector: (context, s) => s.screenSaverVideoPlayback, - onSelection: (v) => settings.screenSaverVideoPlayback = v, - tileTitle: l10n.settingsSlideshowVideoPlaybackTile, - dialogTitle: l10n.settingsSlideshowVideoPlaybackTitle, - ), - Selector>( - selector: (context, s) => s.screenSaverCollectionFilters, - builder: (context, filters, child) { - return SettingsCollectionTile( - filters: filters, - onSelection: (v) => settings.screenSaverCollectionFilters = v, - ); - }, - ), - ], + return MediaQueryDataProvider( + child: Scaffold( + appBar: AppBar( + title: Text(l10n.settingsScreenSaverPageTitle), + ), + body: SafeArea( + child: ListView( + children: [ + SettingsSwitchListTile( + selector: (context, s) => s.screenSaverFillScreen, + onChanged: (v) => settings.screenSaverFillScreen = v, + title: context.l10n.settingsSlideshowFillScreen, + ), + SettingsSelectionListTile( + values: ViewerTransition.values, + getName: (context, v) => v.getName(context), + selector: (context, s) => s.screenSaverTransition, + onSelection: (v) => settings.screenSaverTransition = v, + tileTitle: l10n.settingsSlideshowTransitionTile, + dialogTitle: l10n.settingsSlideshowTransitionTitle, + ), + SettingsSelectionListTile( + values: SlideshowInterval.values, + getName: (context, v) => v.getName(context), + selector: (context, s) => s.screenSaverInterval, + onSelection: (v) => settings.screenSaverInterval = v, + tileTitle: l10n.settingsSlideshowIntervalTile, + dialogTitle: l10n.settingsSlideshowIntervalTitle, + ), + SettingsSelectionListTile( + values: SlideshowVideoPlayback.values, + getName: (context, v) => v.getName(context), + selector: (context, s) => s.screenSaverVideoPlayback, + onSelection: (v) => settings.screenSaverVideoPlayback = v, + tileTitle: l10n.settingsSlideshowVideoPlaybackTile, + dialogTitle: l10n.settingsSlideshowVideoPlaybackTitle, + ), + Selector>( + selector: (context, s) => s.screenSaverCollectionFilters, + builder: (context, filters, child) { + return SettingsCollectionTile( + filters: filters, + onSelection: (v) => settings.screenSaverCollectionFilters = v, + ); + }, + ), + ], + ), ), ), );