TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-20 21:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OutlineButton disabled state

Browse Source
This commit is contained in:
Andrew 2024-06-12 14:27:52 +09:30
parent 6df63b034c
commit 204993397f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,8 @@ const val oceanLight7 = 0xffFCFFFF
val session_accent = Color(0xFF31F196) val session_accent = Color(0xFF31F196)
val ocean_accent = Color(0xff57C9FA) val ocean_accent = Color(0xff57C9FA)
val Colors.disabled @Composable get() = onSurface.copy(alpha = ContentAlpha.disabled)
val oceanLights = arrayOf(oceanLight0, oceanLight1, oceanLight2, oceanLight3, oceanLight4, oceanLight5, oceanLight6, oceanLight7) val oceanLights = arrayOf(oceanLight0, oceanLight1, oceanLight2, oceanLight3, oceanLight4, oceanLight5, oceanLight6, oceanLight7)
val oceanDarks = arrayOf(oceanDark0, oceanDark1, oceanDark2, oceanDark3, oceanDark4, oceanDark5, oceanDark6, oceanDark7) val oceanDarks = arrayOf(oceanDark0, oceanDark1, oceanDark2, oceanDark3, oceanDark4, oceanDark5, oceanDark6, oceanDark7)
val classicLights = arrayOf(classicLight0, classicLight1, classicLight2, classicLight3, classicLight4, classicLight5, classicLight6) val classicLights = arrayOf(classicLight0, classicLight1, classicLight2, classicLight3, classicLight4, classicLight5, classicLight6)

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

@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.ui.LocalButtonColor
import org.thoughtcrime.securesms.ui.baseBold import org.thoughtcrime.securesms.ui.baseBold
import org.thoughtcrime.securesms.ui.colorDestructive import org.thoughtcrime.securesms.ui.colorDestructive
import org.thoughtcrime.securesms.ui.contentDescription import org.thoughtcrime.securesms.ui.contentDescription
import org.thoughtcrime.securesms.ui.disabled
import org.thoughtcrime.securesms.ui.extraSmall import org.thoughtcrime.securesms.ui.extraSmall
val LocalButtonSize = staticCompositionLocalOf { mediumButton } val LocalButtonSize = staticCompositionLocalOf { mediumButton }
@ -103,7 +104,7 @@ fun OutlineButton(
enabled = enabled, enabled = enabled,
interactionSource = interactionSource, interactionSource = interactionSource,
onClick = onClick, onClick = onClick,
border = BorderStroke(1.dp, LocalButtonColor.current), border = BorderStroke(1.dp, if (enabled) LocalButtonColor.current else MaterialTheme.colors.disabled),
colors = ButtonDefaults.outlinedButtonColors( colors = ButtonDefaults.outlinedButtonColors(
contentColor = if (enabled) LocalButtonColor.current else Color.Unspecified, contentColor = if (enabled) LocalButtonColor.current else Color.Unspecified,
backgroundColor = Color.Unspecified backgroundColor = Color.Unspecified