From 28b8cae886f9b2633a2366f2cea8cba46c787908 Mon Sep 17 00:00:00 2001 From: Frank Merkel <138444693+frankmer@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:43:29 +0100 Subject: [PATCH] Rename image_file_type_extension to image_format_extension and update imports for consistency --- ...image_file_type.dart => image_format.dart} | 0 ...nsion.dart => image_format_extension.dart} | 2 +- lib/model/widget_image.dart | 4 +- .../application_customization.dart | 2 +- pubspec.lock | 56 +++++++++---------- pubspec.yaml | 2 +- .../application_customization_test.dart | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) rename lib/model/enums/{image_file_type.dart => image_format.dart} (100%) rename lib/model/extensions/enums/{image_file_type_extension.dart => image_format_extension.dart} (98%) diff --git a/lib/model/enums/image_file_type.dart b/lib/model/enums/image_format.dart similarity index 100% rename from lib/model/enums/image_file_type.dart rename to lib/model/enums/image_format.dart diff --git a/lib/model/extensions/enums/image_file_type_extension.dart b/lib/model/extensions/enums/image_format_extension.dart similarity index 98% rename from lib/model/extensions/enums/image_file_type_extension.dart rename to lib/model/extensions/enums/image_format_extension.dart index 81266980..81e54d90 100644 --- a/lib/model/extensions/enums/image_file_type_extension.dart +++ b/lib/model/extensions/enums/image_format_extension.dart @@ -23,7 +23,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:image_picker/image_picker.dart'; -import '../../enums/image_file_type.dart'; +import '../../enums/image_format.dart'; extension ImageFormatX on ImageFormat { static ImageFormat fromExtensionString(String ex) => switch (ex) { diff --git a/lib/model/widget_image.dart b/lib/model/widget_image.dart index 4b74851d..5d182076 100644 --- a/lib/model/widget_image.dart +++ b/lib/model/widget_image.dart @@ -25,9 +25,9 @@ import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; -import '../../../../../../../model/extensions/enums/image_file_type_extension.dart'; import '../utils/logger.dart'; -import 'enums/image_file_type.dart'; +import 'enums/image_format.dart'; +import 'extensions/enums/image_format_extension.dart'; part 'widget_image.g.dart'; diff --git a/lib/utils/customization/application_customization.dart b/lib/utils/customization/application_customization.dart index 1854f018..59afb42e 100644 --- a/lib/utils/customization/application_customization.dart +++ b/lib/utils/customization/application_customization.dart @@ -25,7 +25,7 @@ import 'package:privacyidea_authenticator/utils/app_info_utils.dart'; import '../../../utils/customization/theme_customization.dart'; import '../../model/enums/app_feature.dart'; -import '../../model/enums/image_file_type.dart'; +import '../../model/enums/image_format.dart'; import '../../model/widget_image.dart'; class ApplicationCustomization { diff --git a/pubspec.lock b/pubspec.lock index 9286064b..2cca3c05 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: eae3133cbb06de9205899b822e3897fc6a8bc278ad4c944b4ce612689369694b + sha256: daa1d780fdecf8af925680c06c86563cdd445deea995d5c9176f1302a2b10bbe url: "https://pub.dev" source: hosted - version: "1.3.47" + version: "1.3.48" _macros: dependency: transitive description: dart @@ -194,10 +194,10 @@ packages: dependency: transitive description: name: built_value - sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" url: "https://pub.dev" source: hosted - version: "8.9.2" + version: "8.9.3" camera: dependency: transitive description: @@ -546,26 +546,26 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: fef81a53ba1ca618def1f8bef4361df07968434e62cb204c1fb90bb880a03da2 + sha256: "15d761b95dfa2906dfcc31b7fc6fe293188533d1a3ffe78389ba9e69bd7fdbde" url: "https://pub.dev" source: hosted - version: "3.8.1" + version: "3.9.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: b94b217e3ad745e784960603d33d99471621ecca151c99c670869b76e50ad2a6 + sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "5.4.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "9e69806bb3d905aeec3c1242e0e1475de6ea6d48f456af29d598fb229a2b4e5e" + sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b url: "https://pub.dev" source: hosted - version: "2.18.2" + version: "2.19.0" firebase_messaging: dependency: "direct main" description: @@ -602,10 +602,10 @@ packages: dependency: "direct main" description: name: fluentui_system_icons - sha256: "681c1c83c7261d6e0b4010ac3a20448ddb2c4b8c82f796cd52ce759f006cc60e" + sha256: "820200fb123ec45417714d639771c0acb65ed3baebf84698b4b93c3c22ce218c" url: "https://pub.dev" source: hosted - version: "1.1.268" + version: "1.1.270" flutter: dependency: "direct main" description: flutter @@ -673,10 +673,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398" + sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" url: "https://pub.dev" source: hosted - version: "2.0.23" + version: "2.0.24" flutter_riverpod: dependency: "direct main" description: @@ -864,10 +864,10 @@ packages: dependency: transitive description: name: http_multi_server - sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8 url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" http_parser: dependency: transitive description: @@ -880,18 +880,18 @@ packages: dependency: "direct main" description: name: image - sha256: "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c" + sha256: b50b415345578583de0f1cf4c7bd389f164de0b316d890c707b41133047dbc2a url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" image_cropper: dependency: "direct main" description: name: image_cropper - sha256: fe37d9a129411486e0d93089b61bd326d05b89e78ad4981de54b560725bf5bd5 + sha256: "266760ed426d7121f0ada02c672bfe5c1b5c714e908328716aee756f045709dc" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.1.0" image_cropper_for_web: dependency: transitive description: @@ -1461,10 +1461,10 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" + sha256: "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93" url: "https://pub.dev" source: hosted - version: "2.3.3" + version: "2.3.4" shared_preferences_android: dependency: transitive description: @@ -1570,10 +1570,10 @@ packages: dependency: transitive description: name: source_helper - sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" url: "https://pub.dev" source: hosted - version: "1.3.4" + version: "1.3.5" source_map_stack_trace: dependency: transitive description: @@ -1634,10 +1634,10 @@ packages: dependency: transitive description: name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -1826,10 +1826,10 @@ packages: dependency: transitive description: name: watcher - sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2f91a4dc..a5ad7120 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -52,7 +52,7 @@ dependencies: flutter_riverpod: ^2.6.1 flutter_secure_storage: ^9.2.2 flutter_slidable: ^3.1.1 - flutter_svg: ^2.0.10+1 + flutter_svg: ^2.0.16 flutter_zxing: ^1.7.0 font_awesome_flutter: ^10.8.0 freezed_annotation: ^2.4.4 diff --git a/test/unit_test/utils/customization/application_customization_test.dart b/test/unit_test/utils/customization/application_customization_test.dart index edf34c27..7c21bf02 100644 --- a/test/unit_test/utils/customization/application_customization_test.dart +++ b/test/unit_test/utils/customization/application_customization_test.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:privacyidea_authenticator/model/enums/app_feature.dart'; -import 'package:privacyidea_authenticator/model/enums/image_file_type.dart'; +import 'package:privacyidea_authenticator/model/enums/image_format.dart'; import 'package:privacyidea_authenticator/model/widget_image.dart'; import 'package:privacyidea_authenticator/utils/customization/application_customization.dart';