Hiding/unhiding resource updates (#201)

* renames

* bump

* fix iOS

* Update kt extensions

---------

Co-authored-by: Sergiu Puhalschi <[email protected]>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "1.1.6"
+version = "1.1.7"
 edition = "2021"
 build = "build.rs"
 

apple/Sources/Sargon/Extensions/Methods/Profile/ResourceAppPreference+Wrap+Functions.swift

@@ -0,0 +1,23 @@
+//
+//  File.swift
+//  
+//
+//  Created by Matias Bzurovski on 13/8/24.
+//
+
+import Foundation
+import SargonUniFFI
+
+extension [ResourceAppPreference] {
+	public var hiddenResources: [ResourceIdentifier] {
+		resourcePreferencesGetHiddenResources(resourcePreferences: self)
+	}
+
+	public mutating func hideResource(resource: ResourceIdentifier) {
+		self = resourcePreferencesHideResource(resourcePreferences: self, resource: resource)
+	}
+
+	public mutating func unhideResource(resource: ResourceIdentifier) {
+		self = resourcePreferencesUnhideResource(resourcePreferences: self, resource: resource)
+	}
+}

apple/Sources/Sargon/Extensions/SampleValues/Profile/AssetPreferences+SampleValues.swift

@@ -9,8 +9,8 @@ import Foundation
 import SargonUniFFI
 
 #if DEBUG
-extension [AssetPreference] {
-	public static let sample: Self = newAssetPreferencesSample()
-	public static let sampleOther: Self = newAssetPreferencesSampleOther()
+extension [ResourceAppPreference] {
+	public static let sample: Self = newResourcePreferencesSample()
+	public static let sampleOther: Self = newResourcePreferencesSampleOther()
 }
 #endif // DEBUG

apple/Tests/TestCases/Profile/ResourcePreferencesTests.swift

@@ -0,0 +1,31 @@
+//
+//  File.swift
+//  
+//
+//  Created by Matias Bzurovski on 13/8/24.
+//
+
+import CustomDump
+import Foundation
+import Sargon
+import SargonUniFFI
+import XCTest
+
+final class AssetPreferencesTests: TestCase {
+	func test_hidden_resources() {
+		var sut: [ResourceAppPreference] = []
+		XCTAssertTrue(sut.hiddenResources.isEmpty)
+
+		// Hide assets
+		sut.hideResource(resource: .fungible(.sample))
+		sut.hideResource(resource: .nonFungible(.sample))
+		sut.hideResource(resource: .fungible(.sampleOther))
+
+		XCTAssertEqual(sut.hiddenResources, [.fungible(.sample), .nonFungible(.sample), .fungible(.sampleOther)])
+
+		// Unhide assets
+		sut.unhideResource(resource:  .fungible(.sampleOther))
+		sut.unhideResource(resource: .nonFungible(.sample))
+		XCTAssertEqual(sut.hiddenResources, [.fungible(.sample)])
+	}
+}

jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/ResourceAppPreferences.kt

@@ -0,0 +1,53 @@
+package com.radixdlt.sargon.extensions
+
+import com.radixdlt.sargon.ResourceAppPreference
+import com.radixdlt.sargon.ResourceIdentifier
+import com.radixdlt.sargon.annotation.KoverIgnore
+import com.radixdlt.sargon.resourcePreferencesGetHiddenResources
+import com.radixdlt.sargon.resourcePreferencesHideResource
+import com.radixdlt.sargon.resourcePreferencesUnhideResource
+
+class ResourceAppPreferences private constructor(
+    private val array: IdentifiedArray<ResourceIdentifier, ResourceAppPreference>
+) : IdentifiedArray<ResourceIdentifier, ResourceAppPreference> by array {
+
+    constructor(resourceAppPreferences: List<ResourceAppPreference>) : this(
+        IdentifiedArrayImpl(
+            elements = resourceAppPreferences,
+            identifier = { it.resource }
+        )
+    )
+
+    constructor(vararg resourceAppPreference: ResourceAppPreference) : this(resourceAppPreferences = resourceAppPreference.asList())
+
+    @KoverIgnore // False positive in javaClass check
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ResourceAppPreferences
+
+        return array == other.array
+    }
+
+    override fun hashCode(): Int {
+        return array.hashCode()
+    }
+
+    @KoverIgnore
+    override fun toString(): String {
+        return "ResourceAppPreferences(array=$array)"
+    }
+
+    companion object
+
+}
+
+fun List<ResourceAppPreference>.asIdentifiable() = ResourceAppPreferences(resourceAppPreferences = this)
+
+val ResourceAppPreferences.hiddenResources
+    get() = resourcePreferencesGetHiddenResources(asList())
+
+fun ResourceAppPreferences.hideResource(resourceIdentifier: ResourceIdentifier) = resourcePreferencesHideResource(asList(), resourceIdentifier).asIdentifiable()
+
+fun ResourceAppPreferences.unhideResource(resourceIdentifier: ResourceIdentifier) = resourcePreferencesUnhideResource(asList(), resourceIdentifier).asIdentifiable()

jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/ResourceAppPreferencesSample.kt

@@ -0,0 +1,16 @@
+package com.radixdlt.sargon.samples
+
+import com.radixdlt.sargon.annotation.UsesSampleValues
+import com.radixdlt.sargon.extensions.ResourceAppPreferences
+import com.radixdlt.sargon.extensions.asIdentifiable
+import com.radixdlt.sargon.newResourcePreferencesSample
+import com.radixdlt.sargon.newResourcePreferencesSampleOther
+
+@UsesSampleValues
+val ResourceAppPreferences.Companion.sample: Sample<ResourceAppPreferences>
+    get() = object : Sample<ResourceAppPreferences> {
+
+        override fun invoke(): ResourceAppPreferences = newResourcePreferencesSample().asIdentifiable()
+
+        override fun other(): ResourceAppPreferences = newResourcePreferencesSampleOther().asIdentifiable()
+    }

jvm/sargon-android/src/test/java/com/radixdlt/sargon/AppPreferencesTest.kt

@@ -1,6 +1,6 @@
 package com.radixdlt.sargon
 
-import com.radixdlt.sargon.extensions.AssetPreferences
+import com.radixdlt.sargon.extensions.ResourceAppPreferences
 import com.radixdlt.sargon.extensions.default
 import com.radixdlt.sargon.extensions.toDecimal192
 import com.radixdlt.sargon.samples.Sample
@@ -29,7 +29,7 @@ class AppPreferencesTest : SampleTestable<AppPreferences> {
                     securityStructuresOfFactorSourceIds = emptyList()
                 ),
                 transaction = TransactionPreferences(defaultDepositGuarantee = 0.99.toDecimal192()),
-                assets = AssetPreferences().asList()
+                resources = ResourceAppPreferences().asList()
             ),
             AppPreferences.default()
         )