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

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/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<HomeWidgetSettingsPage> {
@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();
},
),
),
),
],
],
),
),
),
);

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/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<ViewerTransition>(
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<SlideshowInterval>(
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<SlideshowVideoPlayback>(
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<Settings, Set<CollectionFilter>>(
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<ViewerTransition>(
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<SlideshowInterval>(
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<SlideshowVideoPlayback>(
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<Settings, Set<CollectionFilter>>(
selector: (context, s) => s.screenSaverCollectionFilters,
builder: (context, filters, child) {
return SettingsCollectionTile(
filters: filters,
onSelection: (v) => settings.screenSaverCollectionFilters = v,
);
},
),
],
),
),
),
);