Skip to content

Commit 050f33e

Browse files
authored
feat(button): remove background for minimal buttons in loading state (#995)
1 parent c6b08cb commit 050f33e

File tree

43 files changed

+4
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4
-5
lines changed

core/src/main/java/com/orange/ouds/core/component/OudsButton.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ import com.orange.ouds.core.extensions.collectInteractionStateAsState
6565
import com.orange.ouds.core.theme.LocalColorMode
6666
import com.orange.ouds.core.theme.LocalThemeSettings
6767
import com.orange.ouds.core.theme.OudsTheme
68-
import com.orange.ouds.core.theme.isOudsInDarkTheme
6968
import com.orange.ouds.core.theme.takeUnlessHairline
7069
import com.orange.ouds.core.theme.value
7170
import com.orange.ouds.core.utilities.CheckedContent
@@ -483,11 +482,11 @@ private fun backgroundColor(appearance: OudsButtonAppearance, state: OudsButtonS
483482
}.value
484483
OudsButtonAppearance.Minimal -> when (state) {
485484
OudsButtonState.Enabled,
486-
OudsButtonState.Disabled -> Color.Transparent
485+
OudsButtonState.Disabled,
486+
OudsButtonState.Loading -> Color.Transparent
487487
OudsButtonState.Focused -> colorBgMinimalFocus.value
488488
OudsButtonState.Hovered -> colorBgMinimalHover.value
489489
OudsButtonState.Pressed -> colorBgMinimalPressed.value
490-
OudsButtonState.Loading -> if (isOudsInDarkTheme()) OudsTheme.colorScheme.repository.opacity.black.higher else OudsTheme.colorScheme.repository.opacity.white.higher
491490
}
492491
OudsButtonAppearance.Strong -> when (state) {
493492
OudsButtonState.Enabled -> colorBgStrongEnabled
@@ -514,11 +513,11 @@ private fun backgroundColor(appearance: OudsButtonAppearance, state: OudsButtonS
514513
}.value
515514
OudsButtonAppearance.Minimal -> when (state) {
516515
OudsButtonState.Enabled,
517-
OudsButtonState.Disabled -> Color.Transparent
516+
OudsButtonState.Disabled,
517+
OudsButtonState.Loading -> Color.Transparent
518518
OudsButtonState.Focused -> colorBgMinimalFocus.value
519519
OudsButtonState.Hovered -> colorBgMinimalHover.value
520520
OudsButtonState.Pressed -> colorBgMinimalPressed.value
521-
OudsButtonState.Loading -> OudsTheme.colorScheme.action.support.loading
522521
}
523522
OudsButtonAppearance.Strong -> when (state) {
524523
OudsButtonState.Enabled -> OudsTheme.colorScheme.action.enabled
7.05 KB
7.44 KB
5.63 KB
7.1 KB
7.66 KB
5.98 KB
6.47 KB
6.84 KB
5.27 KB

0 commit comments

Comments
 (0)