From 263d3dbe656048cd7b0dafe5bfb6aaa934e3d1b3 Mon Sep 17 00:00:00 2001 From: Karsten Silz Date: Mon, 8 Aug 2022 14:08:22 +0100 Subject: [PATCH 01/12] Updated file_picker to 5.0.1. --- example/pubspec.lock | 12 ++++++------ pubspec.lock | 6 +++--- pubspec.yaml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index 3b67a02e..7a6366a1 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -63,14 +63,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "2.0.1" file_picker: dependency: transitive description: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.6.1" + version: "5.0.1" flex_color_picker: dependency: transitive description: @@ -117,7 +117,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter @@ -197,7 +197,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.2" pointer_interceptor: dependency: transitive description: @@ -272,7 +272,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.4.4" + version: "2.7.0" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.17.0 <3.0.0" flutter: ">=3.0.0" diff --git a/pubspec.lock b/pubspec.lock index 11b64474..0d723d44 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -56,14 +56,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "2.0.1" file_picker: dependency: "direct main" description: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.6.1" + version: "5.0.1" flex_color_picker: dependency: "direct main" description: @@ -258,7 +258,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.7.0" sdks: dart: ">=2.17.0 <3.0.0" flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index bd7ac103..261360ff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: # plugin to show a color picker for foreground/highlight color flex_color_picker: ^2.5.0 # plugin to get files from filesystem - file_picker: ^4.6.0 + file_picker: ^5.0.1 # plugin to show a scrollable number picker for inserting tables numberpicker: ^2.1.1 # plugin to allow dropdowns and dialogs to be interactable when displaying over the editor From 01115f8543f106bc2e55c29d016bb235a67fb58c Mon Sep 17 00:00:00 2001 From: Karsten Silz Date: Mon, 8 Aug 2022 14:15:50 +0100 Subject: [PATCH 02/12] Bumped two other dependencies. --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile.lock | 60 ++++++++++++++++++- example/ios/Runner.xcodeproj/project.pbxproj | 4 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/Info.plist | 2 + example/pubspec.lock | 2 +- pubspec.lock | 4 +- pubspec.yaml | 4 +- 8 files changed, 69 insertions(+), 11 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9367d483..8d4492f9 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 61a04129..b03e6548 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,4 +1,38 @@ 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_inappwebview (0.0.1): - Flutter @@ -7,27 +41,49 @@ PODS: - flutter_inappwebview/Core (0.0.1): - Flutter - OrderedSet (~> 5.0) + - flutter_keyboard_visibility (0.0.1): + - Flutter - OrderedSet (5.0.0) + - SDWebImage (5.13.2): + - SDWebImage/Core (= 5.13.2) + - SDWebImage/Core (5.13.2) + - SwiftyGif (5.4.3) DEPENDENCIES: + - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) + - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) SPEC REPOS: trunk: + - DKImagePickerController + - DKPhotoGallery - OrderedSet + - SDWebImage + - SwiftyGif EXTERNAL SOURCES: + file_picker: + :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter flutter_inappwebview: :path: ".symlinks/plugins/flutter_inappwebview/ios" + flutter_keyboard_visibility: + :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac + DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 + file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95 + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 + flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c + SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 + SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c -COCOAPODS: 1.10.0.beta.2 +COCOAPODS: 1.11.3 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index bc616886..85c7811a 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..3db53b6e 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/example/pubspec.lock b/example/pubspec.lock index 7a6366a1..97ccf694 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -96,7 +96,7 @@ packages: name: flutter_keyboard_visibility url: "https://pub.dartlang.org" source: hosted - version: "5.2.0" + version: "5.3.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index 0d723d44..7d41d2d4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -89,7 +89,7 @@ packages: name: flutter_keyboard_visibility url: "https://pub.dartlang.org" source: hosted - version: "5.2.0" + version: "5.3.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: @@ -190,7 +190,7 @@ packages: name: pointer_interceptor url: "https://pub.dartlang.org" source: hosted - version: "0.9.1" + version: "0.9.3+2" sky_engine: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 261360ff..37ef68a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: visibility_detector: ^0.3.3 # plugin to get when the keyboard is hidden via back (Android) # or "done" (iOS) to reset the editor's height - flutter_keyboard_visibility: ^5.2.0 + flutter_keyboard_visibility: ^5.3.0 # plugin to show a color picker for foreground/highlight color flex_color_picker: ^2.5.0 # plugin to get files from filesystem @@ -27,7 +27,7 @@ dependencies: # plugin to allow dropdowns and dialogs to be interactable when displaying over the editor # related to https://github.com/flutter/flutter/issues/54027 # pinned to 0.9.1 because of issues with CanvasKit in the latest versions - pointer_interceptor: ^0.9.1 + pointer_interceptor: ^0.9.3+2 # plugin to help maintain effective Dart standards pedantic: ^1.11.1 # plugin for @internal annotation From 0830faa9196b9b64996c25cc7e9156cfbfb840ad Mon Sep 17 00:00:00 2001 From: Kimman Date: Wed, 5 Oct 2022 11:31:02 +0800 Subject: [PATCH 03/12] upgrade dependencies and example to support flutter 3 and android sdk 33 --- example/android/app/build.gradle | 4 +- .../android/app/src/main/AndroidManifest.xml | 3 +- example/pubspec.lock | 62 +++++++++---------- lib/src/widgets/toolbar_widget.dart | 10 +-- pubspec.lock | 37 +++++------ pubspec.yaml | 2 +- 6 files changed, 56 insertions(+), 62 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 6e0d18ea..1eb3074f 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdkVersion 33 aaptOptions { noCompress 'html', 'txt' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.tanayneotia.html_editor_enhanced_example" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index f56c80bc..42e226ec 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -24,7 +24,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true">