From 0cafd5da3d73c65e30cd19cc5bfa6b16852e4b5c Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Mon, 18 Dec 2023 14:49:11 +0100 Subject: [PATCH 1/4] Change default scale of label tool to 2 --- api/lib/src/models/tool.dart | 2 +- api/lib/src/models/tool.freezed.dart | 2 +- api/lib/src/models/tool.g.dart | 2 +- api/pubspec.yaml | 8 +- app/pubspec.lock | 80 +------------------ app/pubspec.yaml | 4 +- .../metadata/android/en-US/changelogs/84.txt | 1 + 7 files changed, 14 insertions(+), 85 deletions(-) diff --git a/api/lib/src/models/tool.dart b/api/lib/src/models/tool.dart index 62895a66bdaa..964c0145e07a 100644 --- a/api/lib/src/models/tool.dart +++ b/api/lib/src/models/tool.dart @@ -82,7 +82,7 @@ sealed class Tool with _$Tool { @Default(true) bool zoomDependent, @Default(kColorBlack) int foreground, @Default(PackAssetLocation()) PackAssetLocation styleSheet, - @Default(5.0) double scale, + @Default(2.0) double scale, }) = LabelTool; factory Tool.pen({ diff --git a/api/lib/src/models/tool.freezed.dart b/api/lib/src/models/tool.freezed.dart index 7375346400b0..56af752cc55e 100644 --- a/api/lib/src/models/tool.freezed.dart +++ b/api/lib/src/models/tool.freezed.dart @@ -2542,7 +2542,7 @@ class _$LabelToolImpl extends LabelTool { this.zoomDependent = true, this.foreground = kColorBlack, this.styleSheet = const PackAssetLocation(), - this.scale = 1.0, + this.scale = 2.0, final String? $type}) : $type = $type ?? 'label', super._(); diff --git a/api/lib/src/models/tool.g.dart b/api/lib/src/models/tool.g.dart index 1dfec83d1c02..dfb7fb3dfb75 100644 --- a/api/lib/src/models/tool.g.dart +++ b/api/lib/src/models/tool.g.dart @@ -98,7 +98,7 @@ _$LabelToolImpl _$$LabelToolImplFromJson(Map json) => _$LabelToolImpl( ? const PackAssetLocation() : PackAssetLocation.fromJson( Map.from(json['styleSheet'] as Map)), - scale: (json['scale'] as num?)?.toDouble() ?? 1.0, + scale: (json['scale'] as num?)?.toDouble() ?? 2.0, $type: json['type'] as String?, ); diff --git a/api/pubspec.yaml b/api/pubspec.yaml index d36ccdb85387..ffb776e02531 100644 --- a/api/pubspec.yaml +++ b/api/pubspec.yaml @@ -10,13 +10,13 @@ dependencies: collection: ^1.18.0 freezed_annotation: ^2.2.0 json_annotation: ^4.8.1 - replay_bloc: ^0.2.4 + replay_bloc: ^0.2.5 rxdart: ^0.27.7 - test: ^1.24.9 xml: ^6.4.2 dev_dependencies: + test: ^1.25.0 json_serializable: ^6.7.1 - build_runner: ^2.4.6 - freezed: ^2.4.5 + build_runner: ^2.4.7 + freezed: ^2.4.6 lints: ^3.0.0 analyzer: ^6.3.0 diff --git a/app/pubspec.lock b/app/pubspec.lock index 47748f78db6d..443d63a2c248 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: "direct main" description: name: bloc_concurrency - sha256: "44535c9f429cd7e91d548cf89fde1c23a8b4b3637decdb1865bb583091a00d4e" + sha256: d945b33641a3c3f12fa12a1437e77f784444dd9a3a66a3a4f5aaa6e049154d36 url: "https://pub.dev" source: hosted - version: "0.2.2" + version: "0.2.3" boolean_selector: dependency: transitive description: @@ -280,14 +280,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" - coverage: - dependency: transitive - description: - name: coverage - sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb" - url: "https://pub.dev" - source: hosted - version: "1.6.4" cross_file: dependency: "direct main" description: @@ -803,14 +795,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.0" - node_preamble: - dependency: transitive - description: - name: node_preamble - sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" - url: "https://pub.dev" - source: hosted - version: "2.0.2" package_config: dependency: transitive description: @@ -1025,10 +1009,10 @@ packages: dependency: "direct main" description: name: replay_bloc - sha256: "30194068437403c93d4d6f24a7a62638b306af5afde4d83486463311bf0c8440" + sha256: "268a7b9adb9b91f00c673a782838305df3194f51588dc7a6ff0c35d08a45557c" url: "https://pub.dev" source: hosted - version: "0.2.4" + version: "0.2.5" rxdart: dependency: "direct main" description: @@ -1133,22 +1117,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" - shelf_packages_handler: - dependency: transitive - description: - name: shelf_packages_handler - sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - shelf_static: - dependency: transitive - description: - name: shelf_static - sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e - url: "https://pub.dev" - source: hosted - version: "1.1.2" shelf_web_socket: dependency: transitive description: @@ -1178,22 +1146,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.4" - source_map_stack_trace: - dependency: transitive - description: - name: source_map_stack_trace - sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - source_maps: - dependency: transitive - description: - name: source_maps - sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" - url: "https://pub.dev" - source: hosted - version: "0.10.12" source_span: dependency: transitive description: @@ -1266,14 +1218,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" - test: - dependency: transitive - description: - name: test - sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f - url: "https://pub.dev" - source: hosted - version: "1.24.9" test_api: dependency: transitive description: @@ -1282,14 +1226,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.1" - test_core: - dependency: transitive - description: - name: test_core - sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a - url: "https://pub.dev" - source: hosted - version: "0.5.9" timing: dependency: transitive description: @@ -1458,14 +1394,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - webkit_inspection_protocol: - dependency: transitive - description: - name: webkit_inspection_protocol - sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" - url: "https://pub.dev" - source: hosted - version: "1.2.1" win32: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 472285afd14a..e4b618224698 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -36,14 +36,14 @@ dependencies: git: url: https://github.com/CodeDoctorDE/phosphor-flutter ref: f370dd2c25d3ea51ffb8f1c7c183bc9f33889c82 - replay_bloc: ^0.2.4 + replay_bloc: ^0.2.5 share_plus: ^7.2.1 package_info_plus: ^5.0.1 idb_shim: ^2.3.2 go_router: ^12.1.3 xml: ^6.5.0 collection: ^1.18.0 - bloc_concurrency: ^0.2.2 + bloc_concurrency: ^0.2.3 camera: ^0.10.5+7 camera_windows: ^0.2.1+8 window_manager: ^0.3.7 diff --git a/fastlane/metadata/android/en-US/changelogs/84.txt b/fastlane/metadata/android/en-US/changelogs/84.txt index fd47522e9a18..07a79755181d 100644 --- a/fastlane/metadata/android/en-US/changelogs/84.txt +++ b/fastlane/metadata/android/en-US/changelogs/84.txt @@ -1,4 +1,5 @@ * Change duplicate icon to have a difference to copy icon ([#552](https://github.com/LinwoodDev/Butterfly/issues/552)) +* Change default scale of label tool to 2 * Improve responsiveness of dialogs on mobile devices ([#550](https://github.com/LinwoodDev/Butterfly/issues/550)) * Improve add dialog trailing icon ([#550](https://github.com/LinwoodDev/Butterfly/issues/550)) * Fix back button closes app on mobile ([#551](https://github.com/LinwoodDev/Butterfly/issues/551)) From f58a4185b771861051a0e46a327ee11cc5539cb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 08:29:45 +0100 Subject: [PATCH 2/4] Bump actions/upload-artifact from 3 to 4 (#557) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 24 ++++++++++++------------ .github/workflows/documentation.yml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72d9ae2c4ebb..da417b4c5245 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: flutter build apk -v --release --flavor production cp build/app/outputs/flutter-apk/app-production-release.apk linwood-butterfly-android.apk - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: apk-build path: app/linwood-butterfly-android.apk @@ -98,13 +98,13 @@ jobs: run: | cp scripts/start.bat build/windows/x64/runner/Release/ - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows-build path: | app/build/windows/x64/runner/Release/** - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows-setup path: | @@ -197,25 +197,25 @@ jobs: chmod +x scripts/start.sh cp scripts/start.sh build/linux/x64/release/bundle - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-build path: | app/build/linux/x64/release/bundle/** - name: Archive .deb - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-deb path: | app/linwood-butterfly-linux.deb - name: Archive .rpm - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-rpm path: | app/build/linwood-butterfly-linux.rpm - name: Archive .AppImage - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-appimage path: | @@ -299,12 +299,12 @@ jobs: # flatpak build-export export flatpak_app -v # flatpak build-bundle export linwood-butterfly-linux.flatpak dev.linwood.butterfly -v # - name: Upload .flatpak artifact to workflow - # uses: actions/upload-artifact@v3 + # uses: actions/upload-artifact@v4 # with: # name: linux-flatpak # path: app/linwood-butterfly-linux.flatpak - name: Archive old portable - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux-alternative-portable path: app/build/linux/x64/release/bundle @@ -350,13 +350,13 @@ jobs: run: | appdmg DmgSetup.json linwood-butterfly-macos.dmg - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos-build path: | app/build/macos/Build/Products/Release/linwood-butterfly-macos.zip - name: Archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos-dmg path: | @@ -377,7 +377,7 @@ jobs: # id: build # with: # architecture: ${{ matrix.architecture }} - # - uses: actions/upload-artifact@v3 + # - uses: actions/upload-artifact@v4 # with: # name: butterfly-snap # path: ${{ steps.build.outputs.snap }} diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 3f35cb5d1e7a..d8010205e222 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,7 +33,7 @@ jobs: cd docs/build mkdir ${{ matrix.language }} mv * ${{ matrix.language }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: docs/build name: build From bdf910dfd34a66afdc211f9d8e9eca3e996ea098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 08:30:02 +0100 Subject: [PATCH 3/4] Bump tsickert/discord-webhook from 5.3.0 to 5.4.0 (#556) Bumps [tsickert/discord-webhook](https://github.com/tsickert/discord-webhook) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/tsickert/discord-webhook/releases) - [Commits](https://github.com/tsickert/discord-webhook/compare/v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: tsickert/discord-webhook dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1fe764e13a31..743aef1f4eb3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -257,7 +257,7 @@ jobs: echo '' >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV - name: Discord Webhook Action - uses: tsickert/discord-webhook@v5.3.0 + uses: tsickert/discord-webhook@v5.4.0 if: ${{ github.event.inputs.stable == 'true' || github.ref == 'refs/heads/main' }} with: webhook-url: ${{ secrets.WEBHOOK_URL }} @@ -269,7 +269,7 @@ jobs: Download it here: https://docs.butterfly.linwood.dev/downloads https://github.com/LinwoodDev/butterfly/releases/tag/v${{ env.BUTTERFLY_VERSION }} - name: Discord Webhook Action - uses: tsickert/discord-webhook@v5.3.0 + uses: tsickert/discord-webhook@v5.4.0 if: ${{ github.event.inputs.stable == 'false' && github.ref == 'refs/heads/develop' }} with: webhook-url: ${{ secrets.WEBHOOK_URL }} From 56fc29f4af58fd2e2957647214e6f4559f49f4ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 08:30:12 +0100 Subject: [PATCH 4/4] Bump actions/download-artifact from 3 to 4 (#555) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/documentation.yml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da417b4c5245..de329674715d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -413,37 +413,37 @@ jobs: echo "BUTTERFLY_BUILD_NUMBER=${BUTTERFLY_BUILD_NUMBER}" >> $GITHUB_OUTPUT git config --global user.email "ci@linwood.dev" git config --global user.name "Linwood CI" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: apk-build - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: windows-build path: windows-build/ - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux-build path: linux-build/ - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux-deb - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux-rpm - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux-appimage - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: linux-alternative-portable path: linux-alternative-portable/ - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: windows-setup - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: macos-build - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: macos-dmg - name: 📦 Zip artifacts diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index d8010205e222..8990c9289ff1 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-22.04 needs: build steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: build path: build