.gitignore

@@ -31,7 +31,3 @@ build/
 coverage/
 /.flutter-plugins
 /.flutter-plugins-dependencies
-
-# FVM Version Cache
-.fvm/
-.fvmrc

CHANGELOG.md

@@ -36,15 +36,3 @@
 ## 2.0.0 - February 22nd 2024
 
 - Simplified the ImagePickerTheme
-
-# 3.0.0 - February 22nd 2024
-
-- Removed customButton from ImagePicker.
-
-# 4.0.0
-* Added title options to theme.
-* updated iconica_analysis dependency.
-* Updated default theme.
-
-# 4.1.0
-* Added support for handling errors when calling `pickImage`.

example/lib/main.dart

@@ -11,9 +11,7 @@ void main() {
 }
 
 class ImagePickerExample extends StatelessWidget {
-  const ImagePickerExample({
-    super.key,
-  });
+  const ImagePickerExample({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -29,10 +27,8 @@ class ImagePickerExample extends StatelessWidget {
 }
 
 class ImagePickerExampleHomePage extends StatefulWidget {
-  const ImagePickerExampleHomePage({
-    required this.title,
-    super.key,
-  });
+  const ImagePickerExampleHomePage({Key? key, required this.title})
+      : super(key: key);
 
   final String title;
 
@@ -116,13 +112,7 @@ class ImagePickerExampleHomePageState
     Uint8List? imageInBytes = await showModalBottomSheet<Uint8List?>(
         context: context,
         backgroundColor: Colors.white,
-        builder: (BuildContext context) => ImagePicker(
-              onError: (error) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text(error.message ?? "An error occurred")),
-                );
-              },
-            ));
+        builder: (BuildContext context) => const ImagePicker());
     if (imageInBytes != null) {
       if (!listEquals(uploadedImage, imageInBytes)) {
         setState(() {

example/linux/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <file_selector_linux/file_selector_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
-  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
 }

example/linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  file_selector_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,8 +5,6 @@
 import FlutterMacOS
 import Foundation
 
-import file_selector_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
 }

example/windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <file_selector_windows/file_selector_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  FileSelectorWindowsRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FileSelectorWindows"));
 }

example/windows/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  file_selector_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

lib/flutter_image_picker.dart

@@ -4,7 +4,7 @@
 ///
 library flutter_image_picker;
 
-export "src/models/image_picker_config.dart";
-export "src/models/image_picker_theme.dart";
-export "src/services/image_picker_service.dart";
-export "src/ui/image_picker.dart";
+export 'src/models/image_picker_config.dart';
+export 'src/models/image_picker_theme.dart';
+export 'src/services/image_picker_service.dart';
+export 'src/ui/image_picker.dart';

lib/src/models/image_picker_theme.dart

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import "package:flutter/material.dart";
+import 'package:flutter/material.dart';
 
 class ImagePickerTheme {
   /// The [ImagePickerTheme] is used to style the [ImagePicker].
@@ -12,14 +12,11 @@ class ImagePickerTheme {
     this.iconSize = 125,
     this.spaceBetweenIcons = 30,
     this.makePhotoIcon,
-    this.makePhotoText = "TAKE PICTURE",
+    this.makePhotoText = 'Take a Picture',
     this.selectImageIcon,
-    this.selectImageText = "UPLOAD FILE",
+    this.selectImageText = 'Select File',
     this.iconTextStyle,
     this.closeButtonBuilder,
-    this.title = "Do you want to upload a file or take a picture?",
-    this.titleStyle,
-    this.titleAlignment = TextAlign.center,
   });
 
   /// The color of the icons
@@ -48,11 +45,5 @@ class ImagePickerTheme {
 
   final TextStyle? iconTextStyle;
 
-  final Widget Function(Function() onTap)? closeButtonBuilder;
-
-  final String title;
-
-  final TextStyle? titleStyle;
-
-  final TextAlign titleAlignment;
+  final Widget Function(Function onTap)? closeButtonBuilder;
 }

lib/src/services/image_picker_service.dart

@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import "dart:typed_data";
-import "package:flutter_image_picker/src/models/image_picker_config.dart";
-import "package:image_picker/image_picker.dart";
+import 'dart:typed_data';
+import 'package:flutter_image_picker/src/models/image_picker_config.dart';
+import 'package:image_picker/image_picker.dart';
 
 /// The Image Picker Service class is the functionality of the Image Picker
 /// package which uses the Image Picker package to choose an image.

lib/src/ui/image_picker.dart

@@ -2,10 +2,9 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import "package:flutter/material.dart";
-import "package:flutter/services.dart";
-import "package:flutter_image_picker/flutter_image_picker.dart";
-import "package:image_picker/image_picker.dart";
+import 'package:flutter/material.dart';
+import 'package:flutter_image_picker/flutter_image_picker.dart';
+import 'package:image_picker/image_picker.dart';
 
 /// The Image Picker class generates the Image Picker Widget which can be
 /// displayed in your application. If you call the class you can give it 4
@@ -22,7 +21,7 @@ class ImagePicker extends StatelessWidget {
     this.theme = const ImagePickerTheme(),
     this.config = const ImagePickerConfig(),
     this.service,
-    this.onError,
+    this.customButton,
     super.key,
   });
 
