Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get new version #1

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
7bc42e1
:bug: (misc) WidgetsBinding null-aware operation
May 18, 2022
261b17c
Merge pull request #258 from Cteq3132/master
tneotia May 19, 2022
d38ae4e
Run dart format
tneotia Jun 4, 2022
9559cbf
Update dependencies
tneotia Jun 4, 2022
8659150
Fix more warnings
tneotia Jun 4, 2022
d0a93e7
Pin pointer interceptor to 0.9.1
tneotia Jun 4, 2022
92d2e45
Remove some fonts
tneotia Jun 4, 2022
32a2a33
Merge remote-tracking branch 'origin/master'
tneotia Jun 4, 2022
0e712ff
Release v2.5.0
tneotia Jun 4, 2022
f248124
Fix pub publish error
tneotia Jun 4, 2022
4d5575a
Bump version kotlin and compile SDK
opimand Jun 22, 2022
e8d8690
Merge pull request #274 from opimand/fix-mobile-defaults
tneotia Jun 22, 2022
263d3db
Updated file_picker to 5.0.1.
ksilz Aug 8, 2022
01115f8
Bumped two other dependencies.
ksilz Aug 8, 2022
0830faa
upgrade dependencies and example to support flutter 3 and android sdk 33
kimmanwky Oct 5, 2022
d72d871
Updated pubs and replaced duplicated codes.
altotunchitoo Oct 6, 2022
7c77867
Merge pull request #299 from ksilz/master
tneotia Oct 19, 2022
51a8710
Merge branch 'master' into master
kimmanwky Oct 19, 2022
980d968
Merge pull request #328 from kimmanwky/master
tneotia Oct 19, 2022
d3fc2b9
Merge branch 'master' into master
altotunchitoo Oct 20, 2022
86f3e2a
Merge pull request #330 from altotunchitoo/master
tneotia Oct 20, 2022
6343ef5
bugfixed pubspec.yaml file references to files incorrect (which fails…
Dec 19, 2022
11c357a
bugfixed pubspec.yaml file references to files incorrect (which fails…
Dec 19, 2022
98d6f18
bug fix for "No file or variants found for asset: packages/html_edito…
kimmanwky Dec 21, 2022
a1b848e
Merge pull request #369 from eliudio/master
tneotia Jan 25, 2023
af25516
Merge pull request #370 from kimmanwky/master
tneotia Jan 25, 2023
74e671c
Update dependencies apart from file picker
tneotia Jan 25, 2023
2ec50bc
Version bump 2.5.1
tneotia Jan 25, 2023
e998658
Update changelog
tneotia Jan 25, 2023
4325336
Allow disabling the upload of images taken from the device
TheCarpetMerchant Jan 28, 2023
45f407a
Allow disabling the upload of images taken from the device - edited e…
TheCarpetMerchant Jan 28, 2023
8e2b99c
Change allowImagePicking comment
TheCarpetMerchant Mar 2, 2023
90bf8a8
Merge pull request #380 from TheCarpetMerchant/master
tneotia Mar 5, 2023
a4a2805
fix 'bad state: no element' exception
sstasi95 Sep 11, 2023
68d8c89
updates for flutter v3.22.0
SteveShaw9899 May 15, 2024
50c2345
Merge pull request #510 from carmigo/flutter-upgrade-to-v3.22.0
tneotia May 18, 2024
af16313
Merge pull request #451 from sstasi95/master
tneotia May 18, 2024
4fcc4c4
Update dependencies and remove most deprecations
tneotia May 18, 2024
83dc07d
Update changelog and version
tneotia May 18, 2024
4159aad
Fix a few more warnings before publish
tneotia May 18, 2024
4980e84
Oopsie in changelog
tneotia May 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
.pub/

build/
.flutter-plugins
.flutter-plugins-dependencies
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
## [2.6.0] = 2024-05-18
* Fix build issues on Flutter 3.22.0+ due to deprecations
* Update dependencies
* Fix bad state error when checking height of editor

## [2.5.1] = 2023-01-25
* Fix build issues on Flutter 3.4.0+ due to assets directory
* Update dependencies

## [2.5.0] - 2022-06-04
* Support Flutter 3.0 (remove warnings) (@Cteq3132)
* [BREAKING] Support modifying `foreColorSelected` and `backColorSelected` when using a custom dialog for font coloring
* If you are using a custom `updateStatus` function for the font coloring, that function is now defined as `updateStatus(Color)`
* Added `disabled` parameter to automatically disable editor on initial load
* Fixed white background color appearing sometimes when pressing backspace on text
* Added `useHybridComposition` parameter in case devs want to disable this behavior (improves animations of app)
* [WEB] Fixed editor height being 0 when `initialText` is `null` (@dab246)
* Migrated example to Android embedding V2
* Removed woff fonts to allow iOS App Store submissions

## [2.4.0] - 2021-10-30
* Improved color picker
* Added scrollable support to picker
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ More is on the way! File a feature request or contribute to the project if you'd

## Setup

Add `html_editor_enhanced: ^2.4.0` as dependency to your pubspec.yaml.
Add `html_editor_enhanced: ^2.5.0` as dependency to your pubspec.yaml.

Make sure to declare internet support inside `AndroidManifest.xml`: `<uses-permission android:name="android.permission.INTERNET"/>`

Expand Down
1 change: 0 additions & 1 deletion analysis_options.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 33

aaptOptions {
noCompress 'html', 'txt'
Expand All @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.6.10'
repositories {
google()
jcenter()
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<string>9.0</string>
</dict>
</plist>
60 changes: 58 additions & 2 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1020;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions example/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
</dict>
</plist>
34 changes: 22 additions & 12 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
htmlToolbarOptions: HtmlToolbarOptions(
toolbarPosition: ToolbarPosition.aboveEditor, //by default
toolbarType: ToolbarType.nativeScrollable, //by default
onButtonPressed: (ButtonType type, bool? status,
Function? updateStatus) {
onButtonPressed:
(ButtonType type, bool? status, Function? updateStatus) {
print(
"button '${describeEnum(type)}' pressed, the current selected status is $status");
return true;
Expand Down Expand Up @@ -206,7 +206,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
var txt = await controller.getText();
if (txt.contains('src=\"data:')) {
Expand All @@ -227,7 +228,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () {
controller.redo();
},
Expand Down Expand Up @@ -262,7 +264,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
controller.enable();
},
Expand All @@ -282,7 +285,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
children: <Widget>[
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () {
controller.insertText('Google');
},
Expand All @@ -294,7 +298,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () {
controller.insertHtml(
'''<p style="color: blue">Google in blue</p>''');
Expand All @@ -312,7 +317,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
children: <Widget>[
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
controller.insertLink(
'Google linked', 'https://google.com', true);
Expand All @@ -327,7 +333,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () {
controller.insertNetworkImage(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_92x30dp.png',
Expand Down Expand Up @@ -375,7 +382,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
controller.addNotification(
'Success notification', NotificationType.success);
Expand All @@ -390,7 +398,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () {
controller.addNotification(
'Danger notification', NotificationType.danger);
Expand Down Expand Up @@ -424,7 +433,8 @@ class _HtmlEditorExampleState extends State<HtmlEditorExample> {
),
TextButton(
style: TextButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary),
backgroundColor:
Theme.of(context).colorScheme.secondary),
onPressed: () async {
controller.removeNotification();
},
Expand Down
Loading