Skip to content

Commit 0a3d09c

Browse files
committed
fix: make legacy HybridViewModel identical to main
1 parent baf0256 commit 0a3d09c

File tree

2 files changed

+4
-50
lines changed

2 files changed

+4
-50
lines changed

android/src/legacy/java/com/margelo/nitro/rive/HybridViewModel.kt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ class HybridViewModel(private val viewModel: ViewModel) : HybridViewModelSpec()
1313
get() = viewModel.propertyCount.toDouble()
1414
override val instanceCount: Double
1515
get() = viewModel.instanceCount.toDouble()
16-
1716
override val modelName: String
1817
get() = viewModel.name
1918

20-
// Deprecated: Use createInstanceByNameAsync instead
2119
override fun createInstanceByIndex(index: Double): HybridViewModelInstanceSpec? {
2220
if (index < 0) return null
2321
try {
@@ -28,7 +26,6 @@ class HybridViewModel(private val viewModel: ViewModel) : HybridViewModelSpec()
2826
}
2927
}
3028

31-
// Deprecated: Use createInstanceByNameAsync instead
3229
override fun createInstanceByName(name: String): HybridViewModelInstanceSpec? {
3330
try {
3431
val vmi = viewModel.createInstanceFromName(name)
@@ -38,18 +35,6 @@ class HybridViewModel(private val viewModel: ViewModel) : HybridViewModelSpec()
3835
}
3936
}
4037

41-
override fun createInstanceByNameAsync(name: String): Promise<HybridViewModelInstanceSpec?> {
42-
return Promise.async {
43-
try {
44-
val vmi = viewModel.createInstanceFromName(name)
45-
HybridViewModelInstance(vmi)
46-
} catch (e: ViewModelException) {
47-
null
48-
}
49-
}
50-
}
51-
52-
// Deprecated: Use createDefaultInstanceAsync instead
5338
override fun createDefaultInstance(): HybridViewModelInstanceSpec? {
5439
try {
5540
val vmi = viewModel.createDefaultInstance()
@@ -59,18 +44,6 @@ class HybridViewModel(private val viewModel: ViewModel) : HybridViewModelSpec()
5944
}
6045
}
6146

62-
override fun createDefaultInstanceAsync(): Promise<HybridViewModelInstanceSpec?> {
63-
return Promise.async {
64-
try {
65-
val vmi = viewModel.createDefaultInstance()
66-
HybridViewModelInstance(vmi)
67-
} catch (e: ViewModelException) {
68-
null
69-
}
70-
}
71-
}
72-
73-
// Deprecated: Use createBlankInstanceAsync instead
7447
override fun createInstance(): HybridViewModelInstanceSpec? {
7548
try {
7649
val vmi = viewModel.createBlankInstance()

ios/legacy/HybridViewModel.swift

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,27 @@ class HybridViewModel: HybridViewModelSpec {
1414

1515
var modelName: String { viewModel?.name ?? "" }
1616

17-
// Deprecated: Use createInstanceByNameAsync instead
1817
func createInstanceByIndex(index: Double) throws -> (any HybridViewModelInstanceSpec)? {
19-
guard index >= 0, let viewModel = viewModel,
18+
guard index >= 0 else { return nil }
19+
guard let viewModel = viewModel,
2020
let vmi = viewModel.createInstance(fromIndex: UInt(index)) else { return nil }
2121
return HybridViewModelInstance(viewModelInstance: vmi)
2222
}
2323

24-
// Deprecated: Use createInstanceByNameAsync instead
2524
func createInstanceByName(name: String) throws -> (any HybridViewModelInstanceSpec)? {
2625
guard let viewModel = viewModel,
2726
let vmi = viewModel.createInstance(fromName: name) else { return nil }
2827
return HybridViewModelInstance(viewModelInstance: vmi)
2928
}
30-
31-
func createInstanceByNameAsync(name: String) throws -> Promise<(any HybridViewModelInstanceSpec)?> {
32-
return Promise.async {
33-
guard let viewModel = self.viewModel,
34-
let vmi = viewModel.createInstance(fromName: name) else { return nil }
35-
return HybridViewModelInstance(viewModelInstance: vmi)
36-
}
37-
}
38-
39-
// Deprecated: Use createDefaultInstanceAsync instead
29+
4030
func createDefaultInstance() throws -> (any HybridViewModelInstanceSpec)? {
4131
guard let viewModel = viewModel,
4232
let vmi = viewModel.createDefaultInstance() else {
4333
return nil
4434
}
4535
return HybridViewModelInstance(viewModelInstance: vmi)
4636
}
47-
48-
func createDefaultInstanceAsync() throws -> Promise<(any HybridViewModelInstanceSpec)?> {
49-
return Promise.async {
50-
guard let viewModel = self.viewModel,
51-
let vmi = viewModel.createDefaultInstance() else { return nil }
52-
return HybridViewModelInstance(viewModelInstance: vmi)
53-
}
54-
}
55-
56-
// Deprecated: Use createBlankInstanceAsync instead
37+
5738
func createInstance() throws -> (any HybridViewModelInstanceSpec)? {
5839
guard let viewModel = viewModel,
5940
let vmi = viewModel.createInstance() else { return nil }

0 commit comments

Comments
 (0)