Skip to content

Commit 9b4acd8

Browse files
committed
fix: restore whitespace in legacy files, remove fragile asset type guessing
Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering)
1 parent e357a6b commit 9b4acd8

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,13 @@ class HybridRiveFile : HybridRiveFileSpec() {
9999
override fun getEnums(): Array<RiveEnumDefinition> {
100100
val file = riveFile ?: return emptyArray()
101101
return try {
102-
file.enums.map { enum ->
103-
RiveEnumDefinition(
104-
name = enum.name,
105-
values = enum.values.toTypedArray()
106-
)
107-
}.toTypedArray()
102+
file.enums
103+
.map { enum ->
104+
RiveEnumDefinition(
105+
name = enum.name,
106+
values = enum.values.toTypedArray()
107+
)
108+
}.toTypedArray()
108109
} catch (e: NoSuchMethodError) {
109110
throw UnsupportedOperationException("getEnums requires rive-android SDK with enums support")
110111
}

ios/legacy/HybridRiveFile.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ class HybridRiveFile: HybridRiveFileSpec, RiveViewSource {
3030
view.refreshAfterAssetChange()
3131
}
3232
}
33-
33+
3434
var viewModelCount: Double? {
3535
guard let count = riveFile?.viewModelCount else { return nil }
3636
return Double(count)
3737
}
38-
38+
3939
func viewModelByIndex(index: Double) throws -> (any HybridViewModelSpec)? {
4040
guard let vm = riveFile?.viewModel(at: UInt(index)) else { return nil }
4141
return HybridViewModel(viewModel: vm)
4242
}
43-
43+
4444
func viewModelByName(name: String) throws -> (any HybridViewModelSpec)? {
4545
guard let vm = riveFile?.viewModelNamed(name) else { return nil }
4646
return HybridViewModel(viewModel: vm)
4747
}
48-
48+
4949
func defaultArtboardViewModel(artboardBy: ArtboardBy?) throws -> (any HybridViewModelSpec)? {
5050
let artboard: RiveArtboard?
51-
51+
5252
if let artboardBy = artboardBy {
5353
switch artboardBy.type {
5454
case .index:
@@ -63,12 +63,12 @@ class HybridRiveFile: HybridRiveFileSpec, RiveViewSource {
6363
} else {
6464
artboard = try? riveFile?.artboard()
6565
}
66-
66+
6767
guard let artboard = artboard,
6868
let vm = riveFile?.defaultViewModel(for: artboard) else { return nil }
6969
return HybridViewModel(viewModel: vm)
7070
}
71-
71+
7272
var artboardCount: Double {
7373
Double(riveFile?.artboardNames().count ?? 0)
7474
}

ios/new/ExperimentalAssetLoader.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ enum AssetType {
88

99
init?(fromName name: String) {
1010
let lowercased = name.lowercased()
11-
if lowercased.contains("image") || lowercased.hasSuffix(".png") || lowercased.hasSuffix(".jpg") || lowercased.hasSuffix(".jpeg") || lowercased.hasSuffix(".webp") {
11+
if lowercased.hasSuffix(".png") || lowercased.hasSuffix(".jpg") || lowercased.hasSuffix(".jpeg") || lowercased.hasSuffix(".webp") {
1212
self = .image
13-
} else if lowercased.contains("font") || lowercased.hasSuffix(".ttf") || lowercased.hasSuffix(".otf") {
13+
} else if lowercased.hasSuffix(".ttf") || lowercased.hasSuffix(".otf") {
1414
self = .font
15-
} else if lowercased.contains("audio") || lowercased.hasSuffix(".wav") || lowercased.hasSuffix(".mp3") || lowercased.hasSuffix(".flac") || lowercased.hasSuffix(".ogg") {
15+
} else if lowercased.hasSuffix(".wav") || lowercased.hasSuffix(".mp3") || lowercased.hasSuffix(".flac") || lowercased.hasSuffix(".ogg") {
1616
self = .audio
1717
} else {
1818
return nil

0 commit comments

Comments
 (0)