Skip to content

Commit 4fad3d8

Browse files
HarlonWangclaude
andcommitted
chore: 清掉 Storage 的多余转换与 Builtins 里已能智能转换的 !!
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 1037db4 commit 4fad3d8

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎compose/src/commonMain/kotlin/app/tinyui/Storage.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import kotlinx.coroutines.SupervisorJob
1111
import kotlinx.coroutines.delay
1212
import kotlinx.coroutines.launch
1313
import kotlinx.serialization.json.Json
14-
import kotlinx.serialization.json.JsonElement
1514
import kotlinx.serialization.json.JsonObject
1615
import kotlinx.serialization.json.jsonObject
1716
import okio.FileSystem
@@ -88,7 +87,7 @@ internal class PackageStorage(private val fs: FileSystem, private val file: Path
8887
try {
8988
file.parent?.let { fs.createDirectories(it) }
9089
val tmp = file.parent!! / "${file.name}.tmp"
91-
val json = JsonObject(map.mapValues { Json.parseToJsonElement(it.value) as JsonElement }).toString()
90+
val json = JsonObject(map.mapValues { Json.parseToJsonElement(it.value) }).toString()
9291
fs.write(tmp) { writeUtf8(json) }
9392
fs.atomicMove(tmp, file)
9493
} catch (e: Exception) {

‎compose/src/commonMain/kotlin/app/tinyui/components/Builtins.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,20 @@ private fun weightOf(child: UINode): Float? = (child.props["weight"] as? Double)
133133
private fun verticalArrangement(justify: String?, gap: Dp?): Arrangement.Vertical {
134134
val spaced = gap != null && gap > 0.dp
135135
return when (justify) {
136-
"center" -> if (spaced) Arrangement.spacedBy(gap!!, Alignment.CenterVertically) else Arrangement.Center
137-
"end" -> if (spaced) Arrangement.spacedBy(gap!!, Alignment.Bottom) else Arrangement.Bottom
136+
"center" -> if (spaced) Arrangement.spacedBy(gap, Alignment.CenterVertically) else Arrangement.Center
137+
"end" -> if (spaced) Arrangement.spacedBy(gap, Alignment.Bottom) else Arrangement.Bottom
138138
"spaceBetween" -> Arrangement.SpaceBetween
139-
else -> if (spaced) Arrangement.spacedBy(gap!!) else Arrangement.Top
139+
else -> if (spaced) Arrangement.spacedBy(gap) else Arrangement.Top
140140
}
141141
}
142142

143143
private fun horizontalArrangement(justify: String?, gap: Dp?): Arrangement.Horizontal {
144144
val spaced = gap != null && gap > 0.dp
145145
return when (justify) {
146-
"center" -> if (spaced) Arrangement.spacedBy(gap!!, Alignment.CenterHorizontally) else Arrangement.Center
147-
"end" -> if (spaced) Arrangement.spacedBy(gap!!, Alignment.End) else Arrangement.End
146+
"center" -> if (spaced) Arrangement.spacedBy(gap, Alignment.CenterHorizontally) else Arrangement.Center
147+
"end" -> if (spaced) Arrangement.spacedBy(gap, Alignment.End) else Arrangement.End
148148
"spaceBetween" -> Arrangement.SpaceBetween
149-
else -> if (spaced) Arrangement.spacedBy(gap!!) else Arrangement.Start
149+
else -> if (spaced) Arrangement.spacedBy(gap) else Arrangement.Start
150150
}
151151
}
152152

0 commit comments

Comments
 (0)