refactor

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:

lib/model/settings/enums/accessibility_timeout.dart

@@ -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);
-    }
-  }
-}

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}) {

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<void> apply() async {
     if (!await windowService.isActivity()) return;
 

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) {

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:

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;
+    }
+  }
+}

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:

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);
   }

lib/model/settings/enums/slideshow_video_playback.dart

@@ -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;
-    }
-  }
-}

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:

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:

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:

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:

lib/model/settings/enums/unit_system.dart

@@ -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;
-    }
-  }
-}

lib/model/settings/enums/video_auto_play_mode.dart

@@ -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;
-    }
-  }
-}

lib/model/settings/enums/video_background_mode.dart

@@ -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;
-    }
-  }
-}

lib/model/settings/enums/video_controls.dart

@@ -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;
-    }
-  }
-}

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) {

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:

lib/model/settings/enums/widget_displayed_item.dart

@@ -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;
-    }
-  }
-}

lib/model/settings/enums/widget_open_action.dart

@@ -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;
-    }
-  }
-}

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) {

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<CollectionFilter> filters;

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;

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';

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';