Skip to content

Commit dd7fe75

Browse files
committed
Remove unnecessary empty init() methods and autolinking entries for ViewModel classes
1 parent 1f325e7 commit dd7fe75

15 files changed

Lines changed: 10 additions & 382 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class HybridRiveFile : HybridRiveFileSpec() {
7575

7676
for ((key, assetData) in assetsData) {
7777
val asset = cache[key] ?: continue
78-
loadJobs.add(loader.updateAsset(assetData, asset, context))
78+
loadJobs.add(loader.updateAsset(assetData, asset))
7979
}
8080

8181
if (loadJobs.isNotEmpty()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class HybridViewModelImageProperty(private val viewModelImage: ViewModelImagePro
1515
}
1616

1717
override fun addListener(onChanged: () -> Unit) {
18-
listeners.add(onChanged)
18+
listeners.add { onChanged() }
1919
ensureValueListenerJob(viewModelImage.valueFlow.map { })
2020
}
2121
}

ios/HybridViewModel.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ class HybridViewModel: HybridViewModelSpec {
66
init(viewModel: RiveDataBindingViewModel) {
77
self.viewModel = viewModel
88
}
9-
10-
override init() {
11-
self.viewModel = nil
12-
super.init()
13-
}
14-
9+
1510
var propertyCount: Double { Double(viewModel?.propertyCount ?? 0) }
1611

1712
var instanceCount: Double { Double(viewModel?.instanceCount ?? 0) }

ios/HybridViewModelBooleanProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelBooleanProperty: HybridViewModelBooleanPropertySpec, Valued
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: Bool {
2214
get {
2315
return property.value

ios/HybridViewModelColorProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelColorProperty: HybridViewModelColorPropertySpec, ValuedProp
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: Double {
2214
get {
2315
return property.value.toHexDouble()

ios/HybridViewModelEnumProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelEnumProperty: HybridViewModelEnumPropertySpec, ValuedProper
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: String {
2214
get {
2315
return property.value

ios/HybridViewModelInstance.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ class HybridViewModelInstance: HybridViewModelInstanceSpec {
66
init(viewModelInstance: RiveDataBindingViewModel.Instance) {
77
self.viewModelInstance = viewModelInstance
88
}
9-
10-
override init() {
11-
self.viewModelInstance = nil
12-
super.init()
13-
}
14-
9+
1510
var instanceName: String { viewModelInstance?.name ?? "" }
1611

1712
func numberProperty(path: String) throws -> (any HybridViewModelNumberPropertySpec)? {

ios/HybridViewModelNumberProperty.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ class HybridViewModelNumberProperty: HybridViewModelNumberPropertySpec, ValuedPr
99
super.init()
1010
}
1111

12-
/// ⚠️ DO NOT REMOVE
13-
/// Nitro requires a parameterless initializer for JS bridging.
14-
/// This is invoked automatically during hybrid module construction.
15-
/// Internally we always use `init(property:)`
16-
override init() {
17-
super.init()
18-
}
19-
2012
var value: Double {
2113
get {
2214
return Double(property.value)

ios/HybridViewModelStringProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ class HybridViewModelStringProperty: HybridViewModelStringPropertySpec, ValuedPr
99
self.property = property
1010
super.init()
1111
}
12-
13-
/// ⚠️ DO NOT REMOVE
14-
/// Nitro requires a parameterless initializer for JS bridging.
15-
/// This is invoked automatically during hybrid module construction.
16-
/// Internally we always use `init(property:)`
17-
override init() {
18-
super.init()
19-
}
20-
12+
2113
var value: String {
2214
get {
2315
return property.value

ios/HybridViewModelTriggerProperty.swift

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ class HybridViewModelTriggerProperty: HybridViewModelTriggerPropertySpec, Valued
1515
self.property = property
1616
super.init()
1717
}
18-
19-
/// ⚠️ DO NOT REMOVE
20-
/// Nitro requires a parameterless initializer for JS bridging.
21-
/// This is invoked automatically during hybrid module construction.
22-
/// Internally we always use `init(property:)`
23-
override init() {
24-
super.init()
25-
}
26-
18+
2719
func trigger() {
2820
property.trigger()
2921
}

0 commit comments

Comments
 (0)