diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt index c96cd5a45913f6add92abffd7fa0cd8e11793007..cf74433ba4a990e274cf8ecf72c0ae9a9185997a 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt @@ -1,6 +1,7 @@ package org.briarproject.briar.desktop import androidx.compose.desktop.Window +import androidx.compose.foundation.background import androidx.compose.material.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -9,6 +10,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier import org.briarproject.bramble.api.account.AccountManager import org.briarproject.bramble.api.contact.Contact import org.briarproject.bramble.api.contact.ContactManager @@ -20,6 +22,7 @@ import org.briarproject.briar.api.messaging.MessagingManager import org.briarproject.briar.desktop.dialogs.Login import org.briarproject.briar.desktop.dialogs.Registration import org.briarproject.briar.desktop.paul.theme.DarkColorPallet +import org.briarproject.briar.desktop.paul.theme.briarBlack import org.briarproject.briar.desktop.paul.views.BriarUIStateManager import javax.annotation.concurrent.Immutable import javax.inject.Inject @@ -87,6 +90,7 @@ constructor( is Screen.Login -> Login( "Briar", + modifier = Modifier.background(briarBlack), onResult = { try { accountManager.signIn(it) 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 2da6d8aa6d56fe03aceebf3e3840b645d1f6f2b2..3c38112bd31749e77fb58fa8c96850fffd5c3169 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/dialogs/Login.kt @@ -1,7 +1,6 @@ package org.briarproject.briar.desktop.dialogs import androidx.compose.foundation.Image -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -24,17 +23,17 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.svgResource import androidx.compose.ui.unit.dp -import org.briarproject.briar.desktop.paul.theme.briarBlack // TODO: Error handling @Composable fun Login( title: String, + modifier: Modifier = Modifier, onResult: (result: String) -> Unit ) = // All the changes in this file are be temporary -Paul, just changing colors so I can see the button and text field Column( - modifier = Modifier.padding(16.dp).fillMaxSize().background(briarBlack), + modifier = modifier.padding(16.dp).fillMaxSize(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally ) {