feat: Minimise incoming/outgoing call screen (WPB-979) #2912

ohassine · 2024-04-18T15:08:31Z

WPB-979 Minimise Call Screen

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?

Description

Allow the app to minimise incoming/outgoing call screen.
Show an ongoing non dismissable notification when starting or receiving a call.
Rename classes from using "Initiating" term to "Outgoing" for outgoing call

screen-20240418-171535.mp4

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.

…separate_activity # Conflicts: # app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

…separate_activity

…separate_activity # Conflicts: # gradle/libs.versions.toml

…separate_activity

…ity' into move_calling_to_a_separate_activity

…separate_activity

github-actions · 2024-04-18T15:12:25Z

Test Results

922 tests +6 922 ✅ +6 8m 26s ⏱️ - 1m 14s
123 suites ±0 0 💤 ±0
123 files ±0 0 ❌ ±0

Results for commit 5f515ed. ± Comparison against base commit b0043db.

This pull request removes 9 and adds 15 tests. Note that renamed tests count towards both.

com.wire.android.ui.calling.initiating.InitiatingCallViewModelTest ‑ given a start call error, when user tries to start a call, call ring tone is not called()
com.wire.android.ui.calling.initiating.InitiatingCallViewModelTest ‑ given an outgoing call, when the user ends call, then invoke endCall useCase and close the screen()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenActiveCallAndCallIsMuted_whenGettingState_thenShouldHaveMutedCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenActiveCallAndCallIsNotMuted_whenGettingState_thenShouldNotHaveMutedCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenActiveCallAndConnectivityIssueAndSomeOtherScreen_whenGettingState_thenShouldHaveActiveCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenActiveCallAndConnectivityIssues_whenGettingState_thenShouldHaveConnectivityInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenActiveCallAndHomeScreenAndConnectivityIssues_whenGettingState_thenShouldHaveActiveCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenNoActiveCallAndHomeScreenAndGathering_whenGettingState_thenShouldHaveConnectingInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenNoActiveCallAndHomeScreenAndSlowSync_whenGettingState_thenShouldHaveConnectingInfo()

com.wire.android.notification.CallNotificationManagerTest ‑ given an outgoing call for one user, when handling notifications, then show notification for that call()
com.wire.android.notification.CallNotificationManagerTest ‑ given no outgoing calls, when handling notifications, then hide outgoing call notification()
com.wire.android.notification.WireNotificationManagerTest ‑ givenOutgoingCall_whenCurrentUserIsDifferentFromCallReceiver_thenCallNotificationIsShown()
com.wire.android.ui.calling.outgoing.OutgoingCallViewModelTest ‑ given a start call error, when user tries to start a call, call ring tone is not called()
com.wire.android.ui.calling.outgoing.OutgoingCallViewModelTest ‑ given an outgoing call, when the user ends call, then invoke endCall useCase and close the screen()
com.wire.android.ui.calling.outgoing.OutgoingCallViewModelTest ‑ given user already started a call, when user tries to start another call, then do not initiat a new one()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenAnIncomingCallAnd_whenGettingState_thenShouldHaveIncomingCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenAnOngoingCallAndCallIsMuted_whenGettingState_thenShouldHaveMutedCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenAnOngoingCallAndCallIsNotMuted_whenGettingState_thenShouldNotHaveMutedCallInfo()
com.wire.android.ui.common.topappbar.CommonTopAppBarViewModelTest ‑ givenAnOngoingCallAndConnectivityIssueAndSomeOtherScreen_whenGettingState_thenShouldHaveActiveCallInfo()
…

♻️ This comment has been updated with latest results.

AndroidBob · 2024-04-18T15:42:04Z

Build 4322 failed.

AndroidBob · 2024-04-25T15:16:04Z

Build 4465 failed.

AndroidBob · 2024-04-25T15:49:04Z

Build 4469 failed.

…inimise-calling-screens

…creens

github-actions · 2024-04-25T16:54:22Z

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

AndroidBob · 2024-04-25T17:20:33Z

Build 4475 succeeded.

The build produced the following APK's:

com.wire.android-v4.7.0(9509560)(9509560)-staging-compat.apk

Garzas

Looking good 🎸 Just two small questions

Garzas · 2024-04-26T09:40:34Z

app/src/main/kotlin/com/wire/android/notification/CallNotificationManager.kt

@@ -53,6 +54,7 @@ class CallNotificationManager @Inject constructor(
    private val notificationManager = NotificationManagerCompat.from(context)
    private val scope = CoroutineScope(SupervisorJob() + dispatcherProvider.default())
    private val incomingCallsForUsers = MutableStateFlow<List<Pair<UserId, Call>>>(emptyList())
+    private val outgoingCallForUsers = MutableStateFlow<Map<UserId, Call>>(mapOf())


Can we use persistentMap?

What's the point of persistentMap ?

app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallViewModel.kt

vitorhugods

Nice to see this!

Just a couple of small suggestions and one maybe important question about priority of the top app bar regarding calls.

app/src/main/kotlin/com/wire/android/notification/CallNotificationManager.kt

app/src/main/kotlin/com/wire/android/ui/calling/CallScreenType.kt

app/src/main/kotlin/com/wire/android/ui/calling/common/CallerDetails.kt

app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallState.kt

app/src/main/kotlin/com/wire/android/ui/calling/outgoing/OutgoingCallViewModel.kt

app/src/main/kotlin/com/wire/android/ui/common/topappbar/CommonTopAppBarViewModel.kt

app/src/test/kotlin/com/wire/android/notification/CallNotificationManagerTest.kt

…tionManagerTest.kt Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev>

github-actions · 2024-04-26T11:21:55Z

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

AndroidBob · 2024-04-26T11:59:59Z

Build 4481 succeeded.

The build produced the following APK's:

com.wire.android-v4.7.0(9516249)(9516249)-staging-compat.apk

…inimise-calling-screens

…creens # Conflicts: # kalium

…creens

stale review

github-actions · 2024-04-29T09:34:09Z

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

AndroidBob · 2024-04-29T10:13:56Z

Build 4510 succeeded.

The build produced the following APK's:

com.wire.android-v4.7.0(9541533)(9541533)-staging-compat.apk

ohassine and others added 26 commits April 9, 2024 14:58

refactor: move calling feature a separate activity

ff32e24

chore: unit test

eabcf67

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

e539911

…separate_activity # Conflicts: # app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

f5089e3

…separate_activity

chore: unit test

2fdcf1f

chore: detekt

c3473f0

chore: detekt

eaa8508

chore: cleanup

fba80ca

Merge branch 'develop' into move_calling_to_a_separate_activity

a468ef2

fix: adjust calling activity flags

48ea54b

chore: detekt

cf6836d

Merge branch 'develop' into move_calling_to_a_separate_activity

db4e3d5

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

a901798

…separate_activity # Conflicts: # gradle/libs.versions.toml

Merge branch 'develop' into move_calling_to_a_separate_activity

a595d66

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

223811e

…separate_activity

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

8deaf2a

…separate_activity

feat: add correct activity flags for callingActivity

5e267db

fix: replace deprecated flags

2732ea0

chore: address comments

db2c6bf

Merge branch 'develop' into move_calling_to_a_separate_activity

b637415

chore: unit test

cdbbd52

Merge remote-tracking branch 'origin/move_calling_to_a_separate_activ…

e5df824

…ity' into move_calling_to_a_separate_activity

Merge remote-tracking branch 'origin/develop' into move_calling_to_a_…

bd8946c

…separate_activity

feat: minimise incoming and outgoing call screens

a6e3951

chore: update kalium reference

ae1b4e8

chore: resolve conflicts

1daef2c

pull-request-size bot added the size/L label Apr 18, 2024

github-actions bot assigned ohassine Apr 18, 2024

yamilmedina approved these changes Apr 25, 2024

View reviewed changes

ohassine added 2 commits April 25, 2024 17:34

Merge branch 'develop' into minimise-calling-screens

b28a4fa

chore: detekt

2544ef7

ohassine added 3 commits April 25, 2024 17:51

Merge remote-tracking branch 'origin/minimise-calling-screens' into m…

8d7782f

…inimise-calling-screens

Merge remote-tracking branch 'origin/develop' into minimise-calling-s…

b383fe1

…creens

chore: kalium reference

ecd27de

Garzas previously requested changes Apr 26, 2024

View reviewed changes

vitorhugods requested changes Apr 26, 2024

View reviewed changes

Update app/src/test/kotlin/com/wire/android/notification/CallNotifica…

6ffb940

…tionManagerTest.kt Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev>

ohassine added 3 commits April 29, 2024 10:48

chore: missing unit test

528e030

Merge remote-tracking branch 'origin/minimise-calling-screens' into m…

854bfd2

…inimise-calling-screens

Merge remote-tracking branch 'origin/develop' into minimise-calling-s…

3488534

…creens # Conflicts: # kalium

vitorhugods approved these changes Apr 29, 2024

View reviewed changes

ohassine added 2 commits April 29, 2024 11:08

Merge remote-tracking branch 'origin/develop' into minimise-calling-s…

a7e636a

…creens

chore: update kalium reference

5f515ed

ohassine enabled auto-merge April 29, 2024 09:13

ohassine added this pull request to the merge queue Apr 29, 2024

Merged via the queue into develop with commit 7875c99 Apr 29, 2024
12 of 13 checks passed

ohassine deleted the minimise-calling-screens branch April 29, 2024 09:51

ohassine mentioned this pull request May 2, 2024

fix: incoming call screen is not shown on second account #2956

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Minimise incoming/outgoing call screen (WPB-979) #2912

feat: Minimise incoming/outgoing call screen (WPB-979) #2912

ohassine commented Apr 18, 2024 •

edited by github-actions bot

Loading

github-actions bot commented Apr 18, 2024 •

edited

Loading

AndroidBob commented Apr 18, 2024

AndroidBob commented Apr 25, 2024

AndroidBob commented Apr 25, 2024

github-actions bot commented Apr 25, 2024

AndroidBob commented Apr 25, 2024

Garzas left a comment

Garzas Apr 26, 2024

ohassine Apr 26, 2024

vitorhugods left a comment

github-actions bot commented Apr 26, 2024

AndroidBob commented Apr 26, 2024

github-actions bot commented Apr 29, 2024

AndroidBob commented Apr 29, 2024

feat: Minimise incoming/outgoing call screen (WPB-979) #2912

feat: Minimise incoming/outgoing call screen (WPB-979) #2912

Conversation

ohassine commented Apr 18, 2024 • edited by github-actions bot Loading

PR Submission Checklist for internal contributors

What's new in this PR?

Description

Testing

Test Coverage (Optional)

How to Test

Notes (Optional)

Attachments (Optional)

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

github-actions bot commented Apr 18, 2024 • edited Loading

Test Results

AndroidBob commented Apr 18, 2024

AndroidBob commented Apr 25, 2024

AndroidBob commented Apr 25, 2024

github-actions bot commented Apr 25, 2024

AndroidBob commented Apr 25, 2024

Garzas left a comment

Choose a reason for hiding this comment

Garzas Apr 26, 2024

Choose a reason for hiding this comment

ohassine Apr 26, 2024

Choose a reason for hiding this comment

vitorhugods left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 26, 2024

AndroidBob commented Apr 26, 2024

github-actions bot commented Apr 29, 2024

AndroidBob commented Apr 29, 2024

ohassine commented Apr 18, 2024 •

edited by github-actions bot

Loading

github-actions bot commented Apr 18, 2024 •

edited

Loading