diff --git a/build.gradle.kts b/build.gradle.kts index 484b175d7642a583fd0a40b69f01d0e92e4dfbf6..5d7db6b8576f060c64f7d3bdb8e729100ddc020f 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 7927a28b9c693bbcb126012f44724be9553d10c2..292758f8140a2de57f9d57d5811d0f0618116a62 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 f422ca6d596aa5ceea4fe8b353b7c3d61ae3d047..c895738ec93d322a583a7e514b44631e68d3aaa3 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 e9a558acaa058b4f7da2060af784a67e11cf3ce7..bf954316027b18a8f5a3f49a5227a330c94c9108 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) {