8000 - lower iOS support version by AdnanYupi · Pull Request #12 · golfgenius/ScoreScanSDK · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -387,7 +387,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
Expand Down
67 changes: 36 additions & 31 deletions iosApp/iosApp/ScorecardCameraView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public struct ScorecardConfig {
/// }
/// }
/// ```
@available(iOS 16.0, *)
public struct ScorecardCameraView: View {
let config: ScorecardConfig
let onResult: (ScorecardResult) -> Void
Expand All @@ -105,43 +106,47 @@ public struct ScorecardCameraView: View {
}

public var body: some View {
ZStack {
Color(red: 0.1, green: 0.1, blue: 0.1)
.ignoresSafeArea()

switch viewModel.state {
case .camera:
cameraView

case .reviewCapture(let image):
reviewView(image: image, isGallery: false)

case .reviewGallery(let image):
reviewView(image: image, isGallery: true)

case .uploading:
uploadingView

case .permissionDenied:
permissionView
if #available(iOS 17.0, *) {
ZStack {
Color(red: 0.1, green: 0.1, blue: 0.1)
.ignoresSafeArea()

switch viewModel.state {
case .camera:
cameraView

case .reviewCapture(let image):
reviewView(image: image, isGallery: false)

case .reviewGallery(let image):
reviewView(image: image, isGallery: true)

case .uploading:
uploadingView

case .permissionDenied:
permissionView
}
}
}
.onAppear {
viewModel.checkPermission()
}
.onChange(of: selectedPhotoItem) { oldValue, newValue in
if let item = newValue {
Task {
if let data = try? await item.loadTransferable(type: Data.self),
let image = UIImage(data: data) {
await MainActor.run {
viewModel.state = .reviewGallery(image)
.onAppear {
viewModel.checkPermission()
}
.onChange(of: selectedPhotoItem) { oldValue, newValue in
if let item = newValue {
Task {
if let data = try? await item.loadTransferable(type: Data.self),
let image = UIImage(data: data) {
await MainActor.run {
viewModel.state = .reviewGallery(image)
}
}
}
}
}
.photosPicker(isPresented: $showPhotoPicker, selection: $selectedPhotoItem, matching: .images)
} else {
// Fallback on earlier versions
}
.photosPicker(isPresented: $showPhotoPicker, selection: $selectedPhotoItem, matching: .images)
}

// MARK: - Camera View
Expand Down
0