From 872434eb531b9655c8e7bf6a3d8105f02498b101 Mon Sep 17 00:00:00 2001 From: "leonardo.gabriel" Date: Wed, 5 Apr 2023 13:17:00 -0300 Subject: [PATCH 1/6] Updated yml format --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4121c2be..84ef76b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ name: CI # Controls when the workflow will run on: push: - branches: [ main ] + branches: [main] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -18,12 +18,12 @@ jobs: outputs: tag: ${{ steps.gen-tag-step.outputs.tagname }} steps: - - uses: actions/checkout@v2 - - uses: jacopocarlini/action-autotag@2.0.4 - id: gen-tag-step - with: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - tag_prefix: "v" + - uses: actions/checkout@v2 + - uses: jacopocarlini/action-autotag@2.0.4 + id: gen-tag-step + with: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + tag_prefix: 'v' generate-changelog: if: ${{ startsWith(needs.auto-gen-tag.outputs.tag, 'v') }} @@ -48,7 +48,7 @@ jobs: with: name: changelog path: CHANGELOG.md - + # This workflow contains a single job called "build" create-release: name: Draft Github release @@ -71,7 +71,7 @@ jobs: body_path: CHANGELOG.md draft: false prerelease: false - + tests: name: Run Automated Tests needs: create-release From 3278c006eb68aa4c0a23dea6e2cce7e8e405f44c Mon Sep 17 00:00:00 2001 From: "leonardo.gabriel" Date: Wed, 5 Apr 2023 13:20:44 -0300 Subject: [PATCH 2/6] Updated yml format --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e9ee34e..7d2908a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ name: Tests on: pull_request: - branches: [ main, develop ] + branches: [main, develop] jobs: tests: From 66181bbf040acb8cb6c7e928b8f5eb52c0e550a7 Mon Sep 17 00:00:00 2001 From: Marcelo Amaro Date: Wed, 5 Apr 2023 17:51:49 -0300 Subject: [PATCH 3/6] Fix sample build on iOS --- sample/ios/Podfile | 10 ++++++++- sample/ios/Podfile.lock | 24 ++++++++++----------- sample/ios/Runner.xcodeproj/project.pbxproj | 12 +++++------ sample/pubspec.lock | 2 +- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/sample/ios/Podfile b/sample/ios/Podfile index 9061ff8f..e3fa18f0 100644 --- a/sample/ios/Podfile +++ b/sample/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '12.1' +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -38,4 +38,12 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) end + + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0' + end + end + end end diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index 3aa3da6b..01ea2af5 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -1,12 +1,12 @@ PODS: - audio_session (0.0.1): - Flutter - - ffmpeg-kit-ios-https (5.1) - - ffmpeg_kit_flutter (5.1.0): - - ffmpeg_kit_flutter/https (= 5.1.0) + - ffmpeg-kit-ios-full-gpl (5.1) + - ffmpeg_kit_flutter_full_gpl (5.1.0): + - ffmpeg_kit_flutter_full_gpl/full-gpl (= 5.1.0) - Flutter - - ffmpeg_kit_flutter/https (5.1.0): - - ffmpeg-kit-ios-https (= 5.1) + - ffmpeg_kit_flutter_full_gpl/full-gpl (5.1.0): + - ffmpeg-kit-ios-full-gpl (= 5.1) - Flutter - Flutter (1.0.0) - FMDB (2.7.5): @@ -31,7 +31,7 @@ PODS: DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) - - ffmpeg_kit_flutter (from `.symlinks/plugins/ffmpeg_kit_flutter/ios`) + - ffmpeg_kit_flutter_full_gpl (from `.symlinks/plugins/ffmpeg_kit_flutter_full_gpl/ios`) - Flutter (from `Flutter`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - open_filex (from `.symlinks/plugins/open_filex/ios`) @@ -43,14 +43,14 @@ DEPENDENCIES: SPEC REPOS: trunk: - - ffmpeg-kit-ios-https + - ffmpeg-kit-ios-full-gpl - FMDB EXTERNAL SOURCES: audio_session: :path: ".symlinks/plugins/audio_session/ios" - ffmpeg_kit_flutter: - :path: ".symlinks/plugins/ffmpeg_kit_flutter/ios" + ffmpeg_kit_flutter_full_gpl: + :path: ".symlinks/plugins/ffmpeg_kit_flutter_full_gpl/ios" Flutter: :path: Flutter just_audio: @@ -70,8 +70,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: audio_session: 4f3e461722055d21515cf3261b64c973c062f345 - ffmpeg-kit-ios-https: 8dffbe1623a2f227be98fc314294847a97f818e4 - ffmpeg_kit_flutter: 17e9f35a4ec996ac55051c20be05240f2a0b53e8 + ffmpeg-kit-ios-full-gpl: 2682965e5b3e7f13a05836d46d302eafe6c5039e + ffmpeg_kit_flutter_full_gpl: 7dcfcdc419f4667252cde1871859976bca328169 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa @@ -82,6 +82,6 @@ SPEC CHECKSUMS: video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f -PODFILE CHECKSUM: 7adbc9d59f05e1b01f554ea99b6c79e97f2214a2 +PODFILE CHECKSUM: da491a8b7d2d8eef05b8be02236cf916620dd0f4 COCOAPODS: 1.12.0 diff --git a/sample/ios/Runner.xcodeproj/project.pbxproj b/sample/ios/Runner.xcodeproj/project.pbxproj index a21b6f4d..93aa6822 100644 --- a/sample/ios/Runner.xcodeproj/project.pbxproj +++ b/sample/ios/Runner.xcodeproj/project.pbxproj @@ -341,7 +341,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -360,7 +360,7 @@ DEVELOPMENT_TEAM = CZXK68F2MF; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -420,7 +420,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -469,7 +469,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -490,7 +490,7 @@ DEVELOPMENT_TEAM = CZXK68F2MF; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -514,7 +514,7 @@ DEVELOPMENT_TEAM = CZXK68F2MF; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/sample/pubspec.lock b/sample/pubspec.lock index 4eb7cabc..36032a3e 100644 --- a/sample/pubspec.lock +++ b/sample/pubspec.lock @@ -23,7 +23,7 @@ packages: path: ".." relative: true source: path - version: "0.0.44" + version: "0.0.45" boolean_selector: dependency: transitive description: From e21622e46035e4a58e1ea5b98319271b44ce98df Mon Sep 17 00:00:00 2001 From: Paolla Lira Date: Thu, 6 Apr 2023 15:14:22 -0300 Subject: [PATCH 4/6] Doubles --- lib/src/widgets/toast/ds_toast.widget.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/src/widgets/toast/ds_toast.widget.dart b/lib/src/widgets/toast/ds_toast.widget.dart index 88c9ed1f..4acfffca 100644 --- a/lib/src/widgets/toast/ds_toast.widget.dart +++ b/lib/src/widgets/toast/ds_toast.widget.dart @@ -107,7 +107,7 @@ class _DSToastState extends State with AutomaticKeepAliveClientMixin { Widget _setIcon(final IconData icon) { return Padding( - padding: const EdgeInsets.only(top: 8), + padding: const EdgeInsets.only(top: 8.0), child: Icon( icon, color: DSColors.neutralDarkCity, @@ -125,15 +125,15 @@ class _DSToastState extends State with AutomaticKeepAliveClientMixin { child: Stack( children: [ Positioned( - left: -15, - top: -2, + left: -15.0, + top: -2.0, child: SvgPicture.asset( 'assets/images/blip_balloon.svg', package: DSUtils.packageName, ), ), Container( - padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), + padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), decoration: BoxDecoration( color: backgroundColor, borderRadius: BorderRadius.circular(8.0), @@ -146,7 +146,7 @@ class _DSToastState extends State with AutomaticKeepAliveClientMixin { Expanded( child: Padding( padding: const EdgeInsets.symmetric( - vertical: 8, + vertical: 8.0, horizontal: 16.0, ), child: Column( From de5bd4ccd45454b10f1dddc0d1980a12ec054734 Mon Sep 17 00:00:00 2001 From: Paolla Lira Date: Thu, 6 Apr 2023 17:39:10 -0300 Subject: [PATCH 5/6] Widgets --- lib/src/widgets/toast/ds_toast.widget.dart | 162 +++++++++++++-------- 1 file changed, 100 insertions(+), 62 deletions(-) diff --git a/lib/src/widgets/toast/ds_toast.widget.dart b/lib/src/widgets/toast/ds_toast.widget.dart index 4acfffca..88aa625d 100644 --- a/lib/src/widgets/toast/ds_toast.widget.dart +++ b/lib/src/widgets/toast/ds_toast.widget.dart @@ -132,78 +132,116 @@ class _DSToastState extends State with AutomaticKeepAliveClientMixin { package: DSUtils.packageName, ), ), - Container( - padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), - decoration: BoxDecoration( - color: backgroundColor, - borderRadius: BorderRadius.circular(8.0), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (icon != null) icon!, - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 8.0, - horizontal: 16.0, + if (props.actionType == DSToastActionType.icon) + Container( + padding: + const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), + decoration: BoxDecoration( + color: backgroundColor, + borderRadius: BorderRadius.circular(8.0), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (icon != null) icon!, + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 8.0, + horizontal: 16.0, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (props.title != null) + DSHeadlineSmallText( + props.title, + overflow: TextOverflow.visible, + ), + if (props.message != null) + DSBodyText( + props.message, + overflow: TextOverflow.visible, + ), + ], + ), ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (props.title != null) - DSHeadlineSmallText( - props.title, - overflow: TextOverflow.visible, + ), + DSIconButton( + size: 40.0, + icon: const Icon(DSIcons.close_outline), + onPressed: () { + state!(() { + _stopTimer(); + _controlAnimation = Control.playReverse; + }); + }, + ), + ], + ), + ), + if (props.actionType == DSToastActionType.button) + Container( + padding: + const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0), + decoration: BoxDecoration( + color: backgroundColor, + borderRadius: BorderRadius.circular(8.0), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (icon != null) icon!, + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 8.0, + horizontal: 16.0, ), - if (props.message != null) - DSBodyText( - props.message, - overflow: TextOverflow.visible, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (props.title != null) + DSHeadlineSmallText( + props.title, + overflow: TextOverflow.visible, + ), + if (props.message != null) + DSBodyText( + props.message, + overflow: TextOverflow.visible, + ), + ], ), - ], - ), + ), + ), + ], + ), + DSTertiaryButton( + label: props.buttonText, + onPressed: () { + props.onPressedButton!(); + state!( + () { + _stopTimer(); + _controlAnimation = Control.playReverse; + }, + ); + }, ), - ), - _setMainButton(), - ], + ], + ), ), - ), ], ), ); } - /// Switches between exit button types - Widget _setMainButton() { - return props.actionType == DSToastActionType.icon - ? DSIconButton( - size: 40.0, - icon: const Icon(DSIcons.close_outline), - onPressed: () { - state!(() { - _stopTimer(); - _controlAnimation = Control.playReverse; - }); - }, - ) - : props.actionType == DSToastActionType.button - ? DSTertiaryButton( - label: props.buttonText, - onPressed: () { - props.onPressedButton!(); - state!( - () { - _stopTimer(); - _controlAnimation = Control.playReverse; - }, - ); - }, - ) - : const SizedBox.shrink(); - } - /// Create and manage the toast animation @override Widget build(BuildContext context) { From 9766757723d8fa5b3419f52dc3d1afef0132a97c Mon Sep 17 00:00:00 2001 From: Paolla Lira Date: Wed, 12 Apr 2023 10:44:51 -0300 Subject: [PATCH 6/6] Version --- CHANGELOG.md | 4 ++++ pubspec.yaml | 2 +- sample/pubspec.lock | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d309a9..8ee89825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.46 + +* [DSToast] Toast layout adjustment. + ## 0.0.45 * [DSAudioPlayer] Fixed audio player on iOS when reproducing .ogg files. diff --git a/pubspec.yaml b/pubspec.yaml index d34da1b9..d67db801 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: blip_ds description: Blip Design System for Flutter. -version: 0.0.45 +version: 0.0.46 homepage: https://github.com/takenet/blip-ds-flutter#readme repository: https://github.com/takenet/blip-ds-flutter diff --git a/sample/pubspec.lock b/sample/pubspec.lock index 4eb7cabc..535fe1b8 100644 --- a/sample/pubspec.lock +++ b/sample/pubspec.lock @@ -23,7 +23,7 @@ packages: path: ".." relative: true source: path - version: "0.0.44" + version: "0.0.46" boolean_selector: dependency: transitive description: