Fix package names and organize imports

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

@@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons
 import org.briarproject.bramble.BrambleCoreModule
 import org.briarproject.briar.BriarCoreEagerSingletons
 import org.briarproject.briar.BriarCoreModule
+import org.briarproject.briar.desktop.ui.BriarUi
 import java.security.SecureRandom
 import javax.inject.Singleton
 

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

@@ -24,6 +24,8 @@ import org.briarproject.bramble.system.DesktopSecureRandomModule
 import org.briarproject.bramble.system.JavaSystemModule
 import org.briarproject.bramble.util.OsUtils.isLinux
 import org.briarproject.bramble.util.OsUtils.isMac
+import org.briarproject.briar.desktop.ui.BriarUi
+import org.briarproject.briar.desktop.ui.BriarUiImpl
 import java.io.File
 import java.nio.file.Path
 import java.util.Collections.emptyList

src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -29,7 +29,7 @@ import org.briarproject.bramble.api.db.ContactExistsException
 import org.briarproject.bramble.api.db.PendingContactExistsException
 import org.briarproject.bramble.api.identity.AuthorConstants
 import org.briarproject.bramble.util.StringUtils
-import org.briarproject.briar.desktop.CTM
+import org.briarproject.briar.desktop.ui.CTM
 import java.security.GeneralSecurityException
 
 @OptIn(ExperimentalMaterialApi::class)

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.clickable
@@ -20,12 +20,12 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
-import org.briarproject.briar.desktop.CVM
-import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.outline
 import org.briarproject.briar.desktop.theme.selectedCard
 import org.briarproject.briar.desktop.theme.surfaceVariant
+import org.briarproject.briar.desktop.ui.CVM
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 import org.briarproject.briar.desktop.utils.TimeUtils.getFormattedTimestamp
 
 @Composable

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -31,8 +31,8 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
-import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Composable
 fun ContactDrawerMakeIntro(contact: Contact, contacts: List<Contact>, setInfoDrawer: (Boolean) -> Unit) {

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt

@@ -3,7 +3,6 @@ package org.briarproject.briar.desktop.contact
 import androidx.compose.runtime.Composable
 import org.briarproject.bramble.api.contact.Contact
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState.MakeIntro
-import org.briarproject.briar.desktop.conversation.ContactDrawerMakeIntro
 
 // Right drawer state
 enum class ContactInfoDrawerState {

src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight

src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize

src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt

@@ -27,7 +27,7 @@ class ChatHistoryConversationVisitor(
         private val LOG = Logger.getLogger(ChatHistoryConversationVisitor::class.java.name)
     }
 
-    fun appendMessage(header: ConversationMessageHeader) {
+    private fun appendMessage(header: ConversationMessageHeader) {
         try {
             val messageText = messagingManager.getMessageText(header.id)
             chat.appendMessage(header.isLocal, header.timestamp, messageText)

src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt

@@ -7,8 +7,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import org.briarproject.bramble.api.contact.ContactId
 import org.briarproject.briar.api.conversation.ConversationMessageHeader
-import org.briarproject.briar.desktop.CVM
-import org.briarproject.briar.desktop.MM
+import org.briarproject.briar.desktop.ui.CVM
+import org.briarproject.briar.desktop.ui.MM
 import org.briarproject.briar.desktop.ui.UiState
 import java.util.Collections
 

src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt

@@ -25,9 +25,9 @@ import androidx.compose.ui.unit.dp
 import org.briarproject.bramble.api.contact.Contact
 import org.briarproject.briar.desktop.contact.ContactInfoDrawer
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState
+import org.briarproject.briar.desktop.navigation.SIDEBAR_WIDTH
 import org.briarproject.briar.desktop.theme.surfaceVariant
 import org.briarproject.briar.desktop.ui.Constants.CONTACTLIST_WIDTH
-import org.briarproject.briar.desktop.views.SIDEBAR_WIDTH
 
 @Composable
 fun Conversation(

src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt

@@ -20,9 +20,11 @@ import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.bramble.api.contact.Contact
+import org.briarproject.briar.desktop.contact.ContactDropDown
 import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.outline
 import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Composable
 fun ConversationHeader(

src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.briarproject.briar.desktop.theme.DarkColors
+import org.briarproject.briar.desktop.ui.HorizontalDivider
 
 @Preview
 @Composable

src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt

@@ -9,8 +9,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import org.briarproject.bramble.api.contact.Contact
+import org.briarproject.briar.desktop.contact.AddContactDialog
 import org.briarproject.briar.desktop.contact.ContactInfoDrawerState.MakeIntro
+import org.briarproject.briar.desktop.contact.ContactList
 import org.briarproject.briar.desktop.contact.ContactsViewModel
+import org.briarproject.briar.desktop.ui.VerticalDivider
 
 @Composable
 fun PrivateMessageView(

src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
+import org.briarproject.briar.desktop.ui.Loader
 import org.briarproject.briar.desktop.ui.UiState
 
 @Composable

src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt

-package org.briarproject.briar.desktop.views
+package org.briarproject.briar.desktop.navigation
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -23,9 +23,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
-import org.briarproject.briar.desktop.IM
 import org.briarproject.briar.desktop.contact.ProfileCircle
 import org.briarproject.briar.desktop.theme.sidebarSurface
+import org.briarproject.briar.desktop.ui.IM
 import org.briarproject.briar.desktop.ui.UiMode
 
 val SIDEBAR_WIDTH = 56.dp

src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt

-package org.briarproject.briar.desktop
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.compositionLocalOf
@@ -21,7 +21,6 @@ import org.briarproject.briar.desktop.login.LoginViewModel
 import org.briarproject.briar.desktop.login.Registration
 import org.briarproject.briar.desktop.login.RegistrationViewModel
 import org.briarproject.briar.desktop.theme.BriarTheme
-import org.briarproject.briar.desktop.ui.MainScreen
 import java.awt.Dimension
 import java.util.logging.Logger
 import javax.annotation.concurrent.Immutable

src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Divider

src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt

-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth