From bb393d3f765e61059dcf913fc2ee90a9eb6ef7e5 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 11 Jan 2024 17:23:24 +0000 Subject: [PATCH] fix dependency violation --- .github/workflows/merge.yml | 92 +++++++------------ .github/workflows/pr.yml | 4 +- .github/workflows/release.yml | 31 +++++++ .pubignore | 2 +- CHANGELOG.md | 29 ++++++ .../ApplicationResources_ar_SA.json | 0 .../ApplicationResources_bg_BG.json | 0 .../ApplicationResources_bs_BA.json | 0 .../ApplicationResources_cs_CZ.json | 0 .../ApplicationResources_da_DK.json | 0 .../ApplicationResources_de_AT.json | 0 .../ApplicationResources_de_BE.json | 0 .../ApplicationResources_de_CH.json | 0 .../ApplicationResources_de_DE.json | 0 .../ApplicationResources_el_GR.json | 0 .../ApplicationResources_en_CA.json | 0 .../ApplicationResources_en_GB.json | 0 .../ApplicationResources_en_US.json | 0 .../ApplicationResources_es_CL.json | 0 .../ApplicationResources_es_EC.json | 0 .../ApplicationResources_es_ES.json | 0 .../ApplicationResources_es_MX.json | 0 .../ApplicationResources_es_PE.json | 0 .../ApplicationResources_es_PR.json | 0 .../ApplicationResources_es_UY.json | 0 .../ApplicationResources_fi_FI.json | 0 .../ApplicationResources_fr_BE.json | 0 .../ApplicationResources_fr_CA.json | 0 .../ApplicationResources_fr_CH.json | 0 .../ApplicationResources_fr_FR.json | 0 .../ApplicationResources_hr_HR.json | 0 .../ApplicationResources_hu_HU.json | 0 .../ApplicationResources_in_ID.json | 0 .../ApplicationResources_it_IT.json | 0 .../ApplicationResources_ja_JP.json | 0 .../ApplicationResources_ka_GE.json | 0 .../ApplicationResources_ko_KR.json | 0 .../ApplicationResources_lt_LT.json | 0 .../ApplicationResources_lv_LV.json | 0 .../ApplicationResources_mk_MK.json | 0 .../ApplicationResources_nb_NO.json | 0 .../ApplicationResources_nl_NL.json | 0 .../ApplicationResources_pl_PL.json | 0 .../ApplicationResources_pt_BR.json | 0 .../ApplicationResources_pt_PT.json | 0 .../ApplicationResources_ro_RO.json | 0 .../ApplicationResources_ru_RU.json | 0 .../ApplicationResources_sk_SK.json | 0 .../ApplicationResources_sl_SI.json | 0 .../ApplicationResources_sq_AL.json | 0 .../ApplicationResources_sr_BA.json | 0 .../ApplicationResources_sv_SE.json | 0 .../ApplicationResources_th_TH.json | 0 .../ApplicationResources_tl_PH.json | 0 .../ApplicationResources_tr_TR.json | 0 .../ApplicationResources_uk_UK.json | 0 .../ApplicationResources_vi_VN.json | 0 .../ApplicationResources_zh_CN.json | 0 .../ApplicationResources_zh_HK.json | 0 example/.gitignore | 1 - example/lib/pages/quill_editor_demo.dart | 80 ---------------- example/pubspec.yaml | 2 +- example/web/index.html | 6 +- pubspec.yaml | 4 +- 64 files changed, 103 insertions(+), 148 deletions(-) create mode 100644 .github/workflows/release.yml rename {localizations => _localizations}/ApplicationResources_ar_SA.json (100%) rename {localizations => _localizations}/ApplicationResources_bg_BG.json (100%) rename {localizations => _localizations}/ApplicationResources_bs_BA.json (100%) rename {localizations => _localizations}/ApplicationResources_cs_CZ.json (100%) rename {localizations => _localizations}/ApplicationResources_da_DK.json (100%) rename {localizations => _localizations}/ApplicationResources_de_AT.json (100%) rename {localizations => _localizations}/ApplicationResources_de_BE.json (100%) rename {localizations => _localizations}/ApplicationResources_de_CH.json (100%) rename {localizations => _localizations}/ApplicationResources_de_DE.json (100%) rename {localizations => _localizations}/ApplicationResources_el_GR.json (100%) rename {localizations => _localizations}/ApplicationResources_en_CA.json (100%) rename {localizations => _localizations}/ApplicationResources_en_GB.json (100%) rename {localizations => _localizations}/ApplicationResources_en_US.json (100%) rename {localizations => _localizations}/ApplicationResources_es_CL.json (100%) rename {localizations => _localizations}/ApplicationResources_es_EC.json (100%) rename {localizations => _localizations}/ApplicationResources_es_ES.json (100%) rename {localizations => _localizations}/ApplicationResources_es_MX.json (100%) rename {localizations => _localizations}/ApplicationResources_es_PE.json (100%) rename {localizations => _localizations}/ApplicationResources_es_PR.json (100%) rename {localizations => _localizations}/ApplicationResources_es_UY.json (100%) rename {localizations => _localizations}/ApplicationResources_fi_FI.json (100%) rename {localizations => _localizations}/ApplicationResources_fr_BE.json (100%) rename {localizations => _localizations}/ApplicationResources_fr_CA.json (100%) rename {localizations => _localizations}/ApplicationResources_fr_CH.json (100%) rename {localizations => _localizations}/ApplicationResources_fr_FR.json (100%) rename {localizations => _localizations}/ApplicationResources_hr_HR.json (100%) rename {localizations => _localizations}/ApplicationResources_hu_HU.json (100%) rename {localizations => _localizations}/ApplicationResources_in_ID.json (100%) rename {localizations => _localizations}/ApplicationResources_it_IT.json (100%) rename {localizations => _localizations}/ApplicationResources_ja_JP.json (100%) rename {localizations => _localizations}/ApplicationResources_ka_GE.json (100%) rename {localizations => _localizations}/ApplicationResources_ko_KR.json (100%) rename {localizations => _localizations}/ApplicationResources_lt_LT.json (100%) rename {localizations => _localizations}/ApplicationResources_lv_LV.json (100%) rename {localizations => _localizations}/ApplicationResources_mk_MK.json (100%) rename {localizations => _localizations}/ApplicationResources_nb_NO.json (100%) rename {localizations => _localizations}/ApplicationResources_nl_NL.json (100%) rename {localizations => _localizations}/ApplicationResources_pl_PL.json (100%) rename {localizations => _localizations}/ApplicationResources_pt_BR.json (100%) rename {localizations => _localizations}/ApplicationResources_pt_PT.json (100%) rename {localizations => _localizations}/ApplicationResources_ro_RO.json (100%) rename {localizations => _localizations}/ApplicationResources_ru_RU.json (100%) rename {localizations => _localizations}/ApplicationResources_sk_SK.json (100%) rename {localizations => _localizations}/ApplicationResources_sl_SI.json (100%) rename {localizations => _localizations}/ApplicationResources_sq_AL.json (100%) rename {localizations => _localizations}/ApplicationResources_sr_BA.json (100%) rename {localizations => _localizations}/ApplicationResources_sv_SE.json (100%) rename {localizations => _localizations}/ApplicationResources_th_TH.json (100%) rename {localizations => _localizations}/ApplicationResources_tl_PH.json (100%) rename {localizations => _localizations}/ApplicationResources_tr_TR.json (100%) rename {localizations => _localizations}/ApplicationResources_uk_UK.json (100%) rename {localizations => _localizations}/ApplicationResources_vi_VN.json (100%) rename {localizations => _localizations}/ApplicationResources_zh_CN.json (100%) rename {localizations => _localizations}/ApplicationResources_zh_HK.json (100%) delete mode 100644 example/lib/pages/quill_editor_demo.dart diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f1c2019..2427f96 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,34 +1,33 @@ name: "Merge" on: + push: pull_request: types: [closed] + branches: + - main jobs: changes: runs-on: ubuntu-latest timeout-minutes: 5 + outputs: + any_changed: ${{ steps.changed-files.outputs.all_changed_files_count }} if: github.event.pull_request.merged steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Get all changed *.dart, files in docs or pubspec.yaml id: changed-files - uses: tj-actions/changed-files@v37 - with: - base_sha: ${{ github.event.pull_request.base.sha }} - sha: ${{ github.event.pull_request.head.sha }} - files: | - **/*.dart - pubspec.yaml - merge: + uses: tj-actions/changed-files@v41 + bump_and_tag: runs-on: ubuntu-latest timeout-minutes: 20 needs: changes - if: needs.changes.outputs.files == 'true' + if: needs.changes.outputs.any_changed != '0' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.head_ref }} @@ -38,15 +37,7 @@ jobs: run: dart pub global activate cider - name: Change flutter version tag run: | - echo "FLUTTER_BUILD_VERSION=$(cider bump patch --bump-build)" >> "$GITHUB_ENV" - - name: Update CHANGELOG - id: changelog - uses: requarks/changelog-action@v1 - with: - token: ${{ secrets.PAT }} - tag: ${{ steps.read-version.outputs.version-number }} - excludeTypes: "" - includeInvalidCommits: true + echo "FLUTTER_BUILD_VERSION=$(cider bump patch)" >> "$GITHUB_ENV" - name: Update id: update run: | @@ -55,48 +46,29 @@ jobs: git add -A git commit --amend --no-edit git push -f - echo "newSha=$(git rev-parse ${{github.event.pull_request.head.sha}})" >> $GITHUB_ENV + echo "newSha=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Create tag - uses: actions/github-script@v6 + id: tag + uses: mathieudutour/github-tag-action@v6.1 with: - script: | - github.rest.git.createRef({ - owner: context.repo.owner, - repo: context.repo.repo, - ref: 'refs/tags/${{env.FLUTTER_BUILD_VERSION}}', - sha: "${{env.newSha}}" - }) - - name: release - uses: actions/github-script@v5 - if: ${{ (steps.bump.outputs.release == 'true') && (env.modified == 'true') }} - with: - script: | - github.rest.repos.createRelease({ - draft: false, - generate_release_notes: true, - name: "${{steps.bump.outputs.version}}", - owner: context.repo.owner, - prerelease: false, - repo: context.repo.repo, - tag_name: "${{steps.bump.outputs.version}}", - }); - build_and_deploy: - if: github.event.pull_request.merged - runs-on: ubuntu-latest - needs: merge - steps: - - uses: actions/checkout@v3 - - uses: subosito/flutter-action@v2 + github_token: ${{ secrets.GITHUB_TOKEN }} + custom_tag: ${{env.FLUTTER_BUILD_VERSION}} + tag_prefix: "" + - name: Update CHANGELOG + id: changelog + uses: requarks/changelog-action@v1 with: - flutter-version: "3.13.x" - channel: "stable" - - name: Setup flutter - run: flutter pub get - - name: build + token: ${{ github.token }} + tag: ${{env.FLUTTER_BUILD_VERSION}} + excludeTypes: "" + includeInvalidCommits: true + - name: Push changelog run: | - cd example - flutter build web -o ../build --no-tree-shake-icons --base-href "/zds_flutter/" - - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4 + git add . + git commit --amend --no-edit + git push -f + - name: Release + uses: softprops/action-gh-release@v1 with: - folder: build + body: "https://pub.dev/packages/zds_flutter/versions/${{env.FLUTTER_BUILD_VERSION}}" + tag_name: ${{env.FLUTTER_BUILD_VERSION}} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8018333..6854f68 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: outputs: files: ${{steps.changed-files.outputs.any_changed}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} @@ -40,7 +40,7 @@ jobs: needs: changes if: needs.changes.outputs.files == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: ${{ github.head_ref }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a07980a --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,31 @@ +# name: "Release" + +# on: +# push: +# # tags: +# # - "**"±TODO: + +# jobs: +# build_and_deploy: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - uses: subosito/flutter-action@v2 +# with: +# flutter-version: "3.13.x" +# channel: "stable" +# - name: Setup flutter +# run: flutter pub get +# - name: build +# run: | +# cd example +# flutter build web -o ../build --no-tree-shake-icons --base-href "/zds_flutter/" +# - name: Deploy +# uses: JamesIves/github-pages-deploy-action@v4 +# with: +# folder: build +# - name: Publish +# run: | +# dart format . +# dart fix --apply +# dart pub publish diff --git a/.pubignore b/.pubignore index 878966e..a355fc4 100644 --- a/.pubignore +++ b/.pubignore @@ -1,3 +1,3 @@ test/ build/ -localizations/ \ No newline at end of file +_localizations/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b313e..4c0fe27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +## [1.0.3] - 2024-01-11 +### :flying_saucer: Other Changes +- [`23fd937`](https://github.com/ZebraDevs/zds_flutter/commit/23fd93762d4efb1ba31292a9c68818581b357d6e) - Add all changes from v1.0.0 internal *(PR [#2](https://github.com/ZebraDevs/zds_flutter/pull/2) by [@thelukewalton](https://github.com/thelukewalton))* +- [`d736ecd`](https://github.com/ZebraDevs/zds_flutter/commit/d736ecdb10f1edbb5e0afed004c3583701c8ea3c) - Update to latest version of flu/tter and update InAppWebView *(commit by [@thelukewalton](https://github.com/thelukewalton))* +- [`6862ac0`](https://github.com/ZebraDevs/zds_flutter/commit/6862ac0811773e6adc4bf6aa1b1901e404eb6b2e) - actions *(commit by [@thelukewalton](https://github.com/thelukewalton))* +- [`531d0d9`](https://github.com/ZebraDevs/zds_flutter/commit/531d0d950ef025961456866c59e3013b8b5d706f) - actions *(commit by [@thelukewalton](https://github.com/thelukewalton))* +- [`88db187`](https://github.com/ZebraDevs/zds_flutter/commit/88db187d791efc8458e4b572e68318d2f8099831) - Fix pupignore *(commit by [@thelukewalton](https://github.com/thelukewalton))* +- [`cfe31db`](https://github.com/ZebraDevs/zds_flutter/commit/cfe31db202f1b843fca246cf705b384d17b0b1ff) - quill update part 1 *(commit by [@thelukewalton](https://github.com/thelukewalton))* +- [`805ba4d`](https://github.com/ZebraDevs/zds_flutter/commit/805ba4d693e1c6ae80d5d8d96dc19c2bb8942c25) - Merge branch 'bug/publish-bugs' of https://github.com/ZebraDevs/zds_flutter into bug/publish-bugs *(commit by [@thelukewalton](https://github.com/thelukewalton))* + + +## [1.0.2] - 2024-01-03 + +### :flying_saucer: Other Changes + +- [`6862ac0`](https://github.com/ZebraDevs/zds_flutter/commit/6862ac0811773e6adc4bf6aa1b1901e404eb6b2e) - actions _(commit by [@thelukewalton](https://github.com/thelukewalton))_ + +## [1.0.1] - 2024-01-03 + +### :flying_saucer: Other Changes + +- [`e8628a1`](https://github.com/ZebraDevs/zds_flutter/commit/e8628a1a8cf76ada08a64a0312c1f7efd23c6cd5) - actions _(commit by [@thelukewalton](https://github.com/thelukewalton))_ + ## [1.0.0] - 2024-01-02 ### :sparkles: New features @@ -9,3 +32,9 @@ ### :sparkles: New Features - [`885fa19`](https://github.com/zebradevs/zds-flutter/commit/885fa19d4d0ec4426a259b61cb828b6c9fac175e) - init. _(commit by [@thelukewalton](https://github.com/thelukewalton))_ + +[1.0.1]: https://github.com/ZebraDevs/zds_flutter/compare/v1.0.2...1.0.1 +[1.0.1]: https://github.com/ZebraDevs/zds_flutter/compare/v1.0.2...1.0.1 +[1.0.2]: https://github.com/ZebraDevs/zds_flutter/compare/1.0.1...1.0.2 + +[1.0.3]: https://github.com/ZebraDevs/zds_flutter/compare/1.0.0...1.0.3 \ No newline at end of file diff --git a/localizations/ApplicationResources_ar_SA.json b/_localizations/ApplicationResources_ar_SA.json similarity index 100% rename from localizations/ApplicationResources_ar_SA.json rename to _localizations/ApplicationResources_ar_SA.json diff --git a/localizations/ApplicationResources_bg_BG.json b/_localizations/ApplicationResources_bg_BG.json similarity index 100% rename from localizations/ApplicationResources_bg_BG.json rename to _localizations/ApplicationResources_bg_BG.json diff --git a/localizations/ApplicationResources_bs_BA.json b/_localizations/ApplicationResources_bs_BA.json similarity index 100% rename from localizations/ApplicationResources_bs_BA.json rename to _localizations/ApplicationResources_bs_BA.json diff --git a/localizations/ApplicationResources_cs_CZ.json b/_localizations/ApplicationResources_cs_CZ.json similarity index 100% rename from localizations/ApplicationResources_cs_CZ.json rename to _localizations/ApplicationResources_cs_CZ.json diff --git a/localizations/ApplicationResources_da_DK.json b/_localizations/ApplicationResources_da_DK.json similarity index 100% rename from localizations/ApplicationResources_da_DK.json rename to _localizations/ApplicationResources_da_DK.json diff --git a/localizations/ApplicationResources_de_AT.json b/_localizations/ApplicationResources_de_AT.json similarity index 100% rename from localizations/ApplicationResources_de_AT.json rename to _localizations/ApplicationResources_de_AT.json diff --git a/localizations/ApplicationResources_de_BE.json b/_localizations/ApplicationResources_de_BE.json similarity index 100% rename from localizations/ApplicationResources_de_BE.json rename to _localizations/ApplicationResources_de_BE.json diff --git a/localizations/ApplicationResources_de_CH.json b/_localizations/ApplicationResources_de_CH.json similarity index 100% rename from localizations/ApplicationResources_de_CH.json rename to _localizations/ApplicationResources_de_CH.json diff --git a/localizations/ApplicationResources_de_DE.json b/_localizations/ApplicationResources_de_DE.json similarity index 100% rename from localizations/ApplicationResources_de_DE.json rename to _localizations/ApplicationResources_de_DE.json diff --git a/localizations/ApplicationResources_el_GR.json b/_localizations/ApplicationResources_el_GR.json similarity index 100% rename from localizations/ApplicationResources_el_GR.json rename to _localizations/ApplicationResources_el_GR.json diff --git a/localizations/ApplicationResources_en_CA.json b/_localizations/ApplicationResources_en_CA.json similarity index 100% rename from localizations/ApplicationResources_en_CA.json rename to _localizations/ApplicationResources_en_CA.json diff --git a/localizations/ApplicationResources_en_GB.json b/_localizations/ApplicationResources_en_GB.json similarity index 100% rename from localizations/ApplicationResources_en_GB.json rename to _localizations/ApplicationResources_en_GB.json diff --git a/localizations/ApplicationResources_en_US.json b/_localizations/ApplicationResources_en_US.json similarity index 100% rename from localizations/ApplicationResources_en_US.json rename to _localizations/ApplicationResources_en_US.json diff --git a/localizations/ApplicationResources_es_CL.json b/_localizations/ApplicationResources_es_CL.json similarity index 100% rename from localizations/ApplicationResources_es_CL.json rename to _localizations/ApplicationResources_es_CL.json diff --git a/localizations/ApplicationResources_es_EC.json b/_localizations/ApplicationResources_es_EC.json similarity index 100% rename from localizations/ApplicationResources_es_EC.json rename to _localizations/ApplicationResources_es_EC.json diff --git a/localizations/ApplicationResources_es_ES.json b/_localizations/ApplicationResources_es_ES.json similarity index 100% rename from localizations/ApplicationResources_es_ES.json rename to _localizations/ApplicationResources_es_ES.json diff --git a/localizations/ApplicationResources_es_MX.json b/_localizations/ApplicationResources_es_MX.json similarity index 100% rename from localizations/ApplicationResources_es_MX.json rename to _localizations/ApplicationResources_es_MX.json diff --git a/localizations/ApplicationResources_es_PE.json b/_localizations/ApplicationResources_es_PE.json similarity index 100% rename from localizations/ApplicationResources_es_PE.json rename to _localizations/ApplicationResources_es_PE.json diff --git a/localizations/ApplicationResources_es_PR.json b/_localizations/ApplicationResources_es_PR.json similarity index 100% rename from localizations/ApplicationResources_es_PR.json rename to _localizations/ApplicationResources_es_PR.json diff --git a/localizations/ApplicationResources_es_UY.json b/_localizations/ApplicationResources_es_UY.json similarity index 100% rename from localizations/ApplicationResources_es_UY.json rename to _localizations/ApplicationResources_es_UY.json diff --git a/localizations/ApplicationResources_fi_FI.json b/_localizations/ApplicationResources_fi_FI.json similarity index 100% rename from localizations/ApplicationResources_fi_FI.json rename to _localizations/ApplicationResources_fi_FI.json diff --git a/localizations/ApplicationResources_fr_BE.json b/_localizations/ApplicationResources_fr_BE.json similarity index 100% rename from localizations/ApplicationResources_fr_BE.json rename to _localizations/ApplicationResources_fr_BE.json diff --git a/localizations/ApplicationResources_fr_CA.json b/_localizations/ApplicationResources_fr_CA.json similarity index 100% rename from localizations/ApplicationResources_fr_CA.json rename to _localizations/ApplicationResources_fr_CA.json diff --git a/localizations/ApplicationResources_fr_CH.json b/_localizations/ApplicationResources_fr_CH.json similarity index 100% rename from localizations/ApplicationResources_fr_CH.json rename to _localizations/ApplicationResources_fr_CH.json diff --git a/localizations/ApplicationResources_fr_FR.json b/_localizations/ApplicationResources_fr_FR.json similarity index 100% rename from localizations/ApplicationResources_fr_FR.json rename to _localizations/ApplicationResources_fr_FR.json diff --git a/localizations/ApplicationResources_hr_HR.json b/_localizations/ApplicationResources_hr_HR.json similarity index 100% rename from localizations/ApplicationResources_hr_HR.json rename to _localizations/ApplicationResources_hr_HR.json diff --git a/localizations/ApplicationResources_hu_HU.json b/_localizations/ApplicationResources_hu_HU.json similarity index 100% rename from localizations/ApplicationResources_hu_HU.json rename to _localizations/ApplicationResources_hu_HU.json diff --git a/localizations/ApplicationResources_in_ID.json b/_localizations/ApplicationResources_in_ID.json similarity index 100% rename from localizations/ApplicationResources_in_ID.json rename to _localizations/ApplicationResources_in_ID.json diff --git a/localizations/ApplicationResources_it_IT.json b/_localizations/ApplicationResources_it_IT.json similarity index 100% rename from localizations/ApplicationResources_it_IT.json rename to _localizations/ApplicationResources_it_IT.json diff --git a/localizations/ApplicationResources_ja_JP.json b/_localizations/ApplicationResources_ja_JP.json similarity index 100% rename from localizations/ApplicationResources_ja_JP.json rename to _localizations/ApplicationResources_ja_JP.json diff --git a/localizations/ApplicationResources_ka_GE.json b/_localizations/ApplicationResources_ka_GE.json similarity index 100% rename from localizations/ApplicationResources_ka_GE.json rename to _localizations/ApplicationResources_ka_GE.json diff --git a/localizations/ApplicationResources_ko_KR.json b/_localizations/ApplicationResources_ko_KR.json similarity index 100% rename from localizations/ApplicationResources_ko_KR.json rename to _localizations/ApplicationResources_ko_KR.json diff --git a/localizations/ApplicationResources_lt_LT.json b/_localizations/ApplicationResources_lt_LT.json similarity index 100% rename from localizations/ApplicationResources_lt_LT.json rename to _localizations/ApplicationResources_lt_LT.json diff --git a/localizations/ApplicationResources_lv_LV.json b/_localizations/ApplicationResources_lv_LV.json similarity index 100% rename from localizations/ApplicationResources_lv_LV.json rename to _localizations/ApplicationResources_lv_LV.json diff --git a/localizations/ApplicationResources_mk_MK.json b/_localizations/ApplicationResources_mk_MK.json similarity index 100% rename from localizations/ApplicationResources_mk_MK.json rename to _localizations/ApplicationResources_mk_MK.json diff --git a/localizations/ApplicationResources_nb_NO.json b/_localizations/ApplicationResources_nb_NO.json similarity index 100% rename from localizations/ApplicationResources_nb_NO.json rename to _localizations/ApplicationResources_nb_NO.json diff --git a/localizations/ApplicationResources_nl_NL.json b/_localizations/ApplicationResources_nl_NL.json similarity index 100% rename from localizations/ApplicationResources_nl_NL.json rename to _localizations/ApplicationResources_nl_NL.json diff --git a/localizations/ApplicationResources_pl_PL.json b/_localizations/ApplicationResources_pl_PL.json similarity index 100% rename from localizations/ApplicationResources_pl_PL.json rename to _localizations/ApplicationResources_pl_PL.json diff --git a/localizations/ApplicationResources_pt_BR.json b/_localizations/ApplicationResources_pt_BR.json similarity index 100% rename from localizations/ApplicationResources_pt_BR.json rename to _localizations/ApplicationResources_pt_BR.json diff --git a/localizations/ApplicationResources_pt_PT.json b/_localizations/ApplicationResources_pt_PT.json similarity index 100% rename from localizations/ApplicationResources_pt_PT.json rename to _localizations/ApplicationResources_pt_PT.json diff --git a/localizations/ApplicationResources_ro_RO.json b/_localizations/ApplicationResources_ro_RO.json similarity index 100% rename from localizations/ApplicationResources_ro_RO.json rename to _localizations/ApplicationResources_ro_RO.json diff --git a/localizations/ApplicationResources_ru_RU.json b/_localizations/ApplicationResources_ru_RU.json similarity index 100% rename from localizations/ApplicationResources_ru_RU.json rename to _localizations/ApplicationResources_ru_RU.json diff --git a/localizations/ApplicationResources_sk_SK.json b/_localizations/ApplicationResources_sk_SK.json similarity index 100% rename from localizations/ApplicationResources_sk_SK.json rename to _localizations/ApplicationResources_sk_SK.json diff --git a/localizations/ApplicationResources_sl_SI.json b/_localizations/ApplicationResources_sl_SI.json similarity index 100% rename from localizations/ApplicationResources_sl_SI.json rename to _localizations/ApplicationResources_sl_SI.json diff --git a/localizations/ApplicationResources_sq_AL.json b/_localizations/ApplicationResources_sq_AL.json similarity index 100% rename from localizations/ApplicationResources_sq_AL.json rename to _localizations/ApplicationResources_sq_AL.json diff --git a/localizations/ApplicationResources_sr_BA.json b/_localizations/ApplicationResources_sr_BA.json similarity index 100% rename from localizations/ApplicationResources_sr_BA.json rename to _localizations/ApplicationResources_sr_BA.json diff --git a/localizations/ApplicationResources_sv_SE.json b/_localizations/ApplicationResources_sv_SE.json similarity index 100% rename from localizations/ApplicationResources_sv_SE.json rename to _localizations/ApplicationResources_sv_SE.json diff --git a/localizations/ApplicationResources_th_TH.json b/_localizations/ApplicationResources_th_TH.json similarity index 100% rename from localizations/ApplicationResources_th_TH.json rename to _localizations/ApplicationResources_th_TH.json diff --git a/localizations/ApplicationResources_tl_PH.json b/_localizations/ApplicationResources_tl_PH.json similarity index 100% rename from localizations/ApplicationResources_tl_PH.json rename to _localizations/ApplicationResources_tl_PH.json diff --git a/localizations/ApplicationResources_tr_TR.json b/_localizations/ApplicationResources_tr_TR.json similarity index 100% rename from localizations/ApplicationResources_tr_TR.json rename to _localizations/ApplicationResources_tr_TR.json diff --git a/localizations/ApplicationResources_uk_UK.json b/_localizations/ApplicationResources_uk_UK.json similarity index 100% rename from localizations/ApplicationResources_uk_UK.json rename to _localizations/ApplicationResources_uk_UK.json diff --git a/localizations/ApplicationResources_vi_VN.json b/_localizations/ApplicationResources_vi_VN.json similarity index 100% rename from localizations/ApplicationResources_vi_VN.json rename to _localizations/ApplicationResources_vi_VN.json diff --git a/localizations/ApplicationResources_zh_CN.json b/_localizations/ApplicationResources_zh_CN.json similarity index 100% rename from localizations/ApplicationResources_zh_CN.json rename to _localizations/ApplicationResources_zh_CN.json diff --git a/localizations/ApplicationResources_zh_HK.json b/_localizations/ApplicationResources_zh_HK.json similarity index 100% rename from localizations/ApplicationResources_zh_HK.json rename to _localizations/ApplicationResources_zh_HK.json diff --git a/example/.gitignore b/example/.gitignore index a8e938c..1eab1a2 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -33,7 +33,6 @@ migrate_working_dir/ /build/ # Web related -lib/generated_plugin_registrant.dart # Symbolication related app.*.symbols diff --git a/example/lib/pages/quill_editor_demo.dart b/example/lib/pages/quill_editor_demo.dart deleted file mode 100644 index f64492d..0000000 --- a/example/lib/pages/quill_editor_demo.dart +++ /dev/null @@ -1,80 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:zds_flutter/zds_flutter.dart'; - -///Example for htmlEditor -class QuillEditorDemo extends StatefulWidget { - const QuillEditorDemo({super.key}); - - @override - State createState() => _QuillEditorDemoState(); -} - -class _QuillEditorDemoState extends State { - final controller = QuillController.basic(); - - @override - void initState() { - super.initState(); - ZdsQuillDelta.fromHtml(''' -

H1 heading

H2 Heading

H3 Heading

Normal
Because

- ''').then((value) { - controller.document = value.document; - }); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Quill Editor'), - actions: [ - IconButton( - icon: const Icon(Icons.html), - onPressed: () { - showDialog( - context: context, - builder: (context) { - return ConstrainedBox( - constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.7), - child: Dialog( - child: ZdsCard( - child: Text(ZdsQuillDelta(document: controller.document).toHtml()), - ), - ), - ); - }, - ); - }, - ), - ], - ), - floatingActionButton: FloatingActionButton( - child: const Icon(Icons.edit), - onPressed: () { - ZdsQuillEditorPage.edit( - context, - title: 'Edit Notes', - initialDelta: ZdsQuillDelta(document: controller.document), - charLimit: 20000, - ).then((value) { - if (value != null) { - controller.document = value.document; - } - }); - }, - ), - body: Column( - children: [ - Expanded( - child: QuillEditor.basic( - padding: const EdgeInsets.all(16), - controller: controller, - focusNode: FocusNode(canRequestFocus: false), - readOnly: true, - ), - ), - ], - ), - ); - } -} diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 80ea669..5279f37 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -5,7 +5,7 @@ version: 1.0.0+1 environment: sdk: ">=3.0.0 <4.0.0" - flutter: ">=3.7.0" + flutter: ">=3.0.0 <3.16.0" dependencies: flutter: diff --git a/example/web/index.html b/example/web/index.html index b33ba9b..4774245 100644 --- a/example/web/index.html +++ b/example/web/index.html @@ -12,7 +12,9 @@ Fore more details: * https://developer.mozilla.org/en-US/doc/Web/HTML/Element/base --> - + + @@ -31,6 +33,8 @@ + diff --git a/pubspec.yaml b/pubspec.yaml index d273d00..644c943 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: zds_flutter description: Zebra Design System components for Flutter. A selection of UI components from Zebra Technologies. -version: 1.0.0 +version: 1.0.2 homepage: https://github.com/zebradevs/zds_flutter repository: https://github.com/zebradevs/zds_flutter issue_tracker: https://github.com/zebradevs/zds_flutter/issues @@ -15,7 +15,7 @@ platforms: environment: sdk: ">=3.0.0 <4.0.0" - flutter: ">=3.7.0" + flutter: ">=3.0.0 <3.16.0" dependencies: cached_network_image: ^3.2.1