diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt index cf74433ba4a990e274cf8ecf72c0ae9a9185997a..194b8adffc7bf86cac4d2ec0825d86c7ac255f38 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt @@ -24,6 +24,7 @@ import org.briarproject.briar.desktop.dialogs.Registration import org.briarproject.briar.desktop.paul.theme.DarkColorPallet import org.briarproject.briar.desktop.paul.theme.briarBlack import org.briarproject.briar.desktop.paul.views.BriarUIStateManager +import org.briarproject.briar.desktop.paul.views.uiModes import javax.annotation.concurrent.Immutable import javax.inject.Inject import javax.inject.Singleton @@ -83,11 +84,11 @@ constructor( messagingManager: MessagingManager ) { val title = "Briar Desktop" - var screenState by remember { mutableStateOf<Screen>(Screen.Login) } + var screenState by remember { mutableStateOf(uiModes.Login) } Window(title = title) { MaterialTheme(colors = DarkColorPallet) { when (val screen = screenState) { - is Screen.Login -> + uiModes.Login -> Login( "Briar", modifier = Modifier.background(briarBlack), @@ -95,14 +96,14 @@ constructor( try { accountManager.signIn(it) signedIn() - screenState = Screen.Main + screenState = uiModes.Contacts } catch (e: DecryptionException) { // failure, try again } } ) - is Screen.Main -> + else -> CompositionLocalProvider( CM provides conversationManager, MM provides messagingManager diff --git a/src/main/kotlin/org/briarproject/briar/desktop/Screen.kt b/src/main/kotlin/org/briarproject/briar/desktop/Screen.kt deleted file mode 100644 index aeeb1c87f5aacc41c4e160b0f8f57fb1a7c4fd9e..0000000000000000000000000000000000000000 --- a/src/main/kotlin/org/briarproject/briar/desktop/Screen.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.briarproject.briar.desktop - -sealed class Screen { - object Login : Screen() - object Main : Screen() -} diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt index d38405e52b6d98ac91ceec176e15cb59d6df9a89..bb4448425045a0107f48c08002682875a372d8c4 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt @@ -20,6 +20,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack import org.briarproject.briar.desktop.paul.theme.divider enum class uiModes { + Login, Contacts, Groups, Forums,