diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 7b7014a28..5657ade65 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -196,10 +196,10 @@ "themeBrightnessDark": "Dark", "themeBrightnessBlack": "Black", - "viewerTransitionFade": "Fade", - "viewerTransitionFadeZoomIn": "Fade & zoom in", - "viewerTransitionParallax": "Parallax", "viewerTransitionSlide": "Slide", + "viewerTransitionParallax": "Parallax", + "viewerTransitionFade": "Fade", + "viewerTransitionZoomIn": "Zoom in", "wallpaperTargetHome": "Home screen", "wallpaperTargetLock": "Lock screen", diff --git a/lib/model/settings/enums/enums.dart b/lib/model/settings/enums/enums.dart index 6347ef29a..b16349ef2 100644 --- a/lib/model/settings/enums/enums.dart +++ b/lib/model/settings/enums/enums.dart @@ -28,4 +28,4 @@ enum VideoControls { play, playSeek, playOutside, none } enum VideoLoopMode { never, shortOnly, always } -enum ViewerTransition { slide, parallax, fade, fadeZoomIn } +enum ViewerTransition { slide, parallax, fade, zoomIn } diff --git a/lib/model/settings/enums/viewer_transition.dart b/lib/model/settings/enums/viewer_transition.dart index a08ff0ea4..504474851 100644 --- a/lib/model/settings/enums/viewer_transition.dart +++ b/lib/model/settings/enums/viewer_transition.dart @@ -7,14 +7,14 @@ import 'enums.dart'; extension ExtraViewerTransition on ViewerTransition { String getName(BuildContext context) { switch (this) { - case ViewerTransition.fade: - return context.l10n.viewerTransitionFade; - case ViewerTransition.fadeZoomIn: - return context.l10n.viewerTransitionFadeZoomIn; - case ViewerTransition.parallax: - return context.l10n.viewerTransitionParallax; 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; } } @@ -26,7 +26,7 @@ extension ExtraViewerTransition on ViewerTransition { return PageTransitionEffects.slide(pageController, index, parallax: true); case ViewerTransition.fade: return PageTransitionEffects.fade(pageController, index, zoomIn: false); - case ViewerTransition.fadeZoomIn: + case ViewerTransition.zoomIn: return PageTransitionEffects.fade(pageController, index, zoomIn: true); } } diff --git a/untranslated.json b/untranslated.json index 1ba0a445e..dee677aed 100644 --- a/untranslated.json +++ b/untranslated.json @@ -5,10 +5,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -34,10 +34,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -65,10 +65,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -94,10 +94,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -123,10 +123,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -152,10 +152,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -181,10 +181,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -210,10 +210,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -239,10 +239,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -268,10 +268,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock", @@ -295,10 +295,10 @@ "slideshowVideoPlaybackSkip", "slideshowVideoPlaybackMuted", "slideshowVideoPlaybackWithSound", - "viewerTransitionFade", - "viewerTransitionFadeZoomIn", - "viewerTransitionParallax", "viewerTransitionSlide", + "viewerTransitionParallax", + "viewerTransitionFade", + "viewerTransitionZoomIn", "wallpaperTargetHome", "wallpaperTargetLock", "wallpaperTargetHomeLock",