From 324f963298d4fc8c9afd0493f59d24cfe980c9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 12 Oct 2021 12:25:14 +0200
Subject: [PATCH] Fix package names and organize imports
---
.../org/briarproject/briar/desktop/BriarDesktopApp.kt | 1 +
.../kotlin/org/briarproject/briar/desktop/DesktopModule.kt | 2 ++
.../briarproject/briar/desktop/contact/AddContactDialog.kt | 4 ++--
.../org/briarproject/briar/desktop/contact/ContactCard.kt | 6 +++---
.../briar/desktop/contact/ContactDrawerMakeIntro.kt | 4 ++--
.../briarproject/briar/desktop/contact/ContactDropDown.kt | 2 +-
.../briarproject/briar/desktop/contact/ContactInfoDrawer.kt | 1 -
.../org/briarproject/briar/desktop/contact/ContactList.kt | 2 +-
.../briarproject/briar/desktop/contact/SearchTextField.kt | 2 +-
.../desktop/conversation/ChatHistoryConversationVisitor.kt | 2 +-
.../briarproject/briar/desktop/conversation/ChatState.kt | 4 ++--
.../briarproject/briar/desktop/conversation/Conversation.kt | 2 +-
.../briar/desktop/conversation/ConversationHeader.kt | 2 ++
.../briar/desktop/conversation/ConversationInput.kt | 1 +
.../briar/desktop/conversation/PrivateMessageView.kt | 3 +++
.../briarproject/briar/desktop/conversation/TextBubbles.kt | 1 +
.../briarproject/briar/desktop/navigation/BriarSidebar.kt | 4 ++--
.../kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt | 3 +--
.../org/briarproject/briar/desktop/ui/HorizontalDivider.kt | 2 +-
src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt | 2 +-
.../kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt | 3 +--
.../org/briarproject/briar/desktop/ui/VerticalDivider.kt | 2 +-
.../org/briarproject/briar/desktop/BriarDesktopTestApp.kt | 1 +
.../org/briarproject/briar/desktop/DesktopTestModule.kt | 2 ++
24 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
index d4dcded3a9..e3c0014457 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarDesktopApp.kt
+++ b/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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 7a55917cd2..b84cad4021 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
index ec879bd3c4..2d2f5ae5b0 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/AddContactDialog.kt
@@ -1,4 +1,4 @@
-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)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
index 9af1d64f1f..e66b885351 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactCard.kt
@@ -1,4 +1,4 @@
-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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
index fcb166e915..f8885da16c 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDrawerMakeIntro.kt
@@ -1,4 +1,4 @@
-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) {
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
index caaf8fad7d..9740a14c63 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactDropDown.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
index 6c8ec6e06e..99f247b2d9 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactInfoDrawer.kt
+++ b/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 {
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
index b25092841f..ef1d1a5a11 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactList.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
index 824ef78bc1..29542dd7d0 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/SearchTextField.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.contact
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.fillMaxSize
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt
index 18f19329c8..4163d16c74 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatHistoryConversationVisitor.kt
+++ b/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)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt
index 316df7dc31..e996fd1518 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ChatState.kt
+++ b/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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt
index 92c5988d81..71f0cd34e0 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/Conversation.kt
+++ b/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(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt
index 0372dce4d2..c8c45f0e05 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationHeader.kt
+++ b/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(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt
index 8864a041bc..54eef33b66 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationInput.kt
+++ b/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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt
index 6ab00cf560..929c3f0762 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageView.kt
+++ b/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(
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt
index d8e157a418..8d3f73fc5e 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/TextBubbles.kt
+++ b/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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
index f91bcf5008..60c1614b7b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/navigation/BriarSidebar.kt
@@ -1,4 +1,4 @@
-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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
index e44791b91f..5fa8ea0d60 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/BriarUi.kt
@@ -1,4 +1,4 @@
-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
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
index eca9e54199..f9eea9fccf 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/HorizontalDivider.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material.Divider
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
index 95323440b8..0cfb9434ca 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/Loader.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
index deb9801ddf..9a27637bbe 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/MainScreen.kt
@@ -12,9 +12,8 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import org.briarproject.briar.desktop.contact.ContactsViewModel
import org.briarproject.briar.desktop.conversation.PrivateMessageView
-import org.briarproject.briar.desktop.conversation.VerticalDivider
+import org.briarproject.briar.desktop.navigation.BriarSidebar
import org.briarproject.briar.desktop.settings.PlaceHolderSettingsView
-import org.briarproject.briar.desktop.views.BriarSidebar
/*
* This is the root of the tree, all state is held here and passed down to stateless composables, which render the UI
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt b/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
index dc710e6434..c58948e566 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/ui/VerticalDivider.kt
@@ -1,4 +1,4 @@
-package org.briarproject.briar.desktop.conversation
+package org.briarproject.briar.desktop.ui
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.width
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt b/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
index 7265ea9904..04210dd0cc 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/BriarDesktopTestApp.kt
@@ -10,6 +10,7 @@ import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.BriarCoreModule
import org.briarproject.briar.api.test.TestDataCreator
import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreator
+import org.briarproject.briar.desktop.ui.BriarUi
import java.security.SecureRandom
import javax.inject.Singleton
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index dde9e5483f..2253d22162 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -27,6 +27,8 @@ import org.briarproject.bramble.util.OsUtils.isMac
import org.briarproject.briar.api.test.TestAvatarCreator
import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreator
import org.briarproject.briar.desktop.testdata.DeterministicTestDataCreatorImpl
+import org.briarproject.briar.desktop.ui.BriarUi
+import org.briarproject.briar.desktop.ui.BriarUiImpl
import org.briarproject.briar.test.TestModule
import java.io.File
import java.util.Collections.emptyList
--
GitLab