Skip to content

Commit

Permalink
Merge pull request #219 from takenet/v0.0.83
Browse files Browse the repository at this point in the history
V0.0.83
  • Loading branch information
mpamaro authored Oct 10, 2023
2 parents b4f2c35 + 81d026e commit ce768c5
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 4 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set Git config
run: |
git config --local user.email "[email protected]"
git config --local user.name "Github Actions"
- name: Merge command
run: |
git fetch
git fetch --unshallow
git checkout develop
git pull
git merge main -m "build: merge main back to develop"
git merge --no-ff origin/main -m "build: merge main back to develop"
git push
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.0.83

- [DSCard] Accept reply messages
- [DSMessageContentType] Add reply as content type

## 0.0.82

- [DSAudioPlayer] Improved the audio player initialization
Expand Down
1 change: 1 addition & 0 deletions lib/src/utils/ds_message_content_type.util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ abstract class DSMessageContentType {
static const String input = 'application/vnd.lime.input+json';
static const String location = 'application/vnd.lime.location+json';
static const String applicationJson = 'application/json';
static const String reply = 'application/vnd.lime.reply+json';
}
19 changes: 18 additions & 1 deletion lib/src/widgets/utils/ds_card.widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,21 @@ class DSCard extends StatelessWidget {
case DSMessageContentType.contact:
return _buildContact();

case DSMessageContentType.reply:
return DSCard(
type: content['replied']['type'],
content: content['replied']['value'],
align: align,
borderRadius: borderRadius,
status: status,
onSelected: onSelected,
avatarConfig: avatarConfig,
style: style,
onOpenLink: onOpenLink,
messageId: messageId,
customer: customer,
);

case DSMessageContentType.mediaLink:
return _buildMediaLink();

Expand Down Expand Up @@ -219,7 +234,9 @@ class DSCard extends StatelessWidget {
}

Widget _buildMediaLink() {
final media = DSMediaLink.fromJson(content);
final media = DSMediaLink.fromJson(
content,
);
final size = media.size ?? 0;

final shouldAuthenticate =
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: blip_ds
description: Blip Design System for Flutter.
version: 0.0.82
version: 0.0.83
homepage: https://github.com/takenet/blip-ds-flutter#readme
repository: https://github.com/takenet/blip-ds-flutter

Expand Down

0 comments on commit ce768c5

Please sign in to comment.