TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove slim outline color

Browse Source
This commit is contained in:
Andrew 2024-06-17 13:58:52 +09:30
parent a2cce441a8
commit 3a75f2a303
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt
View File

@ -116,8 +116,6 @@ data class OceanLight(override val primary: Color = primaryBlue): Colors {
override val qrCodeBackground = backgroundSecondary
}
val Colors.slimOutlineButton: Color get() = text
@Composable
fun Colors(name: String, colors: List<Color>) {
Column {

12
app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
View File

@ -163,21 +163,21 @@ fun Button(
Button(text, onClick, LocalColors.current.primary, ButtonType.Outline, modifier, enabled)
}
@Composable fun SlimOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, color: Color = LocalColors.current.slimOutlineButton, enabled: Boolean = true, content: @Composable () -> Unit) {
@Composable fun SlimOutlineButton(onClick: () -> Unit, modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, content: @Composable () -> Unit) {
Button(onClick, color, ButtonType.Outline, modifier, enabled, ButtonSize.Slim) { content() }
}
/**
* Courtesy [SlimOutlineButton] implementation for buttons that just display text.
*/
@Composable fun SlimOutlineButton(text: String, modifier: Modifier = Modifier, color: Color = LocalColors.current.slimOutlineButton, enabled: Boolean = true, onClick: () -> Unit) {
@Composable fun SlimOutlineButton(text: String, modifier: Modifier = Modifier, color: Color = LocalColors.current.text, enabled: Boolean = true, onClick: () -> Unit) {
Button(text, onClick, color, ButtonType.Outline, modifier, enabled, ButtonSize.Slim)
}
@Composable
fun SlimOutlineCopyButton(
modifier: Modifier = Modifier,
color: Color = LocalColors.current.slimOutlineButton,
color: Color = LocalColors.current.text,
onClick: () -> Unit
) {
OutlineCopyButton(modifier, ButtonSize.Slim, color, onClick)
@ -384,8 +384,10 @@ private fun VariousButtons(
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
PrimaryFillButton("Primary Fill") {}
OutlineButton(text = "Outline Button") {}
SlimOutlineButton(text = "Slim Outline") {}
OutlineButton("Outline Button") {}
SlimOutlineButton("Slim Outline") {}
SlimOutlineButton("Slim Primary", color = LocalColors.current.buttonOutline) {}
SlimOutlineButton("Slim Danger", color = LocalColors.current.danger) {}
SlimOutlineCopyButton {}
}
}