Skip to content

Commit 308a2ff

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 9244b32 + bc35ac1 commit 308a2ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1174
-922
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@
44

55
All notable changes to this project will be documented in this file.
66

7+
## 10.6.0
8+
9+
* docs: cleanup the docs, remove outdated resources, general changes by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2227
10+
* Feat: customizable character and space shortcut events by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2228
11+
12+
13+
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.19...v10.6.0
14+
15+
## 10.5.19
16+
17+
* fix: properties other than 'style' for custom inline code styles (such as 'backgroundColor') were not being applied correctly by @agata in https://github.com/singerdmx/flutter-quill/pull/2226
18+
19+
20+
**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.18...v10.5.19
21+
722
## 10.5.18
823

924
* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009

CHANGELOG_DATA.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"10.6.0": "* docs: cleanup the docs, remove outdated resources, general changes by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2227\r\n* Feat: customizable character and space shortcut events by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2228\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.19...v10.6.0",
3+
"10.5.19": "* fix: properties other than 'style' for custom inline code styles (such as 'backgroundColor') were not being applied correctly by @agata in https://github.com/singerdmx/flutter-quill/pull/2226\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.18...v10.5.19",
24
"10.5.18": "* feat(web): rich text paste from Clipboard using HTML by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2009\r\n* revert: disable rich text paste feature on web as a workaround by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2221\r\n* refactor: moved shortcuts and onKeyEvents to its own file by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2223\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.17...v10.5.18",
35
"10.5.17": "* feat(l10n): localize all untranslated.json by @erdnx in https://github.com/singerdmx/flutter-quill/pull/2217\r\n* Fix: Block Attributes are not displayed if the editor is empty by @CatHood0 in https://github.com/singerdmx/flutter-quill/pull/2210\r\n\r\n## New Contributors\r\n* @erdnx made their first contribution in https://github.com/singerdmx/flutter-quill/pull/2217\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.16...v10.5.17",
46
"10.5.16": "* chore: remove device_info_plus and add quill_native_bridge to access platform specific APIs by @EchoEllet in https://github.com/singerdmx/flutter-quill/pull/2194\r\n* Not show/update/hiden mangnifier when manifier config is disbale by @demoYang in https://github.com/singerdmx/flutter-quill/pull/2212\r\n\r\n\r\n**Full Changelog**: https://github.com/singerdmx/flutter-quill/compare/v10.5.14...v10.5.16",

CONTRIBUTING.md

Lines changed: 35 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,34 @@
1-
# Contributing
1+
# 🌱 Contributing
22

3-
First of all, we would like to thank you for your time and efforts on this project, we appreciate it
4-
5-
You can see tutorials online on how to contribute to any open source project, it's a simple process, and you can do it
6-
even if you are not Git expert, simply start by forking the repository, clone it, create a new branch, make your
7-
changes and commit them, then push the branch to your fork, and you will get link to send a PR to the upstream
8-
repository
3+
First, we would like to thank you for your time and efforts on this project, we appreciate it
94

105
If you don't have anything specific in mind to improve or fix, you can take a look at the issues tab or take a look at
11-
the todos of the project, they all start with `TODO:` so you can search in your IDE or use the todos tab in the IDE
12-
13-
You can also check the [Todo](./doc/todo.md) list or the issues if you want to
6+
the todos of the project, they all start with `TODO:` so you can search in your IDE or use the todos tab in the IDE.
147

158
> Make sure to not edit the `CHANGELOG.md` or the version in `pubspec.yaml` for any of the packages, CI will automate
169
> this process.
1710
18-
## Requirements
11+
## 📋 Development Prerequisites
1912

