refactor: app navigation - compose destinations [RC] [WPB-360] #2005

saleniuk · 2023-07-25T10:59:02Z

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

Our navigation is complex, not easy to understand how things work and to make any additional changes, and it’s very difficult to find possible errors. This is also because of the limitations of the standard compose navigation, which works using routes that are intended to be url-like, so there is no type-safety and passing arguments backwards is complicated.

Solutions

We refactored the navigation to use the Compose Destinations library, which is an overlay on the Official Jetpack Compose Navigation, which allows us to hide the complex, boilerplate code and use type-safe parameters and make the whole navigation graph and process easier and more readable.

Testing

How to Test

The whole navigation in the app should work as before (or even better).

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.

…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 <[email protected]>

* 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

…nations

…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

…on_refactor_define_destinations'

github-actions · 2023-07-25T11:37:51Z

Test Results

500 tests 499 ✔️ 5m 10s ⏱️
  75 suites     1 💤
  75 files     0 ❌

Results for commit 30fee10.

♻️ This comment has been updated with latest results.

github-actions · 2023-07-25T11:37:53Z

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

AndroidBob · 2023-07-25T11:41:42Z

Build 662 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7131658)(7131658)-staging-compat.apk

…/navigation_refactor_define_destinations_RC

github-actions · 2023-07-26T15:16:10Z

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

AndroidBob · 2023-07-26T15:32:38Z

Build 715 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7141665)(7141665)-staging-compat.apk

…/navigation_refactor_define_destinations_RC

AndroidBob · 2023-07-28T14:15:33Z

Build 760 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7158499)(7158499)-staging-compat.apk

github-actions · 2023-07-28T15:06:50Z

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

…fine_destinations_RC

github-actions · 2023-08-01T06:58:38Z

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

AndroidBob · 2023-08-01T07:13:49Z

Build 785 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7190526)(7190526)-staging-compat.apk

…/navigation_refactor_define_destinations_RC

…ine_destinations_RC' into refactor/navigation_refactor_define_destinations_RC

github-actions · 2023-08-01T15:27:08Z

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

AndroidBob · 2023-08-01T15:52:08Z

Build 808 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7193609)(7193609)-staging-compat.apk

github-actions · 2023-08-02T12:27:25Z

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

AndroidBob · 2023-08-02T13:24:28Z

Build 836 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7201353)(7201353)-staging-compat.apk

saleniuk · 2023-08-10T12:09:21Z

Closing it as we decided not to merge it to RC 4.3.x, only to develop 4.4.x

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

refactor: navigation - define destinations and pass arguments

ebdda37

fix tests and remove unused imports

2576ba8

remove unused mappers

fe1d3a9

remove unused mappers

9be7aee

added some todos

b4f1426

chore: kalium reference

f4ed6dc

chore: unit test

75c6aea

refactor: navigate back with args (#1853)

8e40955

* 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: replace NavigationManager with Navigator - Part 1 [WPB-384] (…

5dab38d

…#1863) * refactor: replace NavigationManager with Navigator in AccountSwitchUseCase, WireActivity and WelcomeScreen * remove unused imports * detekt issues * changes after review

refactor: login and new conversation nested graphs [WPB-385] (#1893)

b02763b

* refactor nested navhosts on login and new conversation flows * remove unused imports * uncomment code, add description * fix detekt

refactor: nested navigation graph on home screen [WPB-385] (#1897)

9f814ab

* refactor: nested navhost on home screen * remove unused imports * fix detekt * change ExternalDirection to be more direct

Merge branch 'develop' into refactor/navigation_refactor_define_desti…

f7099bb

…nations

clean up after merge

56f23eb

clean up after merge

bb393c2

clean up after merge

29a29c4

fix test

75feb5a

fix detekt

d9f0c97

fixes after merge

9ede365

Merge remote-tracking branch 'origin/develop' into 'refactor/navigati…

a225fa1

…on_refactor_define_destinations'

tmspzz requested review from borichellow, MohamadJaara and Garzas July 25, 2023 11:16

saleniuk added 3 commits July 26, 2023 16:17

fix: issues found during the playtest

35d35e4

fix: issues found during the playtest

19019a7

Merge remote-tracking branch 'origin/release/candidate' into refactor…

aebd632

…/navigation_refactor_define_destinations_RC

saleniuk added 2 commits July 28, 2023 15:36

remove dismissing keyguard

133a3e2

Merge remote-tracking branch 'origin/release/candidate' into refactor…

e1ba2da

…/navigation_refactor_define_destinations_RC

Merge branch 'release/candidate' into refactor/navigation_refactor_de…

1e90727

…fine_destinations_RC

saleniuk added 3 commits August 1, 2023 16:53

Merge remote-tracking branch 'origin/release/candidate' into refactor…

22e7689

…/navigation_refactor_define_destinations_RC

fix: navigate back when group is deleted

a557fd1

Merge remote-tracking branch 'origin/refactor/navigation_refactor_def…

da686cd

…ine_destinations_RC' into refactor/navigation_refactor_define_destinations_RC

saleniuk added 2 commits August 2, 2023 13:50

fix: double navigateBack when user deletes a group

5914075

fix: detekt issue

30fee10

saleniuk closed this Aug 10, 2023

saleniuk deleted the refactor/navigation_refactor_define_destinations_RC branch January 23, 2024 15:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: app navigation - compose destinations [RC] [WPB-360] #2005

refactor: app navigation - compose destinations [RC] [WPB-360] #2005

saleniuk commented Jul 25, 2023

github-actions bot commented Jul 25, 2023 •

edited

Loading

github-actions bot commented Jul 25, 2023

AndroidBob commented Jul 25, 2023

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

AndroidBob commented Jul 28, 2023

github-actions bot commented Jul 28, 2023

github-actions bot commented Aug 1, 2023

AndroidBob commented Aug 1, 2023

github-actions bot commented Aug 1, 2023

AndroidBob commented Aug 1, 2023

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

saleniuk commented Aug 10, 2023

refactor: app navigation - compose destinations [RC] [WPB-360] #2005

refactor: app navigation - compose destinations [RC] [WPB-360] #2005

Conversation

saleniuk commented Jul 25, 2023

PR Submission Checklist for internal contributors

What's new in this PR?

Issues

Solutions

Testing

How to Test

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

github-actions bot commented Jul 25, 2023 • edited Loading

Test Results

github-actions bot commented Jul 25, 2023

AndroidBob commented Jul 25, 2023

github-actions bot commented Jul 26, 2023

AndroidBob commented Jul 26, 2023

AndroidBob commented Jul 28, 2023

github-actions bot commented Jul 28, 2023

github-actions bot commented Aug 1, 2023

AndroidBob commented Aug 1, 2023

github-actions bot commented Aug 1, 2023

AndroidBob commented Aug 1, 2023

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

saleniuk commented Aug 10, 2023

github-actions bot commented Jul 25, 2023 •

edited

Loading