diff --git a/lib/model/settings/enums/accessibility_animations.dart b/lib/model/settings/enums/accessibility_animations.dart index d301f098e..e9b6b1184 100644 --- a/lib/model/settings/enums/accessibility_animations.dart +++ b/lib/model/settings/enums/accessibility_animations.dart @@ -1,21 +1,7 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/model/settings/settings.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; extension ExtraAccessibilityAnimations on AccessibilityAnimations { - String getName(BuildContext context) { - switch (this) { - case AccessibilityAnimations.system: - return context.l10n.settingsSystemDefault; - case AccessibilityAnimations.disabled: - return context.l10n.accessibilityAnimationsRemove; - case AccessibilityAnimations.enabled: - return context.l10n.accessibilityAnimationsKeep; - } - } - bool get animate { switch (this) { case AccessibilityAnimations.system: diff --git a/lib/model/settings/enums/accessibility_timeout.dart b/lib/model/settings/enums/accessibility_timeout.dart deleted file mode 100644 index 5c7529f77..000000000 --- a/lib/model/settings/enums/accessibility_timeout.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraAccessibilityTimeout on AccessibilityTimeout { - String getName(BuildContext context) { - switch (this) { - case AccessibilityTimeout.system: - return context.l10n.settingsSystemDefault; - case AccessibilityTimeout.s1: - return context.l10n.timeSeconds(1); - case AccessibilityTimeout.s3: - return context.l10n.timeSeconds(3); - case AccessibilityTimeout.s5: - return context.l10n.timeSeconds(5); - case AccessibilityTimeout.s10: - return context.l10n.timeSeconds(10); - case AccessibilityTimeout.s30: - return context.l10n.timeSeconds(30); - } - } -} diff --git a/lib/model/settings/enums/coordinate_format.dart b/lib/model/settings/enums/coordinate_format.dart index 4b3b2ffd9..c03fe3727 100644 --- a/lib/model/settings/enums/coordinate_format.dart +++ b/lib/model/settings/enums/coordinate_format.dart @@ -1,21 +1,9 @@ import 'package:aves/l10n/l10n.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; +import 'package:aves/model/settings/enums/enums.dart'; import 'package:intl/intl.dart'; import 'package:latlong2/latlong.dart'; -import 'enums.dart'; - extension ExtraCoordinateFormat on CoordinateFormat { - String getName(BuildContext context) { - switch (this) { - case CoordinateFormat.dms: - return context.l10n.coordinateFormatDms; - case CoordinateFormat.decimal: - return context.l10n.coordinateFormatDecimal; - } - } - static const _separator = ', '; String format(AppLocalizations l10n, LatLng latLng, {bool minuteSecondPadding = false, int dmsSecondDecimals = 2}) { diff --git a/lib/model/settings/enums/display_refresh_rate_mode.dart b/lib/model/settings/enums/display_refresh_rate_mode.dart index 37c1d76f2..79bf93508 100644 --- a/lib/model/settings/enums/display_refresh_rate_mode.dart +++ b/lib/model/settings/enums/display_refresh_rate_mode.dart @@ -1,23 +1,10 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/services/common/services.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:device_info_plus/device_info_plus.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_displaymode/flutter_displaymode.dart'; -import 'enums.dart'; - extension ExtraDisplayRefreshRateMode on DisplayRefreshRateMode { - String getName(BuildContext context) { - switch (this) { - case DisplayRefreshRateMode.auto: - return context.l10n.settingsSystemDefault; - case DisplayRefreshRateMode.highest: - return context.l10n.displayRefreshRatePreferHighest; - case DisplayRefreshRateMode.lowest: - return context.l10n.displayRefreshRatePreferLowest; - } - } - Future apply() async { if (!await windowService.isActivity()) return; diff --git a/lib/model/settings/enums/entry_background.dart b/lib/model/settings/enums/entry_background.dart index c9935b6d1..b4fc3a636 100644 --- a/lib/model/settings/enums/entry_background.dart +++ b/lib/model/settings/enums/entry_background.dart @@ -1,7 +1,6 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:flutter/material.dart'; -import 'enums.dart'; - extension ExtraEntryBackground on EntryBackground { bool get isColor { switch (this) { diff --git a/lib/model/settings/enums/home_page.dart b/lib/model/settings/enums/home_page.dart index c52228d8a..4cdf8b057 100644 --- a/lib/model/settings/enums/home_page.dart +++ b/lib/model/settings/enums/home_page.dart @@ -1,20 +1,8 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/widgets/collection/collection_page.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves/widgets/filter_grids/albums_page.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; extension ExtraHomePageSetting on HomePageSetting { - String getName(BuildContext context) { - switch (this) { - case HomePageSetting.collection: - return context.l10n.drawerCollectionAll; - case HomePageSetting.albums: - return context.l10n.drawerAlbumPage; - } - } - String get routeName { switch (this) { case HomePageSetting.collection: diff --git a/lib/model/settings/enums/l10n.dart b/lib/model/settings/enums/l10n.dart new file mode 100644 index 000000000..88ce874bf --- /dev/null +++ b/lib/model/settings/enums/l10n.dart @@ -0,0 +1,278 @@ +import 'package:aves/model/settings/enums/enums.dart'; +import 'package:aves/widgets/common/extensions/build_context.dart'; +import 'package:aves_map/aves_map.dart'; +import 'package:flutter/widgets.dart'; + +extension ExtraAccessibilityAnimationsName on AccessibilityAnimations { + String getName(BuildContext context) { + switch (this) { + case AccessibilityAnimations.system: + return context.l10n.settingsSystemDefault; + case AccessibilityAnimations.disabled: + return context.l10n.accessibilityAnimationsRemove; + case AccessibilityAnimations.enabled: + return context.l10n.accessibilityAnimationsKeep; + } + } +} + +extension ExtraAccessibilityTimeoutName on AccessibilityTimeout { + String getName(BuildContext context) { + switch (this) { + case AccessibilityTimeout.system: + return context.l10n.settingsSystemDefault; + case AccessibilityTimeout.s1: + return context.l10n.timeSeconds(1); + case AccessibilityTimeout.s3: + return context.l10n.timeSeconds(3); + case AccessibilityTimeout.s5: + return context.l10n.timeSeconds(5); + case AccessibilityTimeout.s10: + return context.l10n.timeSeconds(10); + case AccessibilityTimeout.s30: + return context.l10n.timeSeconds(30); + } + } +} + +extension ExtraAvesThemeBrightnessName on AvesThemeBrightness { + String getName(BuildContext context) { + switch (this) { + case AvesThemeBrightness.system: + return context.l10n.settingsSystemDefault; + case AvesThemeBrightness.light: + return context.l10n.themeBrightnessLight; + case AvesThemeBrightness.dark: + return context.l10n.themeBrightnessDark; + case AvesThemeBrightness.black: + return context.l10n.themeBrightnessBlack; + } + } +} + +extension ExtraCoordinateFormatName on CoordinateFormat { + String getName(BuildContext context) { + switch (this) { + case CoordinateFormat.dms: + return context.l10n.coordinateFormatDms; + case CoordinateFormat.decimal: + return context.l10n.coordinateFormatDecimal; + } + } +} + +extension ExtraDisplayRefreshRateModeName on DisplayRefreshRateMode { + String getName(BuildContext context) { + switch (this) { + case DisplayRefreshRateMode.auto: + return context.l10n.settingsSystemDefault; + case DisplayRefreshRateMode.highest: + return context.l10n.displayRefreshRatePreferHighest; + case DisplayRefreshRateMode.lowest: + return context.l10n.displayRefreshRatePreferLowest; + } + } +} + +extension ExtraEntryMapStyleName on EntryMapStyle { + String getName(BuildContext context) { + switch (this) { + case EntryMapStyle.googleNormal: + return context.l10n.mapStyleGoogleNormal; + case EntryMapStyle.googleHybrid: + return context.l10n.mapStyleGoogleHybrid; + case EntryMapStyle.googleTerrain: + return context.l10n.mapStyleGoogleTerrain; + case EntryMapStyle.hmsNormal: + return context.l10n.mapStyleHuaweiNormal; + case EntryMapStyle.hmsTerrain: + return context.l10n.mapStyleHuaweiTerrain; + case EntryMapStyle.osmHot: + return context.l10n.mapStyleOsmHot; + case EntryMapStyle.stamenToner: + return context.l10n.mapStyleStamenToner; + case EntryMapStyle.stamenWatercolor: + return context.l10n.mapStyleStamenWatercolor; + } + } +} + +extension ExtraHomePageSettingName on HomePageSetting { + String getName(BuildContext context) { + switch (this) { + case HomePageSetting.collection: + return context.l10n.drawerCollectionAll; + case HomePageSetting.albums: + return context.l10n.drawerAlbumPage; + } + } +} + +extension ExtraKeepScreenOnName on KeepScreenOn { + String getName(BuildContext context) { + switch (this) { + case KeepScreenOn.never: + return context.l10n.keepScreenOnNever; + case KeepScreenOn.videoPlayback: + return context.l10n.keepScreenOnVideoPlayback; + case KeepScreenOn.viewerOnly: + return context.l10n.keepScreenOnViewerOnly; + case KeepScreenOn.always: + return context.l10n.keepScreenOnAlways; + } + } +} + +extension ExtraSlideshowVideoPlaybackName on SlideshowVideoPlayback { + String getName(BuildContext context) { + switch (this) { + case SlideshowVideoPlayback.skip: + return context.l10n.videoPlaybackSkip; + case SlideshowVideoPlayback.playMuted: + return context.l10n.videoPlaybackMuted; + case SlideshowVideoPlayback.playWithSound: + return context.l10n.videoPlaybackWithSound; + } + } +} + +extension ExtraSubtitlePositionName on SubtitlePosition { + String getName(BuildContext context) { + switch (this) { + case SubtitlePosition.top: + return context.l10n.subtitlePositionTop; + case SubtitlePosition.bottom: + return context.l10n.subtitlePositionBottom; + } + } +} + +extension ExtraThumbnailOverlayLocationIconName on ThumbnailOverlayLocationIcon { + String getName(BuildContext context) { + switch (this) { + case ThumbnailOverlayLocationIcon.located: + return context.l10n.filterLocatedLabel; + case ThumbnailOverlayLocationIcon.unlocated: + return context.l10n.filterNoLocationLabel; + case ThumbnailOverlayLocationIcon.none: + return context.l10n.settingsDisabled; + } + } +} + +extension ExtraThumbnailOverlayTagIconName on ThumbnailOverlayTagIcon { + String getName(BuildContext context) { + switch (this) { + case ThumbnailOverlayTagIcon.tagged: + return context.l10n.filterTaggedLabel; + case ThumbnailOverlayTagIcon.untagged: + return context.l10n.filterNoTagLabel; + case ThumbnailOverlayTagIcon.none: + return context.l10n.settingsDisabled; + } + } +} + +extension ExtraUnitSystemName on UnitSystem { + String getName(BuildContext context) { + switch (this) { + case UnitSystem.metric: + return context.l10n.unitSystemMetric; + case UnitSystem.imperial: + return context.l10n.unitSystemImperial; + } + } +} + +extension ExtraVideoAutoPlayModeName on VideoAutoPlayMode { + String getName(BuildContext context) { + switch (this) { + case VideoAutoPlayMode.disabled: + return context.l10n.settingsDisabled; + case VideoAutoPlayMode.playMuted: + return context.l10n.videoPlaybackMuted; + case VideoAutoPlayMode.playWithSound: + return context.l10n.videoPlaybackWithSound; + } + } +} + +extension ExtraVideoBackgroundModeName on VideoBackgroundMode { + String getName(BuildContext context) { + switch (this) { + case VideoBackgroundMode.disabled: + return context.l10n.settingsDisabled; + case VideoBackgroundMode.pip: + return context.l10n.settingsVideoEnablePip; + } + } +} + +extension ExtraVideoControlsName on VideoControls { + String getName(BuildContext context) { + switch (this) { + case VideoControls.play: + return context.l10n.videoControlsPlay; + case VideoControls.playSeek: + return context.l10n.videoControlsPlaySeek; + case VideoControls.playOutside: + return context.l10n.videoControlsPlayOutside; + case VideoControls.none: + return context.l10n.videoControlsNone; + } + } +} + +extension ExtraVideoLoopModeName on VideoLoopMode { + String getName(BuildContext context) { + switch (this) { + case VideoLoopMode.never: + return context.l10n.videoLoopModeNever; + case VideoLoopMode.shortOnly: + return context.l10n.videoLoopModeShortOnly; + case VideoLoopMode.always: + return context.l10n.videoLoopModeAlways; + } + } +} + +extension ExtraViewerTransitionName on ViewerTransition { + String getName(BuildContext context) { + switch (this) { + case ViewerTransition.slide: + return context.l10n.viewerTransitionSlide; + case ViewerTransition.parallax: + return context.l10n.viewerTransitionParallax; + case ViewerTransition.fade: + return context.l10n.viewerTransitionFade; + case ViewerTransition.zoomIn: + return context.l10n.viewerTransitionZoomIn; + case ViewerTransition.none: + return context.l10n.viewerTransitionNone; + } + } +} + +extension ExtraWidgetDisplayedItemName on WidgetDisplayedItem { + String getName(BuildContext context) { + switch (this) { + case WidgetDisplayedItem.random: + return context.l10n.widgetDisplayedItemRandom; + case WidgetDisplayedItem.mostRecent: + return context.l10n.widgetDisplayedItemMostRecent; + } + } +} + +extension ExtraWidgetOpenPageName on WidgetOpenPage { + String getName(BuildContext context) { + switch (this) { + case WidgetOpenPage.home: + return context.l10n.widgetOpenPageHome; + case WidgetOpenPage.collection: + return context.l10n.widgetOpenPageCollection; + case WidgetOpenPage.viewer: + return context.l10n.widgetOpenPageViewer; + } + } +} diff --git a/lib/model/settings/enums/map_style.dart b/lib/model/settings/enums/map_style.dart index cedc7c71f..89e0e6e26 100644 --- a/lib/model/settings/enums/map_style.dart +++ b/lib/model/settings/enums/map_style.dart @@ -1,6 +1,4 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves_map/aves_map.dart'; -import 'package:flutter/widgets.dart'; extension ExtraEntryMapStyle on EntryMapStyle { static bool isHeavy(EntryMapStyle? style) { @@ -16,27 +14,6 @@ extension ExtraEntryMapStyle on EntryMapStyle { } } - String getName(BuildContext context) { - switch (this) { - case EntryMapStyle.googleNormal: - return context.l10n.mapStyleGoogleNormal; - case EntryMapStyle.googleHybrid: - return context.l10n.mapStyleGoogleHybrid; - case EntryMapStyle.googleTerrain: - return context.l10n.mapStyleGoogleTerrain; - case EntryMapStyle.hmsNormal: - return context.l10n.mapStyleHuaweiNormal; - case EntryMapStyle.hmsTerrain: - return context.l10n.mapStyleHuaweiTerrain; - case EntryMapStyle.osmHot: - return context.l10n.mapStyleOsmHot; - case EntryMapStyle.stamenToner: - return context.l10n.mapStyleStamenToner; - case EntryMapStyle.stamenWatercolor: - return context.l10n.mapStyleStamenWatercolor; - } - } - bool get needMobileService { switch (this) { case EntryMapStyle.osmHot: diff --git a/lib/model/settings/enums/screen_on.dart b/lib/model/settings/enums/screen_on.dart index 5f21d4348..a2f168c64 100644 --- a/lib/model/settings/enums/screen_on.dart +++ b/lib/model/settings/enums/screen_on.dart @@ -1,23 +1,7 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/services/common/services.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; extension ExtraKeepScreenOn on KeepScreenOn { - String getName(BuildContext context) { - switch (this) { - case KeepScreenOn.never: - return context.l10n.keepScreenOnNever; - case KeepScreenOn.videoPlayback: - return context.l10n.keepScreenOnVideoPlayback; - case KeepScreenOn.viewerOnly: - return context.l10n.keepScreenOnViewerOnly; - case KeepScreenOn.always: - return context.l10n.keepScreenOnAlways; - } - } - void apply() { windowService.keepScreenOn(this == KeepScreenOn.always); } diff --git a/lib/model/settings/enums/slideshow_video_playback.dart b/lib/model/settings/enums/slideshow_video_playback.dart deleted file mode 100644 index 453ddf29b..000000000 --- a/lib/model/settings/enums/slideshow_video_playback.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraSlideshowVideoPlayback on SlideshowVideoPlayback { - String getName(BuildContext context) { - switch (this) { - case SlideshowVideoPlayback.skip: - return context.l10n.videoPlaybackSkip; - case SlideshowVideoPlayback.playMuted: - return context.l10n.videoPlaybackMuted; - case SlideshowVideoPlayback.playWithSound: - return context.l10n.videoPlaybackWithSound; - } - } -} diff --git a/lib/model/settings/enums/subtitle_position.dart b/lib/model/settings/enums/subtitle_position.dart index 88d49d6f1..988545095 100644 --- a/lib/model/settings/enums/subtitle_position.dart +++ b/lib/model/settings/enums/subtitle_position.dart @@ -1,18 +1,7 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; +import 'package:aves/model/settings/enums/enums.dart'; import 'package:flutter/widgets.dart'; -import 'enums.dart'; - extension ExtraSubtitlePosition on SubtitlePosition { - String getName(BuildContext context) { - switch (this) { - case SubtitlePosition.top: - return context.l10n.subtitlePositionTop; - case SubtitlePosition.bottom: - return context.l10n.subtitlePositionBottom; - } - } - TextAlignVertical toTextAlignVertical() { switch (this) { case SubtitlePosition.top: diff --git a/lib/model/settings/enums/theme_brightness.dart b/lib/model/settings/enums/theme_brightness.dart index 5edf515ae..af38e11c6 100644 --- a/lib/model/settings/enums/theme_brightness.dart +++ b/lib/model/settings/enums/theme_brightness.dart @@ -1,22 +1,7 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; +import 'package:aves/model/settings/enums/enums.dart'; import 'package:flutter/material.dart'; -import 'enums.dart'; - extension ExtraAvesThemeBrightness on AvesThemeBrightness { - String getName(BuildContext context) { - switch (this) { - case AvesThemeBrightness.system: - return context.l10n.settingsSystemDefault; - case AvesThemeBrightness.light: - return context.l10n.themeBrightnessLight; - case AvesThemeBrightness.dark: - return context.l10n.themeBrightnessDark; - case AvesThemeBrightness.black: - return context.l10n.themeBrightnessBlack; - } - } - ThemeMode get appThemeMode { switch (this) { case AvesThemeBrightness.system: diff --git a/lib/model/settings/enums/thumbnail_overlay_location_icon.dart b/lib/model/settings/enums/thumbnail_overlay_location_icon.dart index e61a0fd37..c241fe853 100644 --- a/lib/model/settings/enums/thumbnail_overlay_location_icon.dart +++ b/lib/model/settings/enums/thumbnail_overlay_location_icon.dart @@ -1,21 +1,8 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/theme/icons.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/material.dart'; - -import 'enums.dart'; +import 'package:flutter/widgets.dart'; extension ExtraThumbnailOverlayLocationIcon on ThumbnailOverlayLocationIcon { - String getName(BuildContext context) { - switch (this) { - case ThumbnailOverlayLocationIcon.located: - return context.l10n.filterLocatedLabel; - case ThumbnailOverlayLocationIcon.unlocated: - return context.l10n.filterNoLocationLabel; - case ThumbnailOverlayLocationIcon.none: - return context.l10n.settingsDisabled; - } - } - IconData getIcon(BuildContext context) { switch (this) { case ThumbnailOverlayLocationIcon.unlocated: diff --git a/lib/model/settings/enums/thumbnail_overlay_tag_icon.dart b/lib/model/settings/enums/thumbnail_overlay_tag_icon.dart index 00f006ec9..969900e82 100644 --- a/lib/model/settings/enums/thumbnail_overlay_tag_icon.dart +++ b/lib/model/settings/enums/thumbnail_overlay_tag_icon.dart @@ -1,21 +1,8 @@ +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/theme/icons.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/material.dart'; - -import 'enums.dart'; +import 'package:flutter/widgets.dart'; extension ExtraThumbnailOverlayTagIcon on ThumbnailOverlayTagIcon { - String getName(BuildContext context) { - switch (this) { - case ThumbnailOverlayTagIcon.tagged: - return context.l10n.filterTaggedLabel; - case ThumbnailOverlayTagIcon.untagged: - return context.l10n.filterNoTagLabel; - case ThumbnailOverlayTagIcon.none: - return context.l10n.settingsDisabled; - } - } - IconData getIcon(BuildContext context) { switch (this) { case ThumbnailOverlayTagIcon.tagged: diff --git a/lib/model/settings/enums/unit_system.dart b/lib/model/settings/enums/unit_system.dart deleted file mode 100644 index cde99328b..000000000 --- a/lib/model/settings/enums/unit_system.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraUnitSystem on UnitSystem { - String getName(BuildContext context) { - switch (this) { - case UnitSystem.metric: - return context.l10n.unitSystemMetric; - case UnitSystem.imperial: - return context.l10n.unitSystemImperial; - } - } -} diff --git a/lib/model/settings/enums/video_auto_play_mode.dart b/lib/model/settings/enums/video_auto_play_mode.dart deleted file mode 100644 index b06c765dd..000000000 --- a/lib/model/settings/enums/video_auto_play_mode.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraVideoAutoPlayMode on VideoAutoPlayMode { - String getName(BuildContext context) { - switch (this) { - case VideoAutoPlayMode.disabled: - return context.l10n.settingsDisabled; - case VideoAutoPlayMode.playMuted: - return context.l10n.videoPlaybackMuted; - case VideoAutoPlayMode.playWithSound: - return context.l10n.videoPlaybackWithSound; - } - } -} diff --git a/lib/model/settings/enums/video_background_mode.dart b/lib/model/settings/enums/video_background_mode.dart deleted file mode 100644 index 0a7e040bb..000000000 --- a/lib/model/settings/enums/video_background_mode.dart +++ /dev/null @@ -1,15 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraVideoBackgroundMode on VideoBackgroundMode { - String getName(BuildContext context) { - switch (this) { - case VideoBackgroundMode.disabled: - return context.l10n.settingsDisabled; - case VideoBackgroundMode.pip: - return context.l10n.settingsVideoEnablePip; - } - } -} diff --git a/lib/model/settings/enums/video_controls.dart b/lib/model/settings/enums/video_controls.dart deleted file mode 100644 index 6f9979f71..000000000 --- a/lib/model/settings/enums/video_controls.dart +++ /dev/null @@ -1,19 +0,0 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; - -extension ExtraVideoControls on VideoControls { - String getName(BuildContext context) { - switch (this) { - case VideoControls.play: - return context.l10n.videoControlsPlay; - case VideoControls.playSeek: - return context.l10n.videoControlsPlaySeek; - case VideoControls.playOutside: - return context.l10n.videoControlsPlayOutside; - case VideoControls.none: - return context.l10n.videoControlsNone; - } - } -} diff --git a/lib/model/settings/enums/video_loop_mode.dart b/lib/model/settings/enums/video_loop_mode.dart index 255e9ccde..0799fcfe8 100644 --- a/lib/model/settings/enums/video_loop_mode.dart +++ b/lib/model/settings/enums/video_loop_mode.dart @@ -1,20 +1,6 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -import 'enums.dart'; +import 'package:aves/model/settings/enums/enums.dart'; extension ExtraVideoLoopMode on VideoLoopMode { - String getName(BuildContext context) { - switch (this) { - case VideoLoopMode.never: - return context.l10n.videoLoopModeNever; - case VideoLoopMode.shortOnly: - return context.l10n.videoLoopModeShortOnly; - case VideoLoopMode.always: - return context.l10n.videoLoopModeAlways; - } - } - static const shortVideoThreshold = Duration(seconds: 30); bool shouldLoop(int? durationMillis) { diff --git a/lib/model/settings/enums/viewer_transition.dart b/lib/model/settings/enums/viewer_transition.dart index 739e067c3..1f4ff4352 100644 --- a/lib/model/settings/enums/viewer_transition.dart +++ b/lib/model/settings/enums/viewer_transition.dart @@ -1,25 +1,8 @@ -import 'package:aves/widgets/common/extensions/build_context.dart'; +import 'package:aves/model/settings/enums/enums.dart'; import 'package:aves/widgets/viewer/controls/controller.dart'; import 'package:flutter/widgets.dart'; -import 'enums.dart'; - extension ExtraViewerTransition on ViewerTransition { - String getName(BuildContext context) { - switch (this) { - case ViewerTransition.slide: - return context.l10n.viewerTransitionSlide; - case ViewerTransition.parallax: - return context.l10n.viewerTransitionParallax; - case ViewerTransition.fade: - return context.l10n.viewerTransitionFade; - case ViewerTransition.zoomIn: - return context.l10n.viewerTransitionZoomIn; - case ViewerTransition.none: - return context.l10n.viewerTransitionNone; - } - } - TransitionBuilder builder(PageController pageController, int index) { switch (this) { case ViewerTransition.slide: diff --git a/lib/model/settings/enums/widget_displayed_item.dart b/lib/model/settings/enums/widget_displayed_item.dart deleted file mode 100644 index 0914d4a6a..000000000 --- a/lib/model/settings/enums/widget_displayed_item.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -extension ExtraWidgetDisplayedItem on WidgetDisplayedItem { - String getName(BuildContext context) { - switch (this) { - case WidgetDisplayedItem.random: - return context.l10n.widgetDisplayedItemRandom; - case WidgetDisplayedItem.mostRecent: - return context.l10n.widgetDisplayedItemMostRecent; - } - } -} diff --git a/lib/model/settings/enums/widget_open_action.dart b/lib/model/settings/enums/widget_open_action.dart deleted file mode 100644 index 333be5fca..000000000 --- a/lib/model/settings/enums/widget_open_action.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/widgets/common/extensions/build_context.dart'; -import 'package:flutter/widgets.dart'; - -extension ExtraWidgetOpenPage on WidgetOpenPage { - String getName(BuildContext context) { - switch (this) { - case WidgetOpenPage.home: - return context.l10n.widgetOpenPageHome; - case WidgetOpenPage.collection: - return context.l10n.widgetOpenPageCollection; - case WidgetOpenPage.viewer: - return context.l10n.widgetOpenPageViewer; - } - } -} diff --git a/lib/model/settings/enums/widget_shape.dart b/lib/model/settings/enums/widget_shape.dart index c56a0debd..deeed752a 100644 --- a/lib/model/settings/enums/widget_shape.dart +++ b/lib/model/settings/enums/widget_shape.dart @@ -1,6 +1,6 @@ import 'package:aves/model/entry/entry.dart'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; extension ExtraWidgetShape on WidgetShape { Path path(Size widgetSize, double devicePixelRatio) { diff --git a/lib/model/source/collection_lens.dart b/lib/model/source/collection_lens.dart index 801763194..a117a8fdc 100644 --- a/lib/model/source/collection_lens.dart +++ b/lib/model/source/collection_lens.dart @@ -15,17 +15,16 @@ import 'package:aves/model/filters/rating.dart'; import 'package:aves/model/filters/trash.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_source.dart'; +import 'package:aves/model/source/enums/enums.dart'; import 'package:aves/model/source/events.dart'; import 'package:aves/model/source/location/location.dart'; import 'package:aves/model/source/section_keys.dart'; import 'package:aves/model/source/tag.dart'; -import 'package:aves_utils/aves_utils.dart'; import 'package:aves/utils/collection_utils.dart'; +import 'package:aves_utils/aves_utils.dart'; import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; -import 'enums/enums.dart'; - class CollectionLens with ChangeNotifier { final CollectionSource source; final Set filters; diff --git a/lib/model/source/enums/view.dart b/lib/model/source/enums/view.dart index aab4397f7..7f6c50ffd 100644 --- a/lib/model/source/enums/view.dart +++ b/lib/model/source/enums/view.dart @@ -1,9 +1,8 @@ +import 'package:aves/model/source/enums/enums.dart'; import 'package:aves/theme/icons.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:flutter/widgets.dart'; -import 'enums.dart'; - extension ExtraEntrySortFactor on EntrySortFactor { String getName(BuildContext context) { final l10n = context.l10n; diff --git a/lib/widgets/common/map/geo_map.dart b/lib/widgets/common/map/geo_map.dart index af2a37f98..0a2e8691e 100644 --- a/lib/widgets/common/map/geo_map.dart +++ b/lib/widgets/common/map/geo_map.dart @@ -3,15 +3,15 @@ import 'dart:math'; import 'dart:ui'; import 'package:aves/model/entry/entry.dart'; -import 'package:aves/model/entry/extensions/location.dart'; import 'package:aves/model/entry/extensions/images.dart'; +import 'package:aves/model/entry/extensions/location.dart'; import 'package:aves/model/entry/sort.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/enums/map_style.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/services/common/services.dart'; import 'package:aves/theme/durations.dart'; import 'package:aves/theme/icons.dart'; -import 'package:aves_utils/aves_utils.dart'; import 'package:aves/utils/constants.dart'; import 'package:aves/utils/math_utils.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; @@ -23,6 +23,7 @@ import 'package:aves/widgets/common/map/leaflet/map.dart'; import 'package:aves/widgets/common/thumbnail/image.dart'; import 'package:aves/widgets/dialogs/aves_selection_dialog.dart'; import 'package:aves_map/aves_map.dart'; +import 'package:aves_utils/aves_utils.dart'; import 'package:collection/collection.dart'; import 'package:fluster/fluster.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/common/map/map_action_delegate.dart b/lib/widgets/common/map/map_action_delegate.dart index 06a984005..a41c840d5 100644 --- a/lib/widgets/common/map/map_action_delegate.dart +++ b/lib/widgets/common/map/map_action_delegate.dart @@ -1,5 +1,5 @@ import 'package:aves/model/actions/map_actions.dart'; -import 'package:aves/model/settings/enums/map_style.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/services/common/services.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; diff --git a/lib/widgets/settings/accessibility/accessibility.dart b/lib/widgets/settings/accessibility/accessibility.dart index 484414f3a..17d963d7f 100644 --- a/lib/widgets/settings/accessibility/accessibility.dart +++ b/lib/widgets/settings/accessibility/accessibility.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:aves/model/settings/enums/accessibility_animations.dart'; import 'package:aves/model/settings/enums/enums.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/theme/colors.dart'; import 'package:aves/theme/icons.dart'; diff --git a/lib/widgets/settings/accessibility/time_to_take_action.dart b/lib/widgets/settings/accessibility/time_to_take_action.dart index 950eb76ec..137867c57 100644 --- a/lib/widgets/settings/accessibility/time_to_take_action.dart +++ b/lib/widgets/settings/accessibility/time_to_take_action.dart @@ -1,5 +1,5 @@ -import 'package:aves/model/settings/enums/accessibility_timeout.dart'; import 'package:aves/model/settings/enums/enums.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/services/accessibility_service.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; diff --git a/lib/widgets/settings/display/display.dart b/lib/widgets/settings/display/display.dart index 959249993..e5f9924dc 100644 --- a/lib/widgets/settings/display/display.dart +++ b/lib/widgets/settings/display/display.dart @@ -1,9 +1,8 @@ import 'dart:async'; import 'package:aves/model/device.dart'; -import 'package:aves/model/settings/enums/display_refresh_rate_mode.dart'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/theme_brightness.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/theme/colors.dart'; import 'package:aves/theme/icons.dart'; diff --git a/lib/widgets/settings/home_widget_settings_page.dart b/lib/widgets/settings/home_widget_settings_page.dart index a0c1341c6..8be4d42c8 100644 --- a/lib/widgets/settings/home_widget_settings_page.dart +++ b/lib/widgets/settings/home_widget_settings_page.dart @@ -1,7 +1,6 @@ import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/widget_displayed_item.dart'; -import 'package:aves/model/settings/enums/widget_open_action.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/enums/widget_shape.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/services/widget_service.dart'; diff --git a/lib/widgets/settings/language/language.dart b/lib/widgets/settings/language/language.dart index ff33641f5..472c2b990 100644 --- a/lib/widgets/settings/language/language.dart +++ b/lib/widgets/settings/language/language.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:aves/model/settings/enums/coordinate_format.dart'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/unit_system.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/theme/colors.dart'; import 'package:aves/theme/icons.dart'; diff --git a/lib/widgets/settings/navigation/navigation.dart b/lib/widgets/settings/navigation/navigation.dart index 2c738b136..93ea8a347 100644 --- a/lib/widgets/settings/navigation/navigation.dart +++ b/lib/widgets/settings/navigation/navigation.dart @@ -1,8 +1,7 @@ import 'dart:async'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/home_page.dart'; -import 'package:aves/model/settings/enums/screen_on.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/theme/colors.dart'; import 'package:aves/theme/icons.dart'; diff --git a/lib/widgets/settings/screen_saver_settings_page.dart b/lib/widgets/settings/screen_saver_settings_page.dart index 8d7902244..aed3abf0f 100644 --- a/lib/widgets/settings/screen_saver_settings_page.dart +++ b/lib/widgets/settings/screen_saver_settings_page.dart @@ -1,7 +1,6 @@ import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/settings/enums/enums.dart'; -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/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/widgets/common/basic/scaffold.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; diff --git a/lib/widgets/settings/thumbnails/overlay.dart b/lib/widgets/settings/thumbnails/overlay.dart index b8c47950e..aa1bef264 100644 --- a/lib/widgets/settings/thumbnails/overlay.dart +++ b/lib/widgets/settings/thumbnails/overlay.dart @@ -1,4 +1,5 @@ import 'package:aves/model/settings/enums/enums.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/enums/thumbnail_overlay_location_icon.dart'; import 'package:aves/model/settings/enums/thumbnail_overlay_tag_icon.dart'; import 'package:aves/model/settings/settings.dart'; diff --git a/lib/widgets/settings/video/controls.dart b/lib/widgets/settings/video/controls.dart index cbe4423b9..e8ee34c9c 100644 --- a/lib/widgets/settings/video/controls.dart +++ b/lib/widgets/settings/video/controls.dart @@ -1,5 +1,5 @@ import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/video_controls.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/widgets/common/basic/scaffold.dart'; import 'package:aves/widgets/common/extensions/build_context.dart'; diff --git a/lib/widgets/settings/video/subtitle_theme.dart b/lib/widgets/settings/video/subtitle_theme.dart index 5121d0377..6fc3fd7e2 100644 --- a/lib/widgets/settings/video/subtitle_theme.dart +++ b/lib/widgets/settings/video/subtitle_theme.dart @@ -1,5 +1,5 @@ import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/subtitle_position.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/widgets/common/basic/list_tiles/color.dart'; import 'package:aves/widgets/common/basic/list_tiles/slider.dart'; diff --git a/lib/widgets/settings/video/video.dart b/lib/widgets/settings/video/video.dart index c0e2e4acc..ba68e3d6b 100644 --- a/lib/widgets/settings/video/video.dart +++ b/lib/widgets/settings/video/video.dart @@ -3,9 +3,7 @@ import 'dart:async'; import 'package:aves/model/device.dart'; import 'package:aves/model/filters/mime.dart'; import 'package:aves/model/settings/enums/enums.dart'; -import 'package:aves/model/settings/enums/video_auto_play_mode.dart'; -import 'package:aves/model/settings/enums/video_background_mode.dart'; -import 'package:aves/model/settings/enums/video_loop_mode.dart'; +import 'package:aves/model/settings/enums/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/theme/colors.dart'; import 'package:aves/theme/icons.dart'; diff --git a/lib/widgets/settings/viewer/slideshow.dart b/lib/widgets/settings/viewer/slideshow.dart index b2f954c23..f84cab854 100644 --- a/lib/widgets/settings/viewer/slideshow.dart +++ b/lib/widgets/settings/viewer/slideshow.dart @@ -1,6 +1,5 @@ import 'package:aves/model/settings/enums/enums.dart'; -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/l10n.dart'; import 'package:aves/model/settings/settings.dart'; import 'package:aves/widgets/common/basic/scaffold.dart'; import 'package:aves/widgets/common/extensions/build_context.dart';