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 ab2209c92e312242fa28375c13cbf2a0d8f438f3..b7871dd913baac54135b81d6ae14f3c8ef690ac0 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 e516440c40ae66fa70f68933e2f313151d44f5d2..917b3f4291f00f1ea709e8154f6c8ced98a5d0d1 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 4bac66a878e51560969fff77beebf5d74cd7f621..8cde594dab99b31a82525080fd8ea5071fef55b4 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,