From 92f6a8ec15927a4869fb1fe52f779fc517801fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 7 Oct 2021 12:17:50 +0200
Subject: [PATCH] Some post-rebase fixes
---
.../org/briarproject/briar/desktop/paul/theme/Theme.kt | 2 +-
.../briarproject/briar/desktop/paul/views/BriarSidebar.kt | 6 ------
.../briar/desktop/paul/views/PrivateMessageView.kt | 1 -
.../briarproject/briar/desktop/paul/views/ProfileCircle.kt | 5 +++--
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/theme/Theme.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/theme/Theme.kt
index e9e9b049ba..50d99f0ad6 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/theme/Theme.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/theme/Theme.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
val Colors.divider: Color get() = if (isLight) Gray300 else Gray800
-val Colors.outline: Color get() = Color.White
+val Colors.outline: Color get() = if (isLight) Color.Black else Color.White
val Colors.surfaceVariant: Color get() = if (isLight) Gray100 else Gray950
val Colors.sidebarSurface: Color get() = if (isLight) Gray200 else Gray900
val Colors.selectedCard: Color get() = if (isLight) Gray400 else Gray700
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
index aae22ea21c..007b84da56 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
@@ -1,8 +1,5 @@
package org.briarproject.briar.desktop.paul.views
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.border
-import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
@@ -24,12 +21,9 @@ import androidx.compose.material.icons.filled.WifiTethering
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
import org.briarproject.briar.desktop.IM
-import org.briarproject.briar.desktop.paul.theme.briarBlack
-import org.briarproject.briar.desktop.paul.theme.briarBlue
import org.briarproject.briar.desktop.paul.theme.sidebarSurface
val SIDEBAR_WIDTH = 56.dp
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 b990f43f5f..fcadca087d 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
@@ -4,7 +4,6 @@ import androidx.compose.animation.core.animateDpAsState
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
-import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/ProfileCircle.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/ProfileCircle.kt
index 114cae55d4..ae8fd7c1de 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/ProfileCircle.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/ProfileCircle.kt
@@ -5,12 +5,13 @@ import androidx.compose.foundation.Canvas
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
+import org.briarproject.briar.desktop.paul.theme.outline
@Preview
@Composable
@@ -25,7 +26,7 @@ fun PreviewProfileCircle() {
@Composable
fun ProfileCircle(size: Dp, input: ByteArray) {
- Canvas(Modifier.size(size).clip(CircleShape).border(2.dp, Color.White, CircleShape)) {
+ Canvas(Modifier.size(size).clip(CircleShape).border(2.dp, MaterialTheme.colors.outline, CircleShape)) {
Identicon(input, this.size.width, this.size.height).draw(this)
}
}
--
GitLab