File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
Shrine/app/src/main/java/com/authentication/shrine/ui/common Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,6 @@ fun ShrineButton(
62
62
usePrimaryColor : Boolean = true,
63
63
isButtonEnabled : Boolean = true,
64
64
shape : Shape = ButtonShape ,
65
- border : BorderStroke ? = null,
66
65
interactionSource : MutableInteractionSource = remember { MutableInteractionSource () },
67
66
) {
68
67
val isDarkTheme = isSystemInDarkTheme()
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ import androidx.compose.foundation.text.BasicText
19
19
import androidx.compose.material3.MaterialTheme
20
20
import androidx.compose.runtime.Composable
21
21
import androidx.compose.ui.Modifier
22
+ import androidx.compose.ui.graphics.takeOrElse
22
23
import androidx.compose.ui.text.LinkAnnotation
23
24
import androidx.compose.ui.text.SpanStyle
24
25
import androidx.compose.ui.text.TextLinkStyles
@@ -64,6 +65,6 @@ fun ShrineClickableText(
64
65
BasicText (
65
66
modifier = modifier,
66
67
text = annotatedText,
67
- style = textStyle.copy(color = MaterialTheme .colorScheme.onBackground ),
68
+ style = textStyle.copy(color = textStyle.color.takeOrElse { MaterialTheme .colorScheme.onSurface } ),
68
69
)
69
70
}
You can’t perform that action at this time.
0 commit comments