diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt index d687df5a2b7a1cf8df5a780444f8ab5835f5ed4f..883a6e84c791c2128e64d8598b77bce319338b4c 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/Chat.kt @@ -25,5 +25,4 @@ class Chat { val author = String.format("%s (%s): ", name, formatter.format(dateTime)) messages.add(SimpleMessage(local, author, messageText!!, "time", true)) } - -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt index 1983c8a8705aa223a05bb178e461c2afea2b1e0d..b65cf985c2ccf010f870dcf31d8729b31b3cdd3d 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/ChatHistoryConversationVisitor.kt @@ -65,7 +65,8 @@ class ChatHistoryConversationVisitor( override fun visitIntroductionRequest(r: IntroductionRequest): Void? { chat.appendMessage( - r.isLocal, r.timestamp, String.format( + r.isLocal, r.timestamp, + String.format( "You received an introduction request! Username: %s, Message: %s", r.name, r.text ) @@ -94,5 +95,4 @@ class ChatHistoryConversationVisitor( } return null } - -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt index 32205bfb2d0fa0ce569563d8c8f1b6cf8834e9bb..a2b4b680e183ca5ec573f49661a882b649461a05 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/ConversationMessageHeaderComparator.kt @@ -10,5 +10,4 @@ class ConversationMessageHeaderComparator : Comparator<ConversationMessageHeader ): Int { return h1.timestamp.compareTo(h2.timestamp) } - -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt b/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt index e787fc238c01ae88a7fbf613fa85a9875810ab07..996727a4f146ebc8029d8b2ba8ce868642d03883 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/chat/UiState.kt @@ -4,4 +4,4 @@ sealed class UiState<out T> { object Loading : UiState<Nothing>() data class Success<out T>(val data: T) : UiState<T>() data class Error(val exception: Exception) : UiState<Nothing>() -} \ No newline at end of file +} 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 4088522fe3f5dae930e9574998b6d0bf6ff6e500..e0b9c0c40275bb3f7d44c7a69acf43b5982f42d2 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 @@ -13,8 +13,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import org.briarproject.bramble.api.contact.Contact -import org.briarproject.briar.api.conversation.ConversationManager -import org.briarproject.briar.api.messaging.MessagingManager import org.briarproject.briar.desktop.paul.theme.briarBlack /* diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt index 11649262c0c4db282fdaabeb12abce6bacad434a..65971e55ea823c382d19d4906ffb1f4f721b64c8 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt @@ -74,7 +74,6 @@ import org.briarproject.briar.desktop.paul.theme.divider import org.briarproject.briar.desktop.paul.theme.lightGray import java.util.Collections - val HEADER_SIZE = 66.dp @Composable @@ -206,9 +205,11 @@ fun ContactCard(selContact: MutableState<Contact>, contact: Contact) { } Row( modifier = Modifier.fillMaxWidth().height(HEADER_SIZE).background(bgColor) - .clickable(onClick = { - selContact.value = contact - }), + .clickable( + onClick = { + selContact.value = contact + } + ), horizontalArrangement = Arrangement.SpaceBetween ) { Row(modifier = Modifier.align(Alignment.CenterVertically).padding(horizontal = 16.dp)) { @@ -426,4 +427,4 @@ fun ChatState(id: ContactId): MutableState<UiState<Chat>> { } return state -} \ No newline at end of file +}