Skip to content
This repository was archived by the owner on Aug 7, 2024. It is now read-only.

Commit 67a4d5b

Browse files
authored
Merge pull request #25 from ricknout/develop
Update Compose to 1.0.0-alpha05
2 parents 22573ee + b9c3d1c commit 67a4d5b

File tree

2 files changed

+4
-4
lines changed
  • buildSrc/src/main/java/com/google/android/material/composethemeadapter
  • lib/src/main/java/com/google/android/material/composethemeadapter

2 files changed

+4
-4
lines changed

buildSrc/src/main/java/com/google/android/material/composethemeadapter/dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object Libs {
4747
val snapshotUrl: String
4848
get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
4949

50-
private const val version = "1.0.0-alpha04"
50+
private const val version = "1.0.0-alpha05"
5151

5252
const val runtime = "androidx.compose.runtime:runtime:$version"
5353
const val foundation = "androidx.compose.foundation:foundation:${version}"

lib/src/main/java/com/google/android/material/composethemeadapter/TypedArrayUtils.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ internal fun textStyleFromTextAppearance(
6868
setTextColors -> {
6969
a.getComposeColor(R.styleable.ComposeThemeAdapterTextAppearance_android_textColor)
7070
}
71-
else -> Color.Unset
71+
else -> Color.Unspecified
7272
},
7373
fontSize = a.getTextUnit(R.styleable.ComposeThemeAdapterTextAppearance_android_textSize, density),
7474
lineHeight = run {
@@ -107,7 +107,7 @@ internal fun textStyleFromTextAppearance(
107107
fontFeatureSettings = a.getString(R.styleable.ComposeThemeAdapterTextAppearance_android_fontFeatureSettings),
108108
shadow = run {
109109
val shadowColor = a.getComposeColor(R.styleable.ComposeThemeAdapterTextAppearance_android_shadowColor)
110-
if (shadowColor != Color.Unset) {
110+
if (shadowColor != Color.Unspecified) {
111111
val dx = a.getFloat(R.styleable.ComposeThemeAdapterTextAppearance_android_shadowDx, 0f)
112112
val dy = a.getFloat(R.styleable.ComposeThemeAdapterTextAppearance_android_shadowDy, 0f)
113113
val rad = a.getFloat(R.styleable.ComposeThemeAdapterTextAppearance_android_shadowRadius, 0f)
@@ -176,7 +176,7 @@ private val tempTypedValue = ThreadLocal<TypedValue>()
176176

177177
internal fun TypedArray.getComposeColor(
178178
index: Int,
179-
fallbackColor: Color = Color.Unset
179+
fallbackColor: Color = Color.Unspecified
180180
): Color = if (hasValue(index)) Color(getColorOrThrow(index)) else fallbackColor
181181

182182
/**

0 commit comments

Comments
 (0)