@@ -33,25 +32,18 @@ class ImagePicker extends StatelessWidget {
   /// uploaded image.
   final ImagePickerConfig config;
 
+  /// The Image Picker Dialog can have a custom button if you want to.
+  final Widget? customButton;
+
   /// The ImagePickerService can be used if you want to use your own
   /// implementation of the Image Service if you want to use it for testing or
   /// add more features. If null the current implementation will be used.
   final ImagePickerService? service;
 
-  final Function(PlatformException error)? onError;
-
   @override
   Widget build(BuildContext context) => SingleChildScrollView(
         child: Column(
           children: <Widget>[
-            ListTile(
-              title: Text(
-                theme.title,
-                style:
-                    theme.titleStyle ?? Theme.of(context).textTheme.titleMedium,
-                textAlign: theme.titleAlignment,
-              ),
-            ),
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -62,7 +54,6 @@ class ImagePicker extends StatelessWidget {
                   Icons.image,
                   ImageSource.gallery,
                   theme.selectImageText,
-                  onError,
                 ),
                 if (config.cameraOption ?? true) ...[
                   SizedBox(
@@ -75,7 +66,6 @@ class ImagePicker extends StatelessWidget {
                     Icons.camera_alt_rounded,
                     ImageSource.camera,
                     theme.makePhotoText,
-                    onError,
                   ),
                 ],
               ],
@@ -90,19 +80,20 @@ class ImagePicker extends StatelessWidget {
                 child: SizedBox(
                   width: 300,
                   height: 40,
-                  child: ElevatedButton(
-                    style: ElevatedButton.styleFrom(
-                      backgroundColor: Colors.black,
-                    ),
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: const Text(
-                      "Close",
-                      style: TextStyle(
-                        fontSize: 15,
-                        color: Colors.white,
+                  child: customButton ??
+                      ElevatedButton(
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.black,
+                        ),
+                        onPressed: () => Navigator.of(context).pop(),
+                        child: const Text(
+                          'Close',
+                          style: TextStyle(
+                            fontSize: 15,
+                            color: Colors.white,
+                          ),
+                        ),
                       ),
-                    ),
-                  ),
                 ),
               ),
               const SizedBox(height: 30),
@@ -131,7 +122,6 @@ class ImagePicker extends StatelessWidget {
     IconData icon,
     ImageSource imageSource,
     String bottomText,
-    Function(PlatformException error)? onError,
   ) =>
       Column(
         mainAxisSize: MainAxisSize.min,
@@ -140,14 +130,8 @@ class ImagePicker extends StatelessWidget {
             key: Key(bottomText),
             onTap: () async {
               var navigator = Navigator.of(context);
-              Uint8List? image;
-              try {
-                image = await (service ?? ImagePickerServiceDefault())
-                    .pickImage(imageSource, config: config);
-              } on PlatformException catch (e) {
-                debugPrint("image_picker_error: $e");
-                onError?.call(e);
-              }
+              var image = await (service ?? ImagePickerServiceDefault())
+                  .pickImage(imageSource, config: config);
               navigator.pop(image);
             },
             child: customIcon ??

pubspec.yaml

@@ -1,18 +1,16 @@
 name: flutter_image_picker
 description: A Flutter Image Picking package.
-version: 4.1.0
+version: 2.0.0
 repository: https://github.com/Iconica-Development/flutter_image_picker
 
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.17.6 <3.0.0"
   flutter: ">=1.17.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  image_picker: ^1.1.2
+  image_picker: ^1.0.7
 
 dev_dependencies:
   flutter_test:
@@ -21,4 +19,6 @@ dev_dependencies:
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis
-      ref: 7.0.0
+      ref: 6.0.0
+
+flutter:

test/image_picker_ui_test.dart

@@ -2,22 +2,22 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import "dart:typed_data";
+import 'dart:typed_data';
 
-import "package:flutter/material.dart";
-import "package:flutter_image_picker/flutter_image_picker.dart"
+import 'package:flutter/material.dart';
+import 'package:flutter_image_picker/flutter_image_picker.dart'
     as iconica_image_picker;
-import "package:flutter_test/flutter_test.dart";
-import "package:image_picker/image_picker.dart" as image_picker;
-import "package:mocktail/mocktail.dart";
+import 'package:flutter_test/flutter_test.dart';
+import 'package:image_picker/image_picker.dart' as image_picker;
+import 'package:mocktail/mocktail.dart';
 
-import "mocks/image_picker_service_mock.dart";
+import 'mocks/image_picker_service_mock.dart';
 
 void main() {
   var cameraImage = Uint8List(10);
   var galleryImage = Uint8List(44);
 
-  testWidgets("Image Picker Shows With Normal Theme", (tester) async {
+  testWidgets('Image Picker Shows With Normal Theme', (tester) async {
     await tester.pumpWidget(
       const MaterialApp(
         home: Material(
@@ -32,7 +32,7 @@ void main() {
     var selectImageIconFinder = find.byIcon(Icons.image);
     var selectImageTextFinder = find
         .text(const iconica_image_picker.ImagePickerTheme().selectImageText);
-    var closebuttonTextFinder = find.text("Close");
+    var closebuttonTextFinder = find.text('Close');
 
     expect(makePhotoIconFinder, findsOneWidget);
     expect(makePhotoTextFinder, findsOneWidget);
@@ -42,7 +42,7 @@ void main() {
   });
 
   testWidgets(
-      "Image Picker Calls Function Correctly When ImageSource Is Gallery",
+      'Image Picker Calls Function Correctly When ImageSource Is Gallery',
       (tester) async {
     var serviceMock = ImagePickerServiceMock();
 
@@ -70,7 +70,7 @@ void main() {
   });
 
   testWidgets(
-      "Image Picker Calls Function Correctly When ImageSource Is Camera",
+      'Image Picker Calls Function Correctly When ImageSource Is Camera',
       (tester) async {
     var serviceMock = ImagePickerServiceMock();
 
@@ -97,20 +97,20 @@ void main() {
         .called(1);
   });
 
-  testWidgets("Image Picker Shows With Custom Theme", (tester) async {
+  testWidgets('Image Picker Shows With Custom Theme', (tester) async {
     Widget makePhotoIcon = Container(
       height: 125,
       width: 125,
       color: Colors.red,
     );
-    var makePhotoText = "taaaake image";
+    var makePhotoText = 'taaaake image';
     Widget selectImageIcon = Container(
       height: 125,
       width: 125,
       color: Colors.blue,
     );
-    var selectImageText = "seleeeeect image";
-    var closeButtonText = "Close";
+    var selectImageText = 'seleeeeect image';
+    var closeButtonText = 'Close';
 
     await tester.pumpWidget(
       MaterialApp(

test/mocks/image_picker_service_mock.dart

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import "package:flutter_image_picker/src/services/image_picker_service.dart";
-import "package:mocktail/mocktail.dart";
+import 'package:flutter_image_picker/src/services/image_picker_service.dart';
+import 'package:mocktail/mocktail.dart';
 
 class ImagePickerServiceMock extends Mock implements ImagePickerService {}