Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fixes

Browse source
This commit is contained in:
Thibault Deckers 2022-07-18 19:16:25 +02:00
parent 89b8083d24
commit f74d02a8a7
2 changed files with 86 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lib/widgets/settings/home_widget_settings_page.dart
View file

@ -9,6 +9,7 @@ import 'package:aves/utils/constants.dart';
import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:aves/widgets/common/fx/borders.dart'; import 'package:aves/widgets/common/fx/borders.dart';
import 'package:aves/widgets/common/identity/buttons.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/home_widget.dart';
import 'package:aves/widgets/settings/common/collection_tile.dart'; import 'package:aves/widgets/settings/common/collection_tile.dart';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
@ -60,44 +61,45 @@ class _HomeWidgetSettingsPageState extends State<HomeWidgetSettingsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final l10n = context.l10n; final l10n = context.l10n;
return MediaQueryDataProvider(
return Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text(l10n.settingsWidgetPageTitle), title: Text(l10n.settingsWidgetPageTitle),
), ),
body: SafeArea( body: SafeArea(
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(
child: ListView( child: ListView(
children: [ children: [
_buildShapeSelector(), _buildShapeSelector(),
ListTile( ListTile(
title: Text(l10n.settingsWidgetShowOutline), title: Text(l10n.settingsWidgetShowOutline),
trailing: HomeWidgetOutlineSelector( trailing: HomeWidgetOutlineSelector(
getter: () => _outline, getter: () => _outline,
setter: (v) => setState(() => _outline = v), setter: (v) => setState(() => _outline = v),
),
), ),
), SettingsCollectionTile(
SettingsCollectionTile( filters: _collectionFilters,
filters: _collectionFilters, onSelection: (v) => setState(() => _collectionFilters = v),
onSelection: (v) => setState(() => _collectionFilters = v), ),
), ],
], ),
), ),
), const Divider(height: 0),
const Divider(height: 0), Padding(
Padding( padding: const EdgeInsets.all(8),
padding: const EdgeInsets.all(8), child: AvesOutlinedButton(
child: AvesOutlinedButton( label: l10n.saveTooltip,
label: l10n.saveTooltip, onPressed: () {
onPressed: () { _saveSettings();
_saveSettings(); WidgetService.configure();
WidgetService.configure(); },
}, ),
), ),
), ],
], ),
), ),
), ),
); );

95
lib/widgets/settings/screen_saver_settings_page.dart
View file

@ -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/enums/viewer_transition.dart';
import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/settings/settings.dart';
import 'package:aves/widgets/common/extensions/build_context.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/collection_tile.dart';
import 'package:aves/widgets/settings/common/tiles.dart'; import 'package:aves/widgets/settings/common/tiles.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -18,52 +19,54 @@ class ScreenSaverSettingsPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final l10n = context.l10n; final l10n = context.l10n;
return Scaffold( return MediaQueryDataProvider(
appBar: AppBar( child: Scaffold(
title: Text(l10n.settingsScreenSaverPageTitle), appBar: AppBar(
), title: Text(l10n.settingsScreenSaverPageTitle),
body: SafeArea( ),
child: ListView( body: SafeArea(
children: [ child: ListView(
SettingsSwitchListTile( children: [
selector: (context, s) => s.screenSaverFillScreen, SettingsSwitchListTile(
onChanged: (v) => settings.screenSaverFillScreen = v, selector: (context, s) => s.screenSaverFillScreen,
title: context.l10n.settingsSlideshowFillScreen, onChanged: (v) => settings.screenSaverFillScreen = v,
), title: context.l10n.settingsSlideshowFillScreen,
SettingsSelectionListTile<ViewerTransition>( ),
values: ViewerTransition.values, SettingsSelectionListTile<ViewerTransition>(
getName: (context, v) => v.getName(context), values: ViewerTransition.values,
selector: (context, s) => s.screenSaverTransition, getName: (context, v) => v.getName(context),
onSelection: (v) => settings.screenSaverTransition = v, selector: (context, s) => s.screenSaverTransition,
tileTitle: l10n.settingsSlideshowTransitionTile, onSelection: (v) => settings.screenSaverTransition = v,
dialogTitle: l10n.settingsSlideshowTransitionTitle, tileTitle: l10n.settingsSlideshowTransitionTile,
), dialogTitle: l10n.settingsSlideshowTransitionTitle,
SettingsSelectionListTile<SlideshowInterval>( ),
values: SlideshowInterval.values, SettingsSelectionListTile<SlideshowInterval>(
getName: (context, v) => v.getName(context), values: SlideshowInterval.values,
selector: (context, s) => s.screenSaverInterval, getName: (context, v) => v.getName(context),
onSelection: (v) => settings.screenSaverInterval = v, selector: (context, s) => s.screenSaverInterval,
tileTitle: l10n.settingsSlideshowIntervalTile, onSelection: (v) => settings.screenSaverInterval = v,
dialogTitle: l10n.settingsSlideshowIntervalTitle, tileTitle: l10n.settingsSlideshowIntervalTile,
), dialogTitle: l10n.settingsSlideshowIntervalTitle,
SettingsSelectionListTile<SlideshowVideoPlayback>( ),
values: SlideshowVideoPlayback.values, SettingsSelectionListTile<SlideshowVideoPlayback>(
getName: (context, v) => v.getName(context), values: SlideshowVideoPlayback.values,
selector: (context, s) => s.screenSaverVideoPlayback, getName: (context, v) => v.getName(context),
onSelection: (v) => settings.screenSaverVideoPlayback = v, selector: (context, s) => s.screenSaverVideoPlayback,
tileTitle: l10n.settingsSlideshowVideoPlaybackTile, onSelection: (v) => settings.screenSaverVideoPlayback = v,
dialogTitle: l10n.settingsSlideshowVideoPlaybackTitle, tileTitle: l10n.settingsSlideshowVideoPlaybackTile,
), dialogTitle: l10n.settingsSlideshowVideoPlaybackTitle,
Selector<Settings, Set<CollectionFilter>>( ),
selector: (context, s) => s.screenSaverCollectionFilters, Selector<Settings, Set<CollectionFilter>>(
builder: (context, filters, child) { selector: (context, s) => s.screenSaverCollectionFilters,
return SettingsCollectionTile( builder: (context, filters, child) {
filters: filters, return SettingsCollectionTile(
onSelection: (v) => settings.screenSaverCollectionFilters = v, filters: filters,
); onSelection: (v) => settings.screenSaverCollectionFilters = v,
}, );
), },
], ),
],
),
), ),
), ),
); );