From 307081d04ba7e1e061f9d10df3752497e3c55f62 Mon Sep 17 00:00:00 2001
From: ialokim <ialokim@mailbox.org>
Date: Wed, 29 Sep 2021 23:20:53 +0200
Subject: [PATCH] apply IntelliJ formatter to whole project
---
build.gradle.kts | 2 +-
.../kotlin/org/briarproject/briar/desktop/BriarService.kt | 5 +----
.../kotlin/org/briarproject/briar/desktop/dialogs/Login.kt | 4 ++--
.../briar/desktop/paul/views/BriarUIStateManager.kt | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 484b175d76..5d7db6b857 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,7 +41,7 @@ tasks.test {
useTestNG()
}
-tasks.withType<KotlinCompile>() {
+tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
index 7927a28b9c..292758f814 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
@@ -123,10 +123,7 @@ constructor(
val dbKey = accountManager.databaseKey ?: throw AssertionError()
lifecycleManager.startServices(dbKey)
lifecycleManager.waitForStartup()
- val contacts = contactManager.getContacts()
- if (contacts.isEmpty()) {
- // todo: add some dummy account to db
- }
+ val contacts = contactManager.contacts
for (contact in contacts) {
println("${contact.author.name} (${contact.alias})")
this.contacts.add(contact)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt b/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt
index f422ca6d59..c895738ec9 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt
@@ -32,7 +32,7 @@ import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
-import androidx.compose.ui.res.svgResource
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
@@ -87,4 +87,4 @@ fun Login(
@Composable
fun BriarLogo(modifier: Modifier = Modifier.fillMaxWidth().clip(shape = RoundedCornerShape(400.dp))) =
- Image(svgResource("images/logo_circle.svg"), "Briar logo", modifier)
+ Image(painterResource("images/logo_circle.svg"), "Briar logo", modifier)
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 e9a558acaa..bf95431602 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
@@ -54,7 +54,7 @@ fun BriarUIStateManager(
// current settings state
val (setting, setSetting) = remember { mutableStateOf(0) }
// Other global state that we need to track should go here also
- Row() {
+ Row {
BriarSidebar(uiMode, setUiMode)
Divider(color = divider, modifier = Modifier.fillMaxHeight().width(1.dp))
when (uiMode) {
--
GitLab