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

refactor: remove rememberRipple, unify calling icon buttons #2998

Merged
merged 5 commits into from
May 15, 2024

Conversation

saleniuk
Copy link
Contributor


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

When updating compose version, there were some problems with rememberRipple as it has been updated/changed in the compose library. Having custom ripples set in the app may lead to some wrong colors chosen for the indication or ripple not covering or going beyond the element if the shape is not correct.

Solutions

Removed all rememberRipple in the app, instead rely on the default indication type and colour based on the theme.
Added ripple colors to button color scheme to enable setting different ripple colors for different button states in the theme.
Unified all calling icon buttons so that they are consistent, have correct types, reuse the same elements and are in line with designs.
Fixed previews and added some more where missing.

Testing

How to Test

Open calling screens and click on round calling icon buttons.


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.

Copy link
Contributor

github-actions bot commented May 10, 2024

Test Results

928 tests  ±0   928 ✅ ±0   14m 48s ⏱️ + 4m 41s
123 suites ±0     0 💤 ±0 
123 files   ±0     0 ❌ ±0 

Results for commit 6cfb5c9. ± Comparison against base commit 24769c4.

♻️ This comment has been updated with latest results.

@saleniuk saleniuk requested review from a team, typfel, borichellow, mchenani, Garzas and ohassine and removed request for a team May 10, 2024 17:01
@codecov-commenter
Copy link

codecov-commenter commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 44.15%. Comparing base (24769c4) to head (6cfb5c9).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2998      +/-   ##
===========================================
+ Coverage    44.00%   44.15%   +0.14%     
===========================================
  Files          447      447              
  Lines        14547    14548       +1     
  Branches      2497     2498       +1     
===========================================
+ Hits          6402     6423      +21     
+ Misses        7451     7424      -27     
- Partials       694      701       +7     

see 3 files with indirect coverage changes


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 24769c4...6cfb5c9. Read the comment docs.

Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 4718 succeeded.

The build produced the following APK's:

…nify-calling-buttons

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/CameraButton.kt
#	app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/CameraFlipButton.kt
#	app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/DeclineButton.kt
#	app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/MicrophoneButton.kt
#	app/src/main/kotlin/com/wire/android/ui/calling/controlbuttons/SpeakerButton.kt
#	app/src/main/kotlin/com/wire/android/ui/common/AppExtensions.kt
Copy link

sonarcloud bot commented May 15, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.7% Duplication on New Code

See analysis details on SonarCloud

Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator

Build 4762 succeeded.

The build produced the following APK's:

@saleniuk saleniuk added this pull request to the merge queue May 15, 2024
Merged via the queue into develop with commit 0cd5009 May 15, 2024
13 checks passed
@saleniuk saleniuk deleted the refactor/fix-and-unify-calling-buttons branch May 15, 2024 18:21
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.

5 participants