customizer edits

privacyidea · Nov 21, 2024 · 19cd146 · 19cd146
1 parent 9a9961c
commit 19cd146
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/lib/model/extensions/enums/image_file_type_extension.dart b/lib/model/extensions/enums/image_file_type_extension.dart
@@ -69,7 +69,7 @@ extension ImageFileTypeX on ImageFileType {
 
   String get fileExtension => toString().split('.').last;
 
-  String get fileName => switch (this) {
+  String get fileType => switch (this) {
         ImageFileType.svg => 'Scalable Vector Graphic',
         ImageFileType.svgz => 'Scalable Vector Graphic (compressed)',
         ImageFileType.png => 'PNG',
@@ -81,7 +81,7 @@ extension ImageFileTypeX on ImageFileType {
       };
 
   /// Builds an [XFile] from the given [imageData] and [fileName].
-  /// The [fileName] is used as the name of the file.
+  /// The [fileType] is used as the name of the file.
   /// The file extension is determined by the [ImageFileType].
   XFile buildXFile(Uint8List imageData, String fileName) => XFile.fromData(imageData, name: "$fileName.$fileExtension");
 }
diff --git a/lib/model/widget_image.dart b/lib/model/widget_image.dart
@@ -46,10 +46,14 @@ class Uint8ListConverter implements JsonConverter<Uint8List, String> {
 class WidgetImage {
   final ImageFileType fileType;
   final Uint8List imageData;
+  final String fileName;
+
+  String get fullFileName => '$fileName.${fileType.fileType}';
 
   WidgetImage({
     required this.fileType,
     required this.imageData,
+    required this.fileName,
   });
 
   @override
@@ -73,15 +77,15 @@ class WidgetImage {
     try {
       return fileType.buildImageWidget(imageData);
     } catch (e) {
-      Logger.error('Image is not an ${fileType.fileName}, or the image data is corrupted.', error: e);
+      Logger.error('Image is not an ${fileType.fileType}, or the image data is corrupted.', error: e);
       rethrow;
     }
   }
 
   factory WidgetImage.fromJson(Map<String, dynamic> json) => _$WidgetImageFromJson(json);
   Map<String, dynamic> toJson() => _$WidgetImageToJson(this);
 
-  XFile? toXFile(String? fileName) {
-    return fileType.buildXFile(imageData, fileName ?? 'image-${DateTime.now().millisecondsSinceEpoch}');
+  XFile? toXFile() {
+    return fileType.buildXFile(imageData, fileName);
   }
 }
diff --git a/lib/model/widget_image.g.dart b/lib/model/widget_image.g.dart
diff --git a/lib/utils/customization/application_customization.dart b/lib/utils/customization/application_customization.dart
@@ -82,8 +82,8 @@ class ApplicationCustomization {
     this.lightTheme = ThemeCustomization.defaultLightTheme,
     this.darkTheme = ThemeCustomization.defaultDarkTheme,
     this.disabledFeatures = const {},
-  })  : appIcon = appIcon ?? WidgetImage(fileType: ImageFileType.png, imageData: defaultIconUint8List),
-        appImage = appImage ?? WidgetImage(fileType: ImageFileType.png, imageData: defaultImageUint8List);
+  })  : appIcon = appIcon ?? WidgetImage(fileType: ImageFileType.png, imageData: defaultIconUint8List, fileName: 'appIcon'),
+        appImage = appImage ?? WidgetImage(fileType: ImageFileType.png, imageData: defaultImageUint8List, fileName: 'appImage');
 
   ApplicationCustomization copyWith({
     String? appName,

diff --git a/lib/utils/riverpod/riverpod_providers/generated_providers/token_notifier.g.dart b/lib/utils/riverpod/riverpod_providers/generated_providers/token_notifier.g.dart
diff --git a/test/unit_test/utils/customization/application_customization_test.dart b/test/unit_test/utils/customization/application_customization_test.dart
@@ -20,10 +20,12 @@ void _testAppCustomizer() {
       appIcon: WidgetImage(
         fileType: ImageFileType.png,
         imageData: defaultIconUint8List,
+        fileName: "appIcon",
       ),
       appImage: WidgetImage(
         fileType: ImageFileType.png,
         imageData: defaultImageUint8List,
+        fileName: "appImage",
       ),
       lightTheme: ApplicationCustomization.defaultCustomization.lightTheme,
       darkTheme: ApplicationCustomization.defaultCustomization.darkTheme,
@@ -51,10 +53,12 @@ void _testAppCustomizer() {
         appIcon: WidgetImage(
           fileType: ImageFileType.png,
           imageData: defaultImageUint8List,
+          fileName: "appIcon",
         ),
         appImage: WidgetImage(
           fileType: ImageFileType.png,
           imageData: defaultIconUint8List,
+          fileName: "appImage",
         ),
         lightTheme: ApplicationCustomization.defaultCustomization.darkTheme,
         darkTheme: ApplicationCustomization.defaultCustomization.lightTheme,