2013
- [Flutter SDK](https://docs.flutter.dev/get-started/install), which can be installed by following the instructions the
2114
provided link, also make sure to add it to your path so `flutter --version` and `dart --version` work
2215
- [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/)
2316
or [Android Studio](https://developer.android.com/studio) (with Dart and Flutter plugins) or
2417
use [VS Code](https://code.visualstudio.com/) (with Dart and flutter extensions)
2518

26-
## Test your changes 🧪
19+
## 🧪 Test your changes
2720

28-
Make sure you have the [Requirement](#requirements) installed and configured correctly
21+
Make sure you have the [Requirement](#-development-prerequisites) installed and configured correctly
2922

3023
To test your changes:
3124

3225
1. Go to the [Example project](./example/) in [main.dart](./example/lib/main.dart) and run the project either by using
3326
your IDE or `flutter run`
34-
2. Make sure to read the [Development Notes](./doc/development_notes.md) if you made certain changes
27+
2. Make sure to read the [Development Notes](#development-notes) if you made certain changes
3528
or [Translations Page](./doc/translation.md) if you made changes to the translations of the package
3629

37-
## Steps to contributing
38-
39-
You will need a GitHub account as well as Git installed and configured with your GitHub account on your machine
40-
41-
1. Fork the repository in GitHub
42-
2. clone the forked repository using `git`
43-
3. Add the `upstream` repository using:
44-
```
45-
git remote add upstream [email protected]:singerdmx/flutter-quill.git
46-
```
47-
4. Open the project with your favorite IDE, usually, we prefer to use Jetbrains IDEs, but
48-
since [VS Code](https://code.visualstudio.com) is more used and has more support for Dart, then we suggest using it
49-
if you want to.
50-
5. Create a new git branch and switch to it using `git checkout -b`
51-
6. Make your changes
52-
7. If you are working on changes that depend on different libraries in the same repo, then in that directory
53-
copy `pubspec_overrides.yaml.disabled` which exists in all the packages (`flutter_quill_test`
54-
and `flutter_quill_extensions` etc...)
55-
to `pubspec_overrides.yaml` which will be ignored by `.gitignore` and will be used by dart pub to override the
56-
libraries
57-
```
58-
cp pubspec_overrides.yaml.disabled pubspec_overrides.yaml
59-
```
60-
or save some time with the following script:
61-
```
62-
dart ./scripts/enable_local_dev.dart
63-
```
64-
8. Test them in the [example](./example) and add changes in there if necessary
65-
9. Run the following script if possible
66-
```shell
67-
dart ./scripts/before_push.dart
68-
```
69-
10. When you are done sending your pull request, run:
70-
```
71-
git add .
72-
git commit -m "Your commit message"
73-
git push origin <your-branch-name>
74-
```
75-
this will push the new branch to your forked repository
76-
77-
11. Now you can send your pull request either by following the link that you will get in the command line or open your
78-
forked repository. You will find an option to send the pull request, you can also
79-
open the [Pull Requests](https://github.com/singerdmx/flutter-quill) tab and send new pull request
80-
81-
12. Now, wait for the review, and we might ask you to make more changes, then run:
82-
83-
```
84-
git add .
85-
git commit -m "Your new commit message"
86-
git push origin your-branch-name
87-
```
88-
89-
Thank you for your time and efforts in open-source projects!!
90-
9130
## Guidelines 📝
9231

93-
<!-- TODO: Update the guidelines -->
94-
9532
1. **Code Style and Formatting**:
9633

9734
Adhere to the Dart Coding Conventions (https://dart.dev/effective-dart).
@@ -117,20 +54,41 @@ Thank you for your time and efforts in open-source projects!!
11754
Use pull requests and code reviews to discuss proposed changes and improvements.
11855
6. **Versioning and Releases**:
11956

120-
Try to follow semantic versioning for releases (https://semver.org/) when possible.
57+
Follow semantic versioning for releases (https://semver.org/).
12158
Clearly document release notes and changes for each version.
122-
Please notice for now we might introduce breaking changes in non-major version but will always provide migration
123-
guide in each release info and in [Migration guide](./doc/migration.md)
59+
60+
For now, we might introduce breaking changes in a non-major version but will always provide a migration
61+
guide in each release info.
12462
7. **Consistency**:
12563

126-
Adhere to a consistent coding style throughout the project for improves readability and maintainability
64+
Adhere to a consistent coding style throughout the project for improvement readability and maintainability
12765
8. **Meaningful Names**:
12866

12967
Use descriptive variable, class, and function names that clearly convey their purpose.
13068
9. **Testing**:
13169

13270
Try to write tests (Widget or Unit tests or other types or tests) when possible
13371

134-
## Development Notes
135-
136-
Please read the [Development Notes](./doc/development_notes.md) as they might be important while development
72+
## 📝 Development Notes
73+
74+
- When updating the translations or localizations in the app, please take a look at the [Translation](./translation.md)
75+
page as it has important notes to work.
76+
If you also add a feature that adds new localizations, then you need it
77+
to the instructions of it in order for the translations to take effect
78+
- We use the same package version and `CHANGELOG.md` for all the packages, for
79+
more [details](https://github.com/singerdmx/flutter-quill/pull/1878), the process is automated. We have a script that
80+
will do the following:
81+
1. Generate the `CHANGELOG.md` files by `CHANGELOG_JSON.json` (source of data) and then paste them into all the
82+
packages we have (overwrite), you don't need to
83+
manually change/update any of the mentioned files above, once a new GitHub release published, the CI will take
84+
the release notes from the release, pass the info to the
85+
script, the release notes can be auto-generated by GitHub using a button, a descriptive PRs title would help but
86+
you don't have to since we can change it at any time.
87+
2. The script require the new version as an argument, you don't need to run the script manually, when a maintainer
88+
create a new tag and publish a new GitHub release, the publishing workflow will extract the new version from the
89+
tag
90+
name, run the script (pass the extracted version as an argument), commit the changes and push them into the
91+
repository, the script will update the `version` property for all the packages so the `flutter pub publish` will
92+
use the new version for each package correctly.
93+
94+
the script will be used the CI and no need to run it manually

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Will Yao
3+
Copyright (c) 2024 Flutter Quill project and open source contributors.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)