Make bottomsheets into destinations

[Rawa]

---

This change is 

[linear]

DROID-1197 Make BottomSheet proper destination

[Rawa]

Reviewable status: 0 of 19 files reviewed, 1 unresolved discussion

---

android/app/build.gradle.kts line 386 at r1 (raw file):

configurations.all {
    resolutionStrategy {
        force("androidx.navigation:navigation-compose:2.8.0-beta05")

Should be removed before any merge

[Pururun]

Removing and adding locations to the list does not seems to trigger a toast with an undo. As far as I can tell the required code for that is missing?

Otherwise nice work 👍

Reviewed 13 of 19 files at r1, all commit messages.
Reviewable status: 13 of 19 files reviewed, 9 unresolved discussions (waiting on @Rawa)

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt line 43 at r1 (raw file):

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MullvadModalBottomSheet(sheetContent: @Composable ColumnScope.() -> Unit) {

Since this is not a bottom sheet anymore, this should called MullbadBottomSheetContent or something

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListEntrySheetViewModel.kt line 19 at r1 (raw file):

import net.mullvad.mullvadvpn.viewmodel.CustomListEntrySheetSideEffect.GenericError

data class CustomListEntrySheetUiState(

Not sure if it is universal but ui states are usually in it's own file?

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListEntrySheetViewModel.kt line 23 at r1 (raw file):

)

sealed interface CustomListEntrySheetSideEffect {

Side effects are usually at the bottom?

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListSheetViewModel.kt line 13 at r1 (raw file):

import net.mullvad.mullvadvpn.lib.model.CustomListName

data class CustomListSheetUiState(

See above

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListSheetViewModel.kt line 18 at r1 (raw file):

)

sealed interface CustomListSheetSideEffect {

See above

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ImportOverridesViewModel.kt line 10 at r1 (raw file):

import net.mullvad.mullvadvpn.repository.RelayOverridesRepository

data class ImportOverridesSheetUiState(val overridesActive: Boolean)

See above

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LocationSheetViewModel.kt line 24 at r1 (raw file):

import net.mullvad.mullvadvpn.usecase.customlists.CustomListsRelayItemUseCase

sealed interface LocationUiState {

See above

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LocationSheetViewModel.kt line 37 at r1 (raw file):

data class CustomListEntry(val customList: RelayItem.CustomList, val canAdd: Boolean)

sealed interface LocationSideEffect {

See above

[Rawa]

Ah, this was a small mistake on my end, I've fixed it now :)

Reviewable status: 8 of 23 files reviewed, 9 unresolved discussions (waiting on @Pururun)

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListEntrySheetViewModel.kt line 19 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Not sure if it is universal but ui states are usually in it's own file?

Yeah it should. Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListEntrySheetViewModel.kt line 23 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Side effects are usually at the bottom?

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListSheetViewModel.kt line 13 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListSheetViewModel.kt line 18 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LocationSheetViewModel.kt line 24 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LocationSheetViewModel.kt line 37 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt line 43 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Since this is not a bottom sheet anymore, this should called MullbadBottomSheetContent or something

Done.

---

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ImportOverridesViewModel.kt line 10 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above

Done.

[Pururun]

Reviewed 16 of 16 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion

[Pururun]

Reviewed 7 of 7 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion

[Pururun]

Closing this since there is no support or replacement for ModalBottomSheetLayout in material 3. We can look into this in the future if there is a way to have bottomsheets being destinations that is supported by material 3.