BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-07 19:14:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: move solidColor to Extension

Browse Source
This commit is contained in:
fankesyooni
2023-11-17 21:19:29 +08:00
parent ae13d4a575
commit 1326c74492
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/TextField.kt
View File

@@ -62,6 +62,7 @@ import com.highcapable.flexiui.LocalShapes
import com.highcapable.flexiui.LocalSizes
import com.highcapable.flexiui.utils.borderOrNot
import com.highcapable.flexiui.utils.orElse
import com.highcapable.flexiui.utils.solidColor
import com.highcapable.flexiui.utils.status
// TODO: Preset text boxes (password text box, text box with delete button, etc.)
@@ -328,6 +329,4 @@ private fun defaultTextFieldInactiveBorder() = BorderStroke(LocalSizes.current.b
@Composable
@ReadOnlyComposable
private fun defaultTextFieldActiveBorder() = BorderStroke(LocalSizes.current.borderSizePrimary, LocalColors.current.themePrimary)
private val BorderStroke.solidColor get() = (brush as? SolidColor?)?.value ?: Color.Unspecified
private fun defaultTextFieldActiveBorder() = BorderStroke(LocalSizes.current.borderSizePrimary, LocalColors.current.themePrimary)

6
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt
View File

@@ -21,7 +21,9 @@
*/
package com.highcapable.flexiui.utils
import androidx.compose.foundation.BorderStroke
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.isSpecified
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
@@ -31,4 +33,6 @@ internal fun Dp.orElse() = if (isSpecified) this else null
internal fun Color.orElse() = if (isSpecified) this else null
internal fun TextUnit.orElse() = if (isSpecified) this else null
internal fun TextUnit.orElse() = if (isSpecified) this else null
internal val BorderStroke.solidColor get() = (brush as? SolidColor?)?.value ?: Color.Unspecified