fixed UiModes capitalization, readded Screen enum to seperate Login from Main views

src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt

@@ -24,11 +24,15 @@ 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
 
+enum class Screen {
+    LOGIN,
+    MAIN
+}
+
 interface BriarService {
     @Composable
     fun start(
@@ -84,11 +88,11 @@ constructor(
         messagingManager: MessagingManager
     ) {
         val title = "Briar Desktop"
-        var screenState by remember { mutableStateOf(uiModes.Login) }
+        var screenState by remember { mutableStateOf(Screen.LOGIN) }
         Window(title = title) {
             MaterialTheme(colors = DarkColorPallet) {
                 when (val screen = screenState) {
-                    uiModes.Login ->
+                    Screen.LOGIN ->
                         Login(
                             "Briar",
                             modifier = Modifier.background(briarBlack),
@@ -96,7 +100,7 @@ constructor(
                                 try {
                                     accountManager.signIn(it)
                                     signedIn()
-                                    screenState = uiModes.Contacts
+                                    screenState = Screen.MAIN
                                 } catch (e: DecryptionException) {
                                     // failure, try again
                                 }

src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt

@@ -33,7 +33,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack
 import org.briarproject.briar.desktop.paul.theme.briarBlue
 
 @Composable
-fun BriarSidebar(uiMode: uiModes, setUiMode: (uiModes) -> Unit) {
+fun BriarSidebar(uiMode: UiModes, setUiMode: (UiModes) -> Unit) {
     Surface(modifier = Modifier.width(56.dp).fillMaxHeight(), color = briarBlue) {
         Column(verticalArrangement = Arrangement.Top) {
             IconButton(
@@ -51,25 +51,25 @@ fun BriarSidebar(uiMode: uiModes, setUiMode: (uiModes) -> Unit) {
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Contacts,
+                UiModes.CONTACTS,
                 Icons.Filled.Contacts
             )
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Groups,
+                UiModes.GROUPS,
                 Icons.Filled.Group
             )
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Forums,
+                UiModes.FORUMS,
                 Icons.Filled.Forum
             )
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Blogs,
+                UiModes.BLOGS,
                 Icons.Filled.ChromeReaderMode
             )
         }
@@ -77,19 +77,19 @@ fun BriarSidebar(uiMode: uiModes, setUiMode: (uiModes) -> Unit) {
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Transports,
+                UiModes.TRANSPORTS,
                 Icons.Filled.WifiTethering
             )
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.Settings,
+                UiModes.SETTINGS,
                 Icons.Filled.Settings
             )
             BriarSidebarButton(
                 uiMode = uiMode,
                 setUiMode = setUiMode,
-                uiModes.SignOut,
+                UiModes.SIGNOUT,
                 Icons.Filled.Logout
             )
         }
@@ -97,7 +97,7 @@ fun BriarSidebar(uiMode: uiModes, setUiMode: (uiModes) -> Unit) {
 }
 
 @Composable
-fun BriarSidebarButton(uiMode: uiModes, setUiMode: (uiModes) -> Unit, thisMode: uiModes, icon: ImageVector) {
+fun BriarSidebarButton(uiMode: UiModes, setUiMode: (UiModes) -> Unit, thisMode: UiModes, icon: ImageVector) {
     val bg = if (uiMode == thisMode) briarBlack else briarBlue
     Column {
         IconButton(

src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt

@@ -19,15 +19,14 @@ import org.briarproject.bramble.api.contact.Contact
 import org.briarproject.briar.desktop.paul.theme.briarBlack
 import org.briarproject.briar.desktop.paul.theme.divider
 
-enum class uiModes {
-    Login,
-    Contacts,
-    Groups,
-    Forums,
-    Blogs,
-    Transports,
-    Settings,
-    SignOut
+enum class UiModes {
+    CONTACTS,
+    GROUPS,
+    FORUMS,
+    BLOGS,
+    TRANSPORTS,
+    SETTINGS,
+    SIGNOUT
 }
 
 /*
@@ -40,7 +39,7 @@ fun BriarUIStateManager(
     contacts: List<Contact>
 ) {
     // current selected mode, changed using the sidebar buttons
-    val (uiMode, setUiMode) = remember { mutableStateOf(uiModes.Contacts) }
+    val (uiMode, setUiMode) = remember { mutableStateOf(UiModes.CONTACTS) }
     // TODO Figure out how to handle accounts with 0 contacts
     // current selected contact
     val (contact, setContact) = remember { mutableStateOf(contact(contacts)) }
@@ -59,7 +58,7 @@ fun BriarUIStateManager(
         BriarSidebar(uiMode, setUiMode)
         Divider(color = divider, modifier = Modifier.fillMaxHeight().width(1.dp))
         when (uiMode) {
-            uiModes.Contacts -> if (contact != null) PrivateMessageView(
+            UiModes.CONTACTS -> if (contact != null) PrivateMessageView(
                 contact,
                 contacts,
                 setContact