feat: composite messages #1997

MohamadJaara · 2023-07-24T14:25:32Z

PR Submission Checklist for internal contributors

The PR Title
- conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
- contains a reference JIRA issue number like SQPIT-764
- answers the question: If merged, this PR will: ... ³
The PR Description
- is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

list of changes

Causes (Optional)

Briefly describe the causes behind the issues. This could be helpful to understand the adopted solutions behind some nasty bugs or complex issues.

Solutions

Briefly describe the solutions you have implemented for the issues explained above.

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

GitHub link to other pull request

Testing

Test Coverage (Optional)

I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)

PR Post Submission Checklist for internal contributors (Optional)

Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References

https://sparkbox.com/foundry/semantic_commit_messages
https://github.com/wireapp/.github#usage
E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

# Conflicts: # kalium

AndroidBob · 2023-07-24T14:33:57Z

Build 631 failed.

github-actions · 2023-07-24T14:35:22Z

Test Results

518 tests +2 517 ✔️ +2 20s ⏱️ ±0s
  75 suites +1     1 💤 ±0
  75 files +1     0 ❌ ±0

Results for commit dc058d0. ± Comparison against base commit 6fc88bd.

♻️ This comment has been updated with latest results.

app/src/main/kotlin/com/wire/android/ui/home/conversations/CompositeMessagesViewModel.kt

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt

app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt

# Conflicts: # kalium

AndroidBob · 2023-07-24T16:43:10Z

Build 638 failed.

…nu (#2002) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tommaso Piazza <[email protected]>

github-actions · 2023-07-26T10:23:15Z

@MohamadJaara looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc	8532357e2f898867e0292e2335be66d32aa9f83c

Is this intentional?

github-actions · 2023-07-26T10:23:35Z

@MohamadJaara looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc	8532357e2f898867e0292e2335be66d32aa9f83c

Is this intentional?

github-actions · 2023-07-26T10:29:32Z

@MohamadJaara looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc	8532357e2f898867e0292e2335be66d32aa9f83c

Is this intentional?

github-actions · 2023-07-26T10:50:15Z

APKs built during tests are available here. Scroll down to Artifacts!

AndroidBob · 2023-07-26T10:56:07Z

Build 689 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7140078)(7140078)-staging-compat.apk

trOnk12 · 2023-07-26T12:38:35Z

app/src/main/kotlin/com/wire/android/mapper/MessagePreviewContentMapper.kt

@@ -247,10 +247,20 @@ fun MessagePreview.uiLastMessageContent(): UILastMessageContent {
                is WithUser.TeamMemberRemoved -> UILastMessageContent.None // TODO
                is WithUser.Text -> UILastMessageContent.SenderWithMessage(
                    sender = userUIText,
-                    message = UIText.DynamicString((content as WithUser.Text).messageBody),
+                    message = (content as WithUser.Text).messageBody.let { UIText.DynamicString(it) },


isn't this crash prone ?

no, since this code will only be executed when the content is Text

trOnk12 · 2023-07-26T12:39:47Z

app/src/main/kotlin/com/wire/android/mapper/RegularMessageContentMapper.kt

@@ -91,6 +92,33 @@ class RegularMessageMapper @Inject constructor(
            message.deliveryStatus
        )

+        is MessageContent.Composite -> {
+            val text = content.textContent?.let { textContent ->


can;t we map it inside the mapper ?

trOnk12 · 2023-07-26T12:40:12Z

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt

+    val viewModel = hiltViewModelScoped<CompositeMessageViewModel>(
+        key = "${CompositeMessageViewModel.ARGS_KEY}$messageId",
+        defaultArguments = bundleOf(
+            EXTRA_MESSAGE_ID to messageId,
+        )
+    )
+    Column(
+        modifier = Modifier
+            .wrapContentSize()
+    ) {
+        for (index in buttonList.indices) {
+            val button = buttonList[index]
+            val onCLick = remember(button.isSelected) {
+                if (!button.isSelected) {
+                    { viewModel.sendButtonActionMessage(button.id) }
+                } else {
+                    { }
+                }
+            }
+
+            val isPending = viewModel.pendingButtonId == button.id
+
+            val state = if (button.isSelected) WireButtonState.Selected
+            else if (viewModel.pendingButtonId != null) WireButtonState.Disabled
+            else WireButtonState.Default

-    MarkdownDocument(Parser.builder().extensions(extensions).build().parse(text) as Document, nodeData)
+            WireSecondaryButton(
+                loading = isPending,
+                text = button.text,
+                onClick = onCLick,
+                state = state
+            )
+            if (index != buttonList.lastIndex) {
+                Spacer(modifier = Modifier.padding(top = dimensions().spacing8x))
+            }
+        }
+    }


looking awesome <3 thanks for the discussion and openess to changes

trOnk12

some tiny tiny last suggetions from my side

# Conflicts: # app/src/main/kotlin/com/wire/android/ui/home/newconversation/NewConversationViewModel.kt # kalium

AndroidBob · 2023-07-26T15:47:10Z

Build 718 failed.

github-actions · 2023-07-26T16:15:51Z

APKs built during tests are available here. Scroll down to Artifacts!

AndroidBob · 2023-07-26T16:16:14Z

Build 719 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7142007)(7142007)-staging-compat.apk

codecov · 2023-07-27T11:53:07Z

Codecov Report

Merging #1997 (dc058d0) into develop (6fc88bd) will decrease coverage by 0.01%.
The diff coverage is 40.00%.

@@              Coverage Diff              @@
##             develop    #1997      +/-   ##
=============================================
- Coverage      38.66%   38.65%   -0.01%     
- Complexity       895      900       +5     
=============================================
  Files            287      288       +1     
  Lines          11347    11390      +43     
  Branches        1460     1466       +6     
=============================================
+ Hits            4387     4403      +16     
- Misses          6535     6562      +27     
  Partials         425      425

Files Changed	Coverage Δ
...wire/android/mapper/RegularMessageContentMapper.kt	`24.63% <0.00%> (-3.24%)`	⬇️
...rsations/messages/ConversationMessagesViewModel.kt	`50.81% <ø> (ø)`
...e/android/ui/home/conversations/model/UIMessage.kt	`44.32% <15.38%> (-1.55%)`	⬇️
.../android/ui/authentication/devices/model/Device.kt	`93.75% <100.00%> (ø)`
...ui/home/conversations/CompositeMessageViewModel.kt	`100.00% <100.00%> (ø)`

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6fc88bd...dc058d0. Read the comment docs.

github-actions · 2023-07-27T12:01:52Z

APKs built during tests are available here. Scroll down to Artifacts!

AndroidBob · 2023-07-27T12:20:05Z

Build 736 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7149228)(7149228)-staging-compat.apk

MohamadJaara added 8 commits July 20, 2023 12:58

feat: render composite messages UI [part-1] (#1952)

1a8301a

feat: handle button click [part-2] (#1977)

90a82e4

feat: display if a button is selected [part-3] (#1980)

68fcdc1

Merge branch 'develop' into feat/composite_messages/epic

acd9b3d

# Conflicts: # kalium

feat: display composite message preview [part-4] (#1996)

c1700cb

Merge branch 'develop' into feat/composite_messages/epic

1f2d33f

# Conflicts: # kalium

trigger CI

e740bb3

kalium

06538ba

pull-request-size bot added the size/L label Jul 24, 2023

github-actions bot assigned MohamadJaara Jul 24, 2023