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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 89 commits into from
Closed

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

wants to merge 89 commits into from

Commits on Jun 5, 2023

  1. refactor: navigation - define destinations and pass arguments

    @saleniuk
    saleniuk committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    ebdda37 View commit details
    Browse the repository at this point in the history

  2. fix tests and remove unused imports

    @saleniuk
    saleniuk committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    2576ba8 View commit details
    Browse the repository at this point in the history

  3. remove unused mappers

    @saleniuk
    saleniuk committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    fe1d3a9 View commit details
    Browse the repository at this point in the history

  4. remove unused mappers

    @saleniuk
    saleniuk committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    9be7aee View commit details
    Browse the repository at this point in the history

  5. added some todos

    @saleniuk
    saleniuk committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    b4f1426 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …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
    @ohassine
    ohassine committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    859eb98 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …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
    @ohassine
    ohassine committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    657ad70 View commit details
    Browse the repository at this point in the history

  2. chore: kalium reference

    @ohassine
    ohassine committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    f4ed6dc View commit details
    Browse the repository at this point in the history

  3. chore: unit test

    @ohassine
    ohassine committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    75c6aea View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. refactor: remove NavigationItem dependencies and provide screen modes… 

    … [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
    @saleniuk
    saleniuk authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    9faaa34 View commit details
    Browse the repository at this point in the history

  2. refactor: navigate back with args (#1853) 

    * 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
    @ohassine
    ohassine authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    8e40955 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. refactor: fix broken unit test (WPB-360) (#1861) 

    * 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
    @ohassine
    ohassine authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    f640589 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. refactor: replace NavigationManager with Navigator - Part 1 [WPB-384] (… 

    …#1863)

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

* remove unused imports

* detekt issues

* changes after review
    @saleniuk
    saleniuk authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    5dab38d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. refactor: replace NavigationManager with Navigator - Part 2 [WPB-384] (… 

    …#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
    @saleniuk
    saleniuk authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    37cbec8 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. refactor: create nested graph for account creation (WPB-385) (#1864) 

    * 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
    @ohassine
    ohassine authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    5558d58 View commit details
    Browse the repository at this point in the history

  2. refactor: replace NavigationManager with Navigator - Part 3 [WPB-384] (… 

    …#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
    @saleniuk
    saleniuk authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    535fec3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. refactor: replace NavigationManager with Navigator - Part 4 [WPB-384] (… 

    …#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
    @saleniuk
    saleniuk authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9c86901 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. refactor: replace NavigationManager with Navigator - Part 5 - last [W… 

    …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]>
    @saleniuk @ohassine
    saleniuk and ohassine authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1281051 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

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

    * refactor nested navhosts on login and new conversation flows

* remove unused imports

* uncomment code, add description

* fix detekt
    @saleniuk
    saleniuk authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    b02763b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

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

    * refactor: nested navhost on home screen

* remove unused imports

* fix detekt

* change ExternalDirection to be more direct
    @saleniuk
    saleniuk authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    9f814ab View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Merge branch 'develop' into refactor/navigation_refactor_define_desti… 

    …nations
    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    f7099bb View commit details
    Browse the repository at this point in the history

  2. clean up after merge

    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    56f23eb View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …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
    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    b64626e View commit details
    Browse the repository at this point in the history

  4. clean up after merge

    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    bb393c2 View commit details
    Browse the repository at this point in the history

  5. clean up after merge

    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    29a29c4 View commit details
    Browse the repository at this point in the history

  6. fix test

    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    75feb5a View commit details
    Browse the repository at this point in the history

  7. fix detekt

    @saleniuk
    saleniuk committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    d9f0c97 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …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
    saleniuk committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    759b3ce View commit details
    Browse the repository at this point in the history

  2. fixes after merge

    @saleniuk
    saleniuk committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    9ede365 View commit details
    Browse the repository at this point in the history

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

    …on_refactor_define_destinations'
    @saleniuk
    saleniuk committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    a225fa1 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    47bf707 View commit details
    Browse the repository at this point in the history

  5. fix detekt

    @saleniuk
    saleniuk committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    d8f79a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    1d055a2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    72e98c5 View commit details
    Browse the repository at this point in the history

  3. fix issues found by regression tests

    @saleniuk
    saleniuk committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    42c0dc2 View commit details
    Browse the repository at this point in the history

  4. fix detekt issues

    @saleniuk
    saleniuk committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    899ad1d View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. avoid duplicate navigation

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    dd09f19 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/create/common/CreateAccountBaseViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/create/personalaccount/CreatePersonalAccountViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/create/team/CreateTeamViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesViewModel.kt
#	app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/LoginViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/create/username/CreateAccountUsernameViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/authentication/welcome/WelcomeViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/calling/OngoingCallViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/calling/SharedCallingViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/calling/initiating/InitiatingCallViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/common/topappbar/CommonTopAppBarViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/home/conversations/details/editselfdeletingmessages/EditSelfDeletingMessagesViewModelTest.kt
#	app/src/test/kotlin/com/wire/android/ui/settings/devices/SelfDevicesViewModelTest.kt
    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f5647c4 View commit details
    Browse the repository at this point in the history

  3. fixes after merge

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ec89c3e View commit details
    Browse the repository at this point in the history

  4. fixes after merge

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b902bc6 View commit details
    Browse the repository at this point in the history

  5. fixes after merge

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    d8d4745 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModel.kt
#	app/src/test/kotlin/com/wire/android/ui/home/conversations/call/ConversationCallViewModelTest.kt
    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6db4baf View commit details
    Browse the repository at this point in the history

  7. fix detekt

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6eb4fc8 View commit details
    Browse the repository at this point in the history

  8. fix test

    @saleniuk
    saleniuk committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    84e655c View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    0e4c01a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into refactor/navigation_refactor_define_desti… 

    …nations
    @vitorhugods
    vitorhugods authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    2e02a1d View commit details
    Browse the repository at this point in the history

  3. changes after review

    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    7a101d1 View commit details
    Browse the repository at this point in the history

  4. remove unused imports

    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    c4bc12e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    af07d98 View commit details
    Browse the repository at this point in the history

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

    …ine_destinations' into refactor/navigation_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    5722cbe View commit details
    Browse the repository at this point in the history

  7. fix stuck on initial sync screen

    @saleniuk
    saleniuk committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    7ffbbd3 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. fix blank screen after call is closed

    @saleniuk
    saleniuk committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    6a34100 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    d5771fd View commit details
    Browse the repository at this point in the history

  3. trigger build

    @saleniuk
    saleniuk committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    6bdd0dc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
#	app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt
    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    1fb6242 View commit details
    Browse the repository at this point in the history

  2. fix: unblock test if navigations happen too fast

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    69e29ec View commit details
    Browse the repository at this point in the history

  3. pull navigation out of the WireActivityViewModel

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    1841db1 View commit details
    Browse the repository at this point in the history

  4. fix navigation

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    5ec9d79 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    415dda6 View commit details
    Browse the repository at this point in the history

  6. detekt

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    5efc4aa View commit details
    Browse the repository at this point in the history

  7. detekt

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    3d0ab44 View commit details
    Browse the repository at this point in the history

  8. detekt

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    b771c5f View commit details
    Browse the repository at this point in the history

  9. detekt

    @saleniuk
    saleniuk committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    7add364 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/navigation/NavigationUtils.kt
#	app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
#	app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt
#	app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt
#	app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt
#	gradle/libs.versions.toml
    @saleniuk
    saleniuk committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d8cb5aa View commit details
    Browse the repository at this point in the history

  2. fixes after merge

    @saleniuk
    saleniuk committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    05f4859 View commit details
    Browse the repository at this point in the history

  3. detekt

    @saleniuk
    saleniuk committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    710efc6 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    802ad42 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModel.kt
#	app/src/test/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModelArrangement.kt
#	app/src/test/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModelTest.kt
    @saleniuk
    saleniuk committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    a8250c8 View commit details
    Browse the repository at this point in the history

  2. chore: bump version to 4.4.0

    @mchenani
    mchenani committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    398b709 View commit details
    Browse the repository at this point in the history

  3. feat: Inform user about degraded conversation verification status (WP… 

    …D-573) (#1989)
    @borichellow
    borichellow authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    925b4b2 View commit details
    Browse the repository at this point in the history

  4. chore: update kalium with java 17 and jenv to 17.0 (#1999) 

    Co-authored-by: Jakub Żerko <[email protected]>
Co-authored-by: Vitor Hugo Schwaab <[email protected]>
    @github-actions @Garzas @vitorhugods
    3 people authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    798c219 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. fixes after lib updates

    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    de3b65a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/navigatio… 

    …n_refactor_define_destinations
    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    eaa7e21 View commit details
    Browse the repository at this point in the history

  3. fix ExceptionInInitializerError

    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    fd6714c View commit details
    Browse the repository at this point in the history

  4. trigger build

    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d1becfb View commit details
    Browse the repository at this point in the history

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

    …/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    350dc21 View commit details
    Browse the repository at this point in the history

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

    …/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    1bc120e View commit details
    Browse the repository at this point in the history

  7. revert versionName

    @saleniuk
    saleniuk committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    2cd94ae View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. fix: issues found during the playtest

    @saleniuk
    saleniuk committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    35d35e4 View commit details
    Browse the repository at this point in the history

  2. fix: issues found during the playtest

    @saleniuk
    saleniuk committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    19019a7 View commit details
    Browse the repository at this point in the history

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

    …/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    aebd632 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. remove dismissing keyguard

    @saleniuk
    saleniuk committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    133a3e2 View commit details
    Browse the repository at this point in the history

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

    …/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    e1ba2da View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

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

    …fine_destinations_RC
    @Garzas
    Garzas authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    1e90727 View commit details
    Browse the repository at this point in the history

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

    …/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    22e7689 View commit details
    Browse the repository at this point in the history

  3. fix: navigate back when group is deleted

    @saleniuk
    saleniuk committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    a557fd1 View commit details
    Browse the repository at this point in the history

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

    …ine_destinations_RC' into refactor/navigation_refactor_define_destinations_RC
    @saleniuk
    saleniuk committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    da686cd View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. fix: double navigateBack when user deletes a group

    @saleniuk
    saleniuk committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    5914075 View commit details
    Browse the repository at this point in the history

  2. fix: detekt issue

    @saleniuk
    saleniuk committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    30fee10 View commit details
    Browse the repository at this point in the history