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

chore: replace deprecated pager #2050

Merged
merged 95 commits into from
Aug 3, 2023
Merged

chore: replace deprecated pager #2050

merged 95 commits into from
Aug 3, 2023

Conversation

ohassine
Copy link
Member

@ohassine ohassine commented Aug 3, 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?

Issues

Pager layouts from accompanist is deprecated.

Solutions

Replace it with the newer one in compose.foundation

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
  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.

saleniuk and others added 30 commits June 5, 2023 17:41
…n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesViewModel.kt
#	app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt
…n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/debug/dev/DevDebugViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsItem.kt
#	app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt
… [WPB-360] (#1856)

* refactor: current screen observers to use Routes instead of NavigationItems

* remove unused function

* fixes after merge

* fixed detekt issues

* fixed detekt issues

* fixed detekt issues

* fix tests

* fix detekt issues
* refactor: navigate back with args

* chore: kalium reference

* chore: kalium reference

* chore: address comments

* chore: cleanup

* chore: detekt

* chore: detekt

* chore: fix broken unit test

* chore: address comment

* chore: address comments
* refactor: navigate back with args

* chore: kalium reference

* chore: kalium reference

* chore: address comments

* chore: cleanup

* chore: detekt

* chore: detekt

* chore: fix broken unit test

* chore: address comment

* chore: fix broken unit test

* chore: cleanup

* chore: cleanup

* chore: cleanup

* chore: fix wrong navigation

* chore: fix broken unit test

* chore: detekt

* chore: fix broken unit test

* fix: exclude build sub folders

* chore: detekt

* chore: detekt

* chore: detekt

* chore(detekt): exclude build folder

* chore: address comments

* chore: remove unused imports

* chore: detekt config
…#1863)

* refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen

* remove unused imports

* detekt issues

* changes after review
…#1866)

* refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen

* remove unused imports

* detekt issues

* changes after review

* refactor: replace NavigationManager with Navigator

* removed unused code

* removed unused code

* refactor: replace NavigationManager with Navigator

* refactor: replace NavigationManager with Navigator

* detekt issues

* fix tests

* clean up code

* fix detekt
* refactor: navigate back with args

* chore: kalium reference

* chore: kalium reference

* chore: address comments

* chore: cleanup

* chore: detekt

* chore: detekt

* chore: fix broken unit test

* chore: address comment

* chore: fix broken unit test

* chore: cleanup

* chore: cleanup

* chore: cleanup

* chore: fix wrong navigation

* chore: fix broken unit test

* chore: detekt

* chore: fix broken unit test

* fix: exclude build sub folders

* chore: detekt

* chore: detekt

* chore: detekt

* chore(detekt): exclude build folder

* chore: address comments

* chore: remove unused imports

* chore: detekt config

* refactor: create nestedGraph for account creation

* refactor: cleanup

* chore: cleanup

* chore: clean up

* chore: resolve conflicts
…#1883)

* refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen

* remove unused imports

* detekt issues

* changes after review

* refactor: replace NavigationManager with Navigator

* removed unused code

* removed unused code

* refactor: replace NavigationManager with Navigator

* refactor: replace NavigationManager with Navigator

* detekt issues

* fix tests

* clean up code

* fix detekt

* refactor: replace NavigationManager with Navigator

* removed unused imports

* change lambdas in inits into states

* detekt and tests fixes

* fix detekt

* change after review

* trigger build
…#1887)

* refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen

* remove unused imports

* detekt issues

* changes after review

* refactor: replace NavigationManager with Navigator

* removed unused code

* removed unused code

* refactor: replace NavigationManager with Navigator

* refactor: replace NavigationManager with Navigator

* detekt issues

* fix tests

* clean up code

* fix detekt

* refactor: replace NavigationManager with Navigator

* removed unused imports

* change lambdas in inits into states

* detekt and tests fixes

* fix detekt

* refactor: replace NavigationManager with Navigator

* remove unused imports

* change after review

* trigger build

* fix detekt issues

* fix tests
…PB-384] (#1889)

* refactor: navigate back with args

* chore: kalium reference

* chore: kalium reference

* chore: address comments

* chore: cleanup

* chore: detekt

* chore: detekt

* chore: fix broken unit test

* chore: address comment

* chore: fix broken unit test

* chore: cleanup

* chore: cleanup

* chore: cleanup

* chore: fix wrong navigation

* chore: fix broken unit test

* chore: detekt

* chore: fix broken unit test

* fix: exclude build sub folders

* chore: detekt

* chore: detekt

* chore: detekt

* chore(detekt): exclude build folder

* chore: address comments

* chore: remove unused imports

* chore: detekt config

* refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen

* remove unused imports

* detekt issues

* refactor: create nestedGraph for account creation

* refactor: cleanup

* chore: cleanup

* changes after review

* refactor: replace NavigationManager with Navigator

* removed unused code

* removed unused code

* refactor: replace NavigationManager with Navigator

* refactor: replace NavigationManager with Navigator

* detekt issues

* fix tests

* clean up code

* fix detekt

* refactor: replace NavigationManager with Navigator

* removed unused imports

* chore: clean up

* chore: resolve conflicts

* change lambdas in inits into states

* detekt and tests fixes

* fix detekt

* refactor: replace NavigationManager with Navigator

* remove unused imports

* change opening incoming call screen to rely on full screen intent, fix screen modes

* fixes after code analysis

* replace NavigationManager with Navigator on account creation screens

* remove unused imports

* fix detekt issues

---------

Co-authored-by: Oussama <oussama.has100@gmail.com>
* refactor nested navhosts on login and new conversation flows

* remove unused imports

* uncomment code, add description

* fix detekt
* refactor: nested navhost on home screen

* remove unused imports

* fix detekt

* change ExternalDirection to be more direct
…n_refactor_define_destinations

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountViewModel.kt
…n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/calling/ongoing/OngoingCallViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/settings/account/MyAccountViewModel.kt
#	app/src/test/kotlin/com/wire/android/ui/calling/OngoingCallViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/home/settings/account/MyAccountViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/home/sync/FeatureFlagNotificationViewModelTest.kt
saleniuk and others added 17 commits July 27, 2023 12:24
…n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/newconversation/NewConversationRouter.kt
#	app/src/main/kotlin/com/wire/android/ui/home/newconversation/NewConversationViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/newconversation/newgroup/NewGroupScreen.kt
#	app/src/test/kotlin/com/wire/android/ui/home/newconversation/NewConversationViewModelTest.kt
…n_refactor_define_destinations

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

# Conflicts:
#	app/src/main/kotlin/com/wire/android/util/CurrentScreenManager.kt
…n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt
# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchPeopleRouter.kt
#	app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt
@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

Test Results

506 tests  ±0   505 ✔️ ±0   5m 13s ⏱️ +13s
  76 suites ±0       1 💤 ±0 
  76 files   ±0       0 ±0 

Results for commit e6ea1e1. ± Comparison against base commit 64a9ff5.

♻️ This comment has been updated with latest results.

@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Merging #2050 (e6ea1e1) into develop (cc0a12b) will increase coverage by 0.35%.
Report is 1 commits behind head on develop.
The diff coverage is 30.46%.

@@              Coverage Diff              @@
##             develop    #2050      +/-   ##
=============================================
+ Coverage      38.64%   39.00%   +0.35%     
- Complexity       899      909      +10     
=============================================
  Files            288      301      +13     
  Lines          11409    11135     -274     
  Branches        1473     1492      +19     
=============================================
- Hits            4409     4343      -66     
+ Misses          6575     6368     -207     
+ Partials         425      424       -1     
Files Changed Coverage Δ
...ire/android/services/PersistentWebSocketService.kt 0.00% <ø> (ø)
...rc/main/kotlin/com/wire/android/ui/WireActivity.kt 0.00% <0.00%> (ø)
...tication/create/code/CreateAccountCodeViewModel.kt 0.00% <0.00%> (ø)
...on/create/details/CreateAccountDetailsViewModel.kt 0.00% <0.00%> (ø)
...cation/create/email/CreateAccountEmailViewModel.kt 0.00% <0.00%> (ø)
.../create/overview/CreateAccountOverviewViewModel.kt 0.00% <0.00%> (ø)
...tion/create/summary/CreateAccountSummaryNavArgs.kt 0.00% <0.00%> (ø)
...on/create/summary/CreateAccountSummaryViewModel.kt 0.00% <0.00%> (ø)
...entication/devices/remove/RemoveDeviceViewModel.kt 0.00% <0.00%> (ø)
...roid/ui/authentication/welcome/WelcomeViewModel.kt 0.00% <0.00%> (-86.05%) ⬇️
... and 90 more

... and 2 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 64a9ff5...e6ea1e1. Read the comment docs.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

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

@AndroidBob
Copy link
Collaborator

Build 862 succeeded.

The build produced the following APK's:

@ohassine ohassine added this pull request to the merge queue Aug 3, 2023
Merged via the queue into develop with commit 5d8ad2e Aug 3, 2023
13 checks passed
@ohassine ohassine deleted the deprecated_pager branch August 3, 2023 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
6 participants