Skip to content

Commit dc9711a

Browse files
committed
Minor UI code changes
1 parent 57d3ba0 commit dc9711a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Shrine/app/src/main/java/com/authentication/shrine/ui/common/ShrineButton.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ fun ShrineButton(
6262
usePrimaryColor: Boolean = true,
6363
isButtonEnabled: Boolean = true,
6464
shape: Shape = ButtonShape,
65-
border: BorderStroke? = null,
6665
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
6766
) {
6867
val isDarkTheme = isSystemInDarkTheme()

Shrine/app/src/main/java/com/authentication/shrine/ui/common/ShrineClickableText.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.foundation.text.BasicText
1919
import androidx.compose.material3.MaterialTheme
2020
import androidx.compose.runtime.Composable
2121
import androidx.compose.ui.Modifier
22+
import androidx.compose.ui.graphics.takeOrElse
2223
import androidx.compose.ui.text.LinkAnnotation
2324
import androidx.compose.ui.text.SpanStyle
2425
import androidx.compose.ui.text.TextLinkStyles
@@ -64,6 +65,6 @@ fun ShrineClickableText(
6465
BasicText(
6566
modifier = modifier,
6667
text = annotatedText,
67-
style = textStyle.copy(color = MaterialTheme.colorScheme.onBackground),
68+
style = textStyle.copy(color = textStyle.color.takeOrElse { MaterialTheme.colorScheme.onSurface }),
6869
)
6970
}

0 commit comments

Comments
 (0)