settings: merged raster/vector background

lib/l10n/app_en.arb

@@ -565,10 +565,8 @@
 
   "settingsSectionViewer": "Viewer",
   "@settingsSectionViewer": {},
-  "settingsRasterImageBackground": "Raster image background",
+  "settingsImageBackground": "Image background",
-  "@settingsRasterImageBackground": {},
+  "@settingsImageBackground": {},
-  "settingsVectorImageBackground": "Vector image background",
-  "@settingsVectorImageBackground": {},
   "settingsViewerShowMinimap": "Show minimap",
   "@settingsViewerShowMinimap": {},
   "settingsViewerShowInformation": "Show information",

lib/l10n/app_ko.arb

@@ -265,8 +265,7 @@
   "settingsThumbnailShowVideoDuration": "동영상 길이 표시",
 
   "settingsSectionViewer": "뷰어",
-  "settingsRasterImageBackground": "래스터 그래픽스 배경",
+  "settingsImageBackground": "사진 배경",
-  "settingsVectorImageBackground": "벡터 그래픽스 배경",
   "settingsViewerShowMinimap": "미니맵 표시",
   "settingsViewerShowInformation": "상세 정보 표시",
   "settingsViewerShowInformationSubtitle": "제목, 날짜, 장소 등 표시",

lib/model/settings/settings.dart

@@ -86,8 +86,7 @@ class Settings extends ChangeNotifier {
   static const coordinateFormatKey = 'coordinates_format';
 
   // rendering
-  static const rasterBackgroundKey = 'raster_background';
+  static const imageBackgroundKey = 'image_background';
-  static const vectorBackgroundKey = 'vector_background';
 
   // search
   static const saveSearchHistoryKey = 'save_search_history';
@@ -317,13 +316,9 @@ class Settings extends ChangeNotifier {
 
   // rendering
 
-  EntryBackground get rasterBackground => getEnumOrDefault(rasterBackgroundKey, EntryBackground.white, EntryBackground.values);
+  EntryBackground get imageBackground => getEnumOrDefault(imageBackgroundKey, EntryBackground.white, EntryBackground.values);
 
-  set rasterBackground(EntryBackground newValue) => setAndNotify(rasterBackgroundKey, newValue.toString());
+  set imageBackground(EntryBackground newValue) => setAndNotify(imageBackgroundKey, newValue.toString());
-
-  EntryBackground get vectorBackground => getEnumOrDefault(vectorBackgroundKey, EntryBackground.white, EntryBackground.values);
-
-  set vectorBackground(EntryBackground newValue) => setAndNotify(vectorBackgroundKey, newValue.toString());
 
   // search
 
@@ -480,8 +475,7 @@ class Settings extends ChangeNotifier {
             case subtitleTextAlignmentKey:
             case infoMapStyleKey:
             case coordinateFormatKey:
-            case rasterBackgroundKey:
+            case imageBackgroundKey:
-            case vectorBackgroundKey:
               if (value is String) {
                 _prefs!.setString(key, value);
               } else {

lib/model/video/metadata.dart

@@ -185,7 +185,7 @@ class VideoMetadataFormatter {
                       profileString = profile.toString();
                       break;
                   }
-                  save('Codec Profile', profileString);
+                  save('Format Profile', profileString);
                 }
                 break;
               }

lib/widgets/collection/thumbnail/image.dart

@@ -189,7 +189,7 @@ class _ThumbnailImageState extends State<ThumbnailImage> {
             height: extent,
           )
         : Selector<Settings, EntryBackground>(
-            selector: (context, s) => entry.isSvg ? s.vectorBackground : s.rasterBackground,
+            selector: (context, s) => s.imageBackground,
             builder: (context, background, child) {
               final backgroundColor = background.isColor ? background.color : null;
 

lib/widgets/settings/viewer/viewer.dart

@@ -23,8 +23,7 @@ class ViewerSection extends StatelessWidget {
     final currentShowOverlayMinimap = context.select<Settings, bool>((s) => s.showOverlayMinimap);
     final currentShowOverlayInfo = context.select<Settings, bool>((s) => s.showOverlayInfo);
     final currentShowOverlayShootingDetails = context.select<Settings, bool>((s) => s.showOverlayShootingDetails);
-    final currentRasterBackground = context.select<Settings, EntryBackground>((s) => s.rasterBackground);
+    final currentImageBackground = context.select<Settings, EntryBackground>((s) => s.imageBackground);
-    final currentVectorBackground = context.select<Settings, EntryBackground>((s) => s.vectorBackground);
 
     return AvesExpansionTile(
       leading: SettingsTileLeading(
@@ -53,17 +52,10 @@ class ViewerSection extends StatelessWidget {
           title: Text(context.l10n.settingsViewerShowShootingDetails),
         ),
         ListTile(
-          title: Text(context.l10n.settingsRasterImageBackground),
+          title: Text(context.l10n.settingsImageBackground),
           trailing: EntryBackgroundSelector(
-            getter: () => currentRasterBackground,
+            getter: () => currentImageBackground,
-            setter: (value) => settings.rasterBackground = value,
+            setter: (value) => settings.imageBackground = value,
-          ),
-        ),
-        ListTile(
-          title: Text(context.l10n.settingsVectorImageBackground),
-          trailing: EntryBackgroundSelector(
-            getter: () => currentVectorBackground,
-            setter: (value) => settings.vectorBackground = value,
           ),
         ),
       ],

lib/widgets/viewer/visual/raster.dart

@@ -191,7 +191,7 @@ class _RasterImageViewState extends State<RasterImageView> {
     final decorationSize = (applyBoxFit(BoxFit.none, viewSize, viewportSize).source - const Offset(.5, .5)) as Size;
 
     Widget child;
-    final background = settings.rasterBackground;
+    final background = settings.imageBackground;
     if (background == EntryBackground.checkered) {
       final side = viewportSize.shortestSide;
       final checkSize = side / ((side / EntryPageView.decorationCheckSize).round());

lib/widgets/viewer/visual/vector.dart

@@ -159,7 +159,7 @@ class _VectorImageViewState extends State<VectorImageView> {
     final displayHeight = _displaySize.height;
     final viewRect = _getViewRect(displayWidth, displayHeight);
     final viewScale = viewState.scale!;
-    final background = settings.vectorBackground;
+    final background = settings.imageBackground;
 
     Color? backgroundColor;
     _BackgroundFrameBuilder? backgroundFrameBuilder;