From 62e95208b09fe8090e402cc6b13012daac49cabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 31 Aug 2023 11:33:11 +0200
Subject: [PATCH] Address code review
---
.../org/briarproject/briar/desktop/blog/HtmlText.kt | 2 ++
.../briar/desktop/blog/LinkClickedDialog.kt | 10 ++++++----
.../org/briarproject/briar/desktop/theme/Theme.kt | 1 -
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/HtmlText.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/HtmlText.kt
index ab2209c92e..b7871dd913 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/HtmlText.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/HtmlText.kt
@@ -174,12 +174,14 @@ fun HtmlText(
val strong = HtmlNode(start = { pushStyle(bold) })
val em = HtmlNode(start = { pushStyle(italic) })
+
fun pushHeader(style: TextStyle) {
pushStyle(style.toParagraphStyle())
pushStyle(style.toSpanStyle())
}
fun popHeader() {
+ // we push two styles above, so we need to pop twice
pop(); pop()
}
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/LinkClickedDialog.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/LinkClickedDialog.kt
index e516440c40..917b3f4291 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/LinkClickedDialog.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/LinkClickedDialog.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.AlertDialog
import androidx.compose.material.ButtonType
import androidx.compose.material.DialogButton
@@ -45,7 +46,7 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp
-import org.briarproject.briar.desktop.theme.codeBackground
+import org.briarproject.briar.desktop.theme.surfaceVariant
import org.briarproject.briar.desktop.ui.Tooltip
import org.briarproject.briar.desktop.utils.DesktopUtils.browseLinkIfSupported
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
@@ -88,9 +89,10 @@ fun LinkClickedDialog(
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text(i18n("link.warning.intro"))
Box(
- modifier = Modifier.background(MaterialTheme.colors.codeBackground).fillMaxWidth().clickable {
- clipboardManager.setText(AnnotatedString(link))
- }
+ modifier = Modifier.background(MaterialTheme.colors.surfaceVariant, RoundedCornerShape(4.dp))
+ .fillMaxWidth().clickable {
+ clipboardManager.setText(AnnotatedString(link))
+ }
) {
Text(
text = link,
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt
index 4bac66a878..8cde594dab 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/theme/Theme.kt
@@ -62,7 +62,6 @@ val Colors.passwordStrengthWeak: Color get() = Red500
val Colors.passwordStrengthMiddle: Color get() = if (isLight) Orange700 else Orange500
val Colors.passwordStrengthStrong: Color get() = if (isLight) Lime700 else Lime500
val Colors.tabs: Color get() = if (isLight) Color.White else materialDarkBg
-val Colors.codeBackground: Color get() = if (isLight) Gray100 else Gray800
val DarkColors = darkColors(
primary = Blue500,
--
GitLab