From 48045517def924f31b2edf35cd751377361f6505 Mon Sep 17 00:00:00 2001 From: Thomas Klein Langenhorst Date: Tue, 28 Mar 2023 10:59:47 +0200 Subject: [PATCH 1/2] - Bump `flutter_form_wizard` to version 6.0.0 - Remove unnecessary `riverpod` dependency --- CHANGELOG.md | 4 + example/ios/Podfile.lock | 104 ++++++++++ example/ios/Runner.xcodeproj/project.pbxproj | 194 +++++++++++++++++- .../contents.xcworkspacedata | 3 + example/lib/main.dart | 13 +- example/lib/media_picker.dart | 12 +- example/lib/media_picker_check.dart | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- example/pubspec.lock | 76 +++++-- example/pubspec.yaml | 7 +- lib/flutter_media_picker.dart | 15 -- lib/src/inputs/input_audio.dart | 9 +- lib/src/inputs/input_text.dart | 9 +- lib/src/media_picker.dart | 11 +- pubspec.yaml | 26 ++- 15 files changed, 408 insertions(+), 79 deletions(-) create mode 100644 example/ios/Podfile.lock diff --git a/CHANGELOG.md b/CHANGELOG.md index 16b36de..7bf3b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0 + +- Bump `flutter_form_wizard` to version 6.0.0 +- Remove unnecessary `riverpod` dependency ## 0.3.5 - Fixed left button diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock new file mode 100644 index 0000000..fd46eb8 --- /dev/null +++ b/example/ios/Podfile.lock @@ -0,0 +1,104 @@ +PODS: + - DKImagePickerController/Core (4.3.4): + - DKImagePickerController/ImageDataManager + - DKImagePickerController/Resource + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): + - DKImagePickerController/Core + - DKPhotoGallery + - DKImagePickerController/Resource (4.3.4) + - DKPhotoGallery (0.0.17): + - DKPhotoGallery/Core (= 0.0.17) + - DKPhotoGallery/Model (= 0.0.17) + - DKPhotoGallery/Preview (= 0.0.17) + - DKPhotoGallery/Resource (= 0.0.17) + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Core (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Preview + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Model (0.0.17): + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Preview (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Resource + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Resource (0.0.17): + - SDWebImage + - SwiftyGif + - file_picker (0.0.1): + - DKImagePickerController/PhotoGallery + - Flutter + - Flutter (1.0.0) + - flutter_sound (9.2.13): + - Flutter + - flutter_sound_core (= 9.2.13) + - flutter_sound_core (9.2.13) + - image_picker_ios (0.0.1): + - Flutter + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - permission_handler_apple (9.0.4): + - Flutter + - SDWebImage (5.15.5): + - SDWebImage/Core (= 5.15.5) + - SDWebImage/Core (5.15.5) + - SwiftyGif (5.4.4) + - video_player_avfoundation (0.0.1): + - Flutter + +DEPENDENCIES: + - file_picker (from `.symlinks/plugins/file_picker/ios`) + - Flutter (from `Flutter`) + - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) + +SPEC REPOS: + trunk: + - DKImagePickerController + - DKPhotoGallery + - flutter_sound_core + - SDWebImage + - SwiftyGif + +EXTERNAL SOURCES: + file_picker: + :path: ".symlinks/plugins/file_picker/ios" + Flutter: + :path: Flutter + flutter_sound: + :path: ".symlinks/plugins/flutter_sound/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/ios" + permission_handler_apple: + :path: ".symlinks/plugins/permission_handler_apple/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/ios" + +SPEC CHECKSUMS: + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac + DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 + file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + flutter_sound: c60effa2a350fb977885f0db2fbc4c1ad5160900 + flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae + image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb + path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9 + permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce + SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe + SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f + video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff + +PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 + +COCOAPODS: 1.12.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index d9bd38c..f81a772 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -13,6 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + AE83DF5139FFFEAACD7AAA75 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67D4BFD0663732C509526B0B /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -32,6 +33,8 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 67D4BFD0663732C509526B0B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6D91AB53DF76CA5C8D9F305F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -42,6 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A8F679532B83E1C4740F985A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + C7D54A5E8DC98DE82A6BC461 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,12 +54,23 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + AE83DF5139FFFEAACD7AAA75 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 161573397D3890EF27EC43EF /* Pods */ = { + isa = PBXGroup; + children = ( + C7D54A5E8DC98DE82A6BC461 /* Pods-Runner.debug.xcconfig */, + A8F679532B83E1C4740F985A /* Pods-Runner.release.xcconfig */, + 6D91AB53DF76CA5C8D9F305F /* Pods-Runner.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -72,6 +88,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + 161573397D3890EF27EC43EF /* Pods */, + F7B3CC91777572795AE98F5F /* Frameworks */, ); sourceTree = ""; }; @@ -98,6 +116,14 @@ path = Runner; sourceTree = ""; }; + F7B3CC91777572795AE98F5F /* Frameworks */ = { + isa = PBXGroup; + children = ( + 67D4BFD0663732C509526B0B /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -105,12 +131,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + B09E2D2DE372EE5CD3A938AE /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + C9CEE51CCF85FF47D87FC5A8 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -171,6 +199,7 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -185,6 +214,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -197,6 +227,45 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + B09E2D2DE372EE5CD3A938AE /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + C9CEE51CCF85FF47D87FC5A8 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -294,6 +363,47 @@ "$(inherited)", "@executable_path/Frameworks", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-framework", + "\"AVFoundation\"", + "-framework", + "\"AVKit\"", + "-framework", + "\"DKImagePickerController\"", + "-framework", + "\"DKPhotoGallery\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"ImageIO\"", + "-framework", + "\"MediaPlayer\"", + "-framework", + "\"Photos\"", + "-framework", + "\"SDWebImage\"", + "-framework", + "\"SwiftyGif\"", + "-framework", + "\"UIKit\"", + "-framework", + "\"file_picker\"", + "-framework", + "\"flutter_sound\"", + "-framework", + "\"flutter_sound_core\"", + "-framework", + "\"image_picker_ios\"", + "-framework", + "\"path_provider_foundation\"", + "-framework", + "\"permission_handler_apple\"", + "-framework", + "\"video_player_avfoundation\"", + "\"-lc++\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -422,6 +532,47 @@ "$(inherited)", "@executable_path/Frameworks", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-framework", + "\"AVFoundation\"", + "-framework", + "\"AVKit\"", + "-framework", + "\"DKImagePickerController\"", + "-framework", + "\"DKPhotoGallery\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"ImageIO\"", + "-framework", + "\"MediaPlayer\"", + "-framework", + "\"Photos\"", + "-framework", + "\"SDWebImage\"", + "-framework", + "\"SwiftyGif\"", + "-framework", + "\"UIKit\"", + "-framework", + "\"file_picker\"", + "-framework", + "\"flutter_sound\"", + "-framework", + "\"flutter_sound_core\"", + "-framework", + "\"image_picker_ios\"", + "-framework", + "\"path_provider_foundation\"", + "-framework", + "\"permission_handler_apple\"", + "-framework", + "\"video_player_avfoundation\"", + "\"-lc++\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -444,6 +595,47 @@ "$(inherited)", "@executable_path/Frameworks", ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-framework", + "\"AVFoundation\"", + "-framework", + "\"AVKit\"", + "-framework", + "\"DKImagePickerController\"", + "-framework", + "\"DKPhotoGallery\"", + "-framework", + "\"Foundation\"", + "-framework", + "\"ImageIO\"", + "-framework", + "\"MediaPlayer\"", + "-framework", + "\"Photos\"", + "-framework", + "\"SDWebImage\"", + "-framework", + "\"SwiftyGif\"", + "-framework", + "\"UIKit\"", + "-framework", + "\"file_picker\"", + "-framework", + "\"flutter_sound\"", + "-framework", + "\"flutter_sound_core\"", + "-framework", + "\"image_picker_ios\"", + "-framework", + "\"path_provider_foundation\"", + "-framework", + "\"permission_handler_apple\"", + "-framework", + "\"video_player_avfoundation\"", + "\"-lc++\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/example/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/example/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/example/lib/main.dart b/example/lib/main.dart index 9271960..c676625 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -4,7 +4,6 @@ import 'package:example/media_picker.dart'; import 'package:flutter/material.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; void main() { runApp(const MyApp()); @@ -15,14 +14,12 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return ProviderScope( - child: MaterialApp( - title: 'Media Picker Example', - theme: ThemeData( - primarySwatch: Colors.blue, - ), - home: const MyHomePage(title: 'Media Picker Example'), + return MaterialApp( + title: 'Media Picker Example', + theme: ThemeData( + primarySwatch: Colors.blue, ), + home: const MyHomePage(title: 'Media Picker Example'), ); } } diff --git a/example/lib/media_picker.dart b/example/lib/media_picker.dart index f6e0e95..05de3ba 100644 --- a/example/lib/media_picker.dart +++ b/example/lib/media_picker.dart @@ -6,23 +6,21 @@ import 'package:example/media_picker_check.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_media_picker/flutter_media_picker.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; -class MediaPickerExample extends ConsumerStatefulWidget { +class MediaPickerExample extends StatefulWidget { const MediaPickerExample({required this.callback, Key? key}) : super(key: key); final Function callback; @override - ConsumerState createState() => - _MediaPickerExampleState(); + State createState() => _MediaPickerExampleState(); } -class _MediaPickerExampleState extends ConsumerState { +class _MediaPickerExampleState extends State { @override Widget build(BuildContext context) { - var mediaService = ref.read(mediaPickerServiceProvider); - var audioService = ref.read(audioPlayerServiceProvider); + var mediaService = MediaPickerFileService(); + var audioService = MediaPickerAudioService(); return Wrap( children: [ Container( diff --git a/example/lib/media_picker_check.dart b/example/lib/media_picker_check.dart index f366a57..3a4c0b6 100644 --- a/example/lib/media_picker_check.dart +++ b/example/lib/media_picker_check.dart @@ -3,7 +3,7 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form/flutter_form.dart'; +import 'package:flutter_form_wizard/flutter_form.dart'; class MediaCheckPage extends StatefulWidget { const MediaCheckPage({ diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 0d56f51..e777c67 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,7 @@ import FlutterMacOS import Foundation -import path_provider_macos +import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/example/pubspec.lock b/example/pubspec.lock index 399b38d..f7b03a9 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -101,32 +101,45 @@ packages: dependency: transitive description: name: file_picker +<<<<<<< HEAD sha256: ecf52f978e72763ede54a93271318bbbca65a2be2d9ff658ec8ca4ea3a23d7ef +======= + sha256: d8e9ca7e5d1983365c277f12c21b4362df6cf659c99af146ad4d04eb33033013 +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) url: "https://pub.dev" source: hosted - version: "5.2.4" + version: "5.2.6" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_form: + flutter_form_wizard: dependency: "direct main" description: path: "." - ref: "2.0.1" - resolved-ref: "86426c09bc39a3d926a6cf1f2f77377d92c76aec" - url: "https://github.com/Iconica-Development/flutter_form.git" + ref: "6.0.0" + resolved-ref: "6cca640496c6c13ee88de5f3da487c82564076de" + url: "https://github.com/Iconica-Development/flutter_form_wizard.git" source: git - version: "1.0.2" - flutter_hooks: + version: "6.0.0" + flutter_input_library: dependency: transitive description: +<<<<<<< HEAD name: flutter_hooks sha256: "2b202559a4ed3656bbb7aae9d8b335fb0037b23acc7ae3f377d1ba0b95c21aec" url: "https://pub.dev" source: hosted version: "0.18.5+1" +======= + path: "." + ref: "2.0.0" + resolved-ref: "7b3a6dba90b85c108983fa8b94fa2e79aeb67316" + url: "https://github.com/Iconica-Development/flutter_input_library" + source: git + version: "2.0.0" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) flutter_lints: dependency: "direct dev" description: @@ -146,7 +159,11 @@ packages: path: ".." relative: true source: path +<<<<<<< HEAD version: "0.3.5" +======= + version: "0.4.0" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) flutter_plugin_android_lifecycle: dependency: transitive description: @@ -155,6 +172,7 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.7" +<<<<<<< HEAD flutter_riverpod: dependency: transitive description: @@ -163,6 +181,8 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) flutter_sound: dependency: transitive description: @@ -197,6 +217,7 @@ packages: description: flutter source: sdk version: "0.0.0" +<<<<<<< HEAD hooks_riverpod: dependency: "direct main" description: @@ -205,6 +226,8 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) html: dependency: transitive description: @@ -233,10 +256,14 @@ packages: dependency: transitive description: name: image_picker +<<<<<<< HEAD sha256: a8f2f0aed50c03230ab37e93ca2905c50b6c4097245345956eb24a88f45328cd +======= + sha256: "64b21d9f0e065f9ab0e4dde458076226c97382cc0c6949144cb874c62bf8e9f8" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) url: "https://pub.dev" source: hosted - version: "0.8.6" + version: "0.8.7" image_picker_android: dependency: transitive description: @@ -293,6 +320,7 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" +<<<<<<< HEAD localization: dependency: transitive description: @@ -301,6 +329,8 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) logger: dependency: transitive description: @@ -361,10 +391,14 @@ packages: dependency: transitive description: name: path_provider +<<<<<<< HEAD sha256: "050e8e85e4b7fecdf2bb3682c1c64c4887a183720c802d323de8a5fd76d372dd" +======= + sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.0.13" path_provider_android: dependency: transitive description: @@ -373,14 +407,19 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.20" - path_provider_ios: + path_provider_foundation: dependency: transitive description: +<<<<<<< HEAD name: path_provider_ios sha256: "03d639406f5343478352433f00d3c4394d52dac8df3d847869c5e2333e0bbce8" +======= + name: path_provider_foundation + sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.2.0" path_provider_linux: dependency: transitive description: @@ -389,6 +428,7 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.7" +<<<<<<< HEAD path_provider_macos: dependency: transitive description: @@ -397,6 +437,8 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.6" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) path_provider_platform_interface: dependency: transitive description: @@ -493,6 +535,7 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.0" +<<<<<<< HEAD riverpod: dependency: transitive description: @@ -501,6 +544,8 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.3" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) sky_engine: dependency: transitive description: flutter @@ -522,6 +567,7 @@ packages: url: "https://pub.dev" source: hosted version: "1.11.0" +<<<<<<< HEAD state_notifier: dependency: transitive description: @@ -530,6 +576,8 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.2+1" +======= +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) stream_channel: dependency: transitive description: @@ -598,10 +646,14 @@ packages: dependency: transitive description: name: video_player +<<<<<<< HEAD sha256: "32c20460c6879140dbd2728323918e5b1982125ad6517f71a01e17cdd7fa7975" +======= + sha256: "868a139229acb5018d22aded3eb9cb4767ff43a8216573c086b6c535a4957481" +>>>>>>> 541850f (- Bump `flutter_form_wizard` to version 6.0.0) url: "https://pub.dev" source: hosted - version: "2.4.7" + version: "2.6.0" video_player_android: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index f1e2bf8..ba63b6e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -32,11 +32,10 @@ dependencies: flutter: sdk: flutter - hooks_riverpod : any - flutter_form: + flutter_form_wizard: git: - url: https://github.com/Iconica-Development/flutter_form.git - ref: 2.0.1 + url: https://github.com/Iconica-Development/flutter_form_wizard.git + ref: 6.0.0 flutter_media_picker: path: ../ diff --git a/lib/flutter_media_picker.dart b/lib/flutter_media_picker.dart index b08d9cb..8798cf3 100644 --- a/lib/flutter_media_picker.dart +++ b/lib/flutter_media_picker.dart @@ -9,18 +9,3 @@ export './src/inputs/inputs.dart'; export './src/service/services.dart'; export './src/media_result.dart'; export './src/media_picker.dart'; - -import 'package:flutter_media_picker/flutter_media_picker.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; - -final mediaPickerServiceProvider = Provider( - (ref) => MediaPickerFileService(), -); - -final videoFactoryProvider = Provider( - (ref) => MediaPickerVideoPlayerFactory(), -); - -final audioPlayerServiceProvider = Provider( - (ref) => MediaPickerAudioService(), -); diff --git a/lib/src/inputs/input_audio.dart b/lib/src/inputs/input_audio.dart index c8903f2..2fe8597 100644 --- a/lib/src/inputs/input_audio.dart +++ b/lib/src/inputs/input_audio.dart @@ -7,7 +7,6 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_media_picker/flutter_media_picker.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:intl/intl.dart'; /// Input for audio used by [MediaPicker]. @@ -85,7 +84,7 @@ class MediaPickerInputAudio implements MediaPickerInput { void Function(MediaResult value)? onComplete; } -class Recorder extends ConsumerStatefulWidget { +class Recorder extends StatefulWidget { const Recorder({ required this.onComplete, required this.audioService, @@ -99,10 +98,10 @@ class Recorder extends ConsumerStatefulWidget { final AudioInputStyling inputStyling; @override - ConsumerState createState() => _RecorderState(); + State createState() => _RecorderState(); } -class _RecorderState extends ConsumerState { +class _RecorderState extends State { final Clock clock = Clock(); String? directory; @@ -261,7 +260,7 @@ class _RecorderState extends ConsumerState { 'Next', style: Theme.of(context) .textTheme - .button, + .labelLarge, ), ), ), diff --git a/lib/src/inputs/input_text.dart b/lib/src/inputs/input_text.dart index f6b696c..5385d0f 100644 --- a/lib/src/inputs/input_text.dart +++ b/lib/src/inputs/input_text.dart @@ -3,10 +3,9 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/material.dart'; -import 'package:flutter_form/flutter_form.dart'; +import 'package:flutter_form_wizard/flutter_form.dart'; import 'package:flutter_media_picker/src/abstracts/media_picker_input.dart'; import 'package:flutter_media_picker/src/media_result.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; /// Input for text used by [MediaPicker]. class MediaPickerInputText implements MediaPickerInput { @@ -40,14 +39,14 @@ class MediaPickerInputText implements MediaPickerInput { void Function(MediaResult value)? onComplete; } -class DisplayText extends ConsumerStatefulWidget { +class DisplayText extends StatefulWidget { const DisplayText({Key? key}) : super(key: key); @override - ConsumerState createState() => _DisplayTextState(); + State createState() => _DisplayTextState(); } -class _DisplayTextState extends ConsumerState { +class _DisplayTextState extends State { final FlutterFormInputController _controller = FlutterFormInputPlainTextController( id: 'title', diff --git a/lib/src/media_picker.dart b/lib/src/media_picker.dart index 0aca4be..9d54e79 100644 --- a/lib/src/media_picker.dart +++ b/lib/src/media_picker.dart @@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import '../flutter_media_picker.dart'; /// [MediaPicker] is a widget that allows the user to select/make media from a variety of sources. @@ -101,7 +100,7 @@ import '../flutter_media_picker.dart'; /// ); ///``` -class MediaPicker extends ConsumerStatefulWidget { +class MediaPicker extends StatefulWidget { const MediaPicker({ this.mediaPickerInputs, this.inputsDirection = Axis.horizontal, @@ -125,10 +124,10 @@ class MediaPicker extends ConsumerStatefulWidget { Function(Map results) onComplete)? mediaCheckPage; @override - ConsumerState createState() => _MediaPickerState(); + State createState() => _MediaPickerState(); } -class _MediaPickerState extends ConsumerState { +class _MediaPickerState extends State { bool _isLoading = false; @override @@ -136,11 +135,11 @@ class _MediaPickerState extends ConsumerState { List inputs = [ MediaPickerInputPhoto(), MediaPickerInputVideo( - videoPlayerFactory: ref.read(videoFactoryProvider), + videoPlayerFactory: MediaPickerVideoPlayerFactory(), ), if (!kIsWeb) MediaPickerInputAudio( - audioService: ref.read(audioPlayerServiceProvider), + audioService: MediaPickerAudioService(), ), ]; diff --git a/pubspec.yaml b/pubspec.yaml index dd3cd4e..0190549 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_media_picker description: A new Flutter package project. -version: 0.3.5 +version: 0.4.0 homepage: https://github.com/Iconica-Development/flutter_media_picker publish_to: "none" @@ -12,20 +12,18 @@ dependencies: flutter: sdk: flutter - path: any - image_picker: any - file_picker: any - video_player: any - path_provider: any - hooks_riverpod: any - flutter_sound: any - intl: any - permission_handler: any - logger: any - flutter_form: + path: ^1.8.2 + image_picker: ^0.8.7 + file_picker: ^5.2.6 + video_player: ^2.6.0 + path_provider: ^2.0.13 + flutter_sound: ^9.2.13 + intl: ^0.17.0 + permission_handler: ^10.2.0 + flutter_form_wizard: git: - url: https://github.com/Iconica-Development/flutter_form.git - ref: 2.0.1 + url: https://github.com/Iconica-Development/flutter_form_wizard.git + ref: 6.0.0 mime: ^1.0.3 dev_dependencies: From 8a70a0194a54043e658ac400a4ba0651f664601e Mon Sep 17 00:00:00 2001 From: Thomas Klein Langenhorst Date: Tue, 28 Mar 2023 11:03:13 +0200 Subject: [PATCH 2/2] Fix: fix formatting and added logger back --- example/pubspec.lock | 4 ++-- lib/src/inputs/input_audio.dart | 2 +- lib/src/media_picker.dart | 2 +- lib/src/service/audio_service.dart | 2 +- pubspec.yaml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index f7b03a9..1a0ce60 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -335,10 +335,10 @@ packages: dependency: transitive description: name: logger - sha256: "5076f09225f91dc49289a4ccb92df2eeea9ea01cf7c26d49b3a1f04c6a49eec1" + sha256: db2ff852ed77090ba9f62d3611e4208a3d11dfa35991a81ae724c113fcb3e3f7 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.3.0" matcher: dependency: transitive description: diff --git a/lib/src/inputs/input_audio.dart b/lib/src/inputs/input_audio.dart index 2fe8597..0155f83 100644 --- a/lib/src/inputs/input_audio.dart +++ b/lib/src/inputs/input_audio.dart @@ -149,7 +149,7 @@ class _RecorderState extends State { ), ), style: widget.inputStyling.timeTextStyle ?? - Theme.of(context).textTheme.headline5, + Theme.of(context).textTheme.headlineSmall, ); }, ), diff --git a/lib/src/media_picker.dart b/lib/src/media_picker.dart index 9d54e79..82c0961 100644 --- a/lib/src/media_picker.dart +++ b/lib/src/media_picker.dart @@ -192,7 +192,7 @@ class _MediaPickerState extends State { padding: const EdgeInsets.only(left: 15), child: Text( input.label, - style: theme.textTheme.headline6, + style: theme.textTheme.titleLarge, ), ), ), diff --git a/lib/src/service/audio_service.dart b/lib/src/service/audio_service.dart index f17c022..6ae6024 100644 --- a/lib/src/service/audio_service.dart +++ b/lib/src/service/audio_service.dart @@ -13,7 +13,7 @@ import 'package:permission_handler/permission_handler.dart'; class MediaPickerAudioService implements AudioService { final FlutterSoundRecorder _recorder = FlutterSoundRecorder( - logLevel: Level.nothing, + logLevel: Level.debug, ); final FlutterSoundPlayer _player = FlutterSoundPlayer( logLevel: Level.nothing, diff --git a/pubspec.yaml b/pubspec.yaml index 0190549..53fcc8a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,6 +20,7 @@ dependencies: flutter_sound: ^9.2.13 intl: ^0.17.0 permission_handler: ^10.2.0 + logger: ^1.3.0 flutter_form_wizard: git: url: https://github.com/Iconica-Development/flutter_form_wizard.git