Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: show connecting indicator if user has bad/lost connection during a call (WPB-1125) #2101

Merged
merged 10 commits into from
Aug 25, 2023

Conversation

ohassine
Copy link
Member

@ohassine ohassine commented Aug 15, 2023


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

This PR aims to display Connecting... indicator in the participant tile to indicate that the user has a bad/lost network durning a call. We also grey out the tile in that network state.

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)

Screenshot 2023-08-15 at 11 16 55

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
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 15, 2023

Test Results

557 tests  ±0   556 ✔️ ±0   6m 47s ⏱️ -15s
  81 suites ±0       1 💤 ±0 
  81 files   ±0       0 ±0 

Results for commit 6e2d94f. ± Comparison against base commit 3a65370.

♻️ This comment has been updated with latest results.

@codecov
Copy link

codecov bot commented Aug 15, 2023

Codecov Report

Merging #2101 (69694f5) into develop (e8638e5) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@              Coverage Diff              @@
##             develop    #2101      +/-   ##
=============================================
+ Coverage      40.58%   40.59%   +0.01%     
  Complexity       975      975              
=============================================
  Files            309      309              
  Lines          11367    11369       +2     
  Branches        1519     1519              
=============================================
+ Hits            4613     4615       +2     
  Misses          6315     6315              
  Partials         439      439              
Files Changed Coverage Δ
...com/wire/android/mapper/UICallParticipantMapper.kt 93.33% <100.00%> (+0.47%) ⬆️
...wire/android/ui/calling/model/UICallParticipant.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 e8638e5...69694f5. Read the comment docs.

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1092 succeeded.

The build produced the following APK's:

@ohassine ohassine requested review from a team, typfel, alexandreferris, borichellow, MohamadJaara and Garzas and removed request for a team August 15, 2023 12:17
@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1099 succeeded.

The build produced the following APK's:

@AndroidBob
Copy link
Collaborator

Build 1099 failed.

@AndroidBob
Copy link
Collaborator

Build 1104 failed.

@AndroidBob
Copy link
Collaborator

Build 1110 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1112 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1122 succeeded.

The build produced the following APK's:

@AndroidBob
Copy link
Collaborator

Build 1122 failed.

@AndroidBob
Copy link
Collaborator

Build 1125 succeeded.

The build produced the following APK's:

@ohassine ohassine requested a review from saleniuk August 17, 2023 14:15
@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1169 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1170 succeeded.

The build produced the following APK's:

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 1175 succeeded.

The build produced the following APK's:

Copy link
Contributor

@Garzas Garzas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nicelly done ✅ Just one comment about tests

@@ -39,6 +39,7 @@ class UICallParticipantMapper @Inject constructor(
isCameraOn = participant.isCameraOn,
isSharingScreen = participant.isSharingScreen,
avatar = participant.avatarAssetId?.let { ImageAsset.UserAvatarAsset(wireSessionImageLoader, it) },
membership = userTypeMapper.toMembership(participant.userType)
membership = userTypeMapper.toMembership(participant.userType),
hasEstablishedAudio = participant.hasEstablishedAudio
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we write some test for it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's already tested in UICallParticipantMapperTest.kt

…ing_label_in_call

# Conflicts:
#	app/src/main/res/values/strings.xml
@AndroidBob
Copy link
Collaborator

Build 1238 succeeded.

The build produced the following APK's:

@@ -286,6 +288,7 @@ private fun UsernameTile(
hasEstablishedAudio: Boolean
) {
val color = if (isSpeaking) MaterialTheme.wireColorScheme.primary else Color.Black
val nameLabelColor = if (hasEstablishedAudio) Color.White else colorsScheme().secondaryText
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: maybe we should move all these hard-coded to the theme colors as well, they would just be the same for both light and dark mode, but it would ensure we have all colors in one place so if we decide to change one of them we wouldn't need to look for them in the whole project

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, not that simple by just changing the color in the file.. we need to check the whole project in all cases I would say especially for white and black

@ohassine ohassine added this pull request to the merge queue Aug 25, 2023
Merged via the queue into develop with commit 98a9f25 Aug 25, 2023
9 checks passed
@ohassine ohassine deleted the displaying_connecting_label_in_call branch August 25, 2023 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants