From 89a8c8c0757a749aef59684fdf8fe620a5c002a4 Mon Sep 17 00:00:00 2001 From: Sam Davis Date: Tue, 14 May 2024 11:22:23 +0100 Subject: [PATCH 1/3] Bump version of CubeFoundation --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8592a2a..8054084 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/3sidedcube/cubefoundation-ios.git", "state" : { - "branch" : "develop", - "revision" : "cd545cc9aefd43925f4ebc9ff9060e436e4cb01c" + "branch" : "release/v1.1.0", + "revision" : "98a3da102c6da6c24b62a4524c20652d849d7aab" } } ], diff --git a/Package.swift b/Package.swift index 0601cd8..994141f 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/3sidedcube/cubefoundation-ios.git", - branch: "develop" + branch: "release/v1.1.0" ) ], targets: [ From fa7e563151672f2606db0f91ad81c125130af420 Mon Sep 17 00:00:00 2001 From: Sam Davis Date: Tue, 14 May 2024 11:23:01 +0100 Subject: [PATCH 2/3] Bump ios target --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 994141f..4c7b4b9 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( name: "ArcUI", platforms: [ // .macOS(.v12), Uses UIKit - .iOS(.v15) + .iOS(.v16) ], products: [ .library( From 3b1b87b09d962f2de20b4c15d1b12134e5465e3f Mon Sep 17 00:00:00 2001 From: Szuyun Date: Wed, 13 Nov 2024 12:23:58 +0000 Subject: [PATCH 3/3] Make the image height can be customise on the ARCImageCard. --- Sources/Components/ARCImageCard.swift | 33 +++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Sources/Components/ARCImageCard.swift b/Sources/Components/ARCImageCard.swift index 156dace..8340103 100644 --- a/Sources/Components/ARCImageCard.swift +++ b/Sources/Components/ARCImageCard.swift @@ -14,6 +14,7 @@ public struct ARCImageCard: View { public var subtitle: String public var footerTitle: String public var image: Image + public var imageSizeRatio: CGFloat? public var titleAlignment: TextAlignment public var onTap: () -> Void @@ -22,6 +23,7 @@ public struct ARCImageCard: View { subtitle: String, footerTitle: String, image: Image, + imageSizeRatio: CGFloat? = nil, titleAlignment: TextAlignment = .center, onTap: @escaping () -> Void ) { @@ -29,6 +31,7 @@ public struct ARCImageCard: View { self.subtitle = subtitle self.footerTitle = footerTitle self.image = image + self.imageSizeRatio = imageSizeRatio self.titleAlignment = titleAlignment self.onTap = onTap } @@ -37,13 +40,29 @@ public struct ARCImageCard: View { Button(action: onTap) { VStack(alignment: .leading, spacing: 0) { // Image - image - .resizable() - .scaledToFill() - .frame(height: .ArcImageCard.imageHeight) - .frame(maxWidth: .infinity) - .clipped() - .accessibilityHidden(true) + if let imageSizeRatio { + // Aspect ratio + Color.clear + .aspectRatio(imageSizeRatio, contentMode: .fill) + .frame(maxWidth: .infinity) + .overlay { + image + .resizable() + .scaledToFill() + .accessibilityHidden(true) + } + .clipped() + } else { + // Fixed height + image + .resizable() + .scaledToFill() + .frame(height: .ArcImageCard.imageHeight) + .frame(maxWidth: .infinity) + .clipped() + .accessibilityHidden(true) + } + // Body VStack(alignment: .leading, spacing: 8) { Text(title)