-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Hiding/unhiding resource updates (#201)
* renames * bump * fix iOS * Update kt extensions --------- Co-authored-by: Sergiu Puhalschi <[email protected]>
- Loading branch information
1 parent
5903204
commit 57cada8
Showing
28 changed files
with
478 additions
and
492 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "sargon" | ||
version = "1.1.6" | ||
version = "1.1.7" | ||
edition = "2021" | ||
build = "build.rs" | ||
|
||
|
23 changes: 0 additions & 23 deletions
23
apple/Sources/Sargon/Extensions/Methods/Profile/AssetPreference+Wrap+Functions.swift
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
apple/Sources/Sargon/Extensions/Methods/Profile/ResourceAppPreference+Wrap+Functions.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
apple/Sources/Sargon/Extensions/Swiftified/Profile/AssetPreference+Swiftified.swift
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
apple/Tests/TestCases/Profile/ResourcePreferencesTests.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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)]) | ||
} | ||
} |
53 changes: 0 additions & 53 deletions
53
jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/AssetPreferences.kt
This file was deleted.
Oops, something went wrong.
53 changes: 53 additions & 0 deletions
53
jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/ResourceAppPreferences.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() |
16 changes: 0 additions & 16 deletions
16
jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/AssetPreferencesSample.kt
This file was deleted.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
jvm/sargon-android/src/main/java/com/radixdlt/sargon/samples/ResourceAppPreferencesSample.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 0 additions & 54 deletions
54
jvm/sargon-android/src/test/java/com/radixdlt/sargon/AssetPreferencesTest.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.