Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ImagePicker Subletting Fixed #6

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

ImagePicker Subletting Fixed #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
acdd65b
Replace aspectRatio with scaledToFill
anli5005 Mar 24, 2024
eb19f7f
Merge branch 'show-validation-errors-env-var' into subletting
anli5005 Mar 24, 2024
5266446
Add contentShape modifiers
anli5005 Mar 24, 2024
c9eeca1
Merge branch 'anli/03-24-image-component-use-scaled-to-fill' into sub…
anli5005 Mar 24, 2024
1f23c02
Fix parentheses
anli5005 Mar 24, 2024
bc96947
Merge branch 'anli/03-24-image-component-use-scaled-to-fill' into sub…
anli5005 Mar 24, 2024
762d6bd
Disable hit testing on image entirely
anli5005 Mar 24, 2024
320429e
Merge branch 'anli/03-24-image-component-use-scaled-to-fill' into sub…
anli5005 Mar 24, 2024
8383f6d
Revert ImagePicker to old, working version for public beta release (b…
JHawk0224 Apr 10, 2024
e384e7b
Fix overflow on old version
JHawk0224 Apr 10, 2024
2535634
fixed aspect ratio of images
christinaqiu3 Apr 14, 2024
3be0ee4
greyed out unpicked photos
christinaqiu3 Apr 14, 2024
884e51d
clicking on main image allows for photopicker popup
christinaqiu3 Apr 14, 2024
97337c9
Merge branch 'main' of https://github.com/pennlabs/PennForms into sub…
JHawk0224 Apr 21, 2024
382ad0c
Slight daterange bugfix
JHawk0224 Apr 21, 2024
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
8 changes: 4 additions & 4 deletions Sources/PennForms/FormComponents/DateRangeField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public struct DateRangeField: FormComponent {
.bold()
}
HStack {
let begin = range.lowerBound < lowerDate ? lowerDate : range.lowerBound
let end = range.upperBound > upperDate ? upperDate : range.upperBound
DateRangeSubfield(date: $lowerDate, range: self.range.lowerBound...end, placeholder: lowerPlaceholder, wasSet: $wasSet1)
let begin = max(self.lowerDate, self.range.lowerBound)
let end = min(self.upperDate, self.range.upperBound)
DateRangeSubfield(date: $lowerDate, range: min(self.range.lowerBound, end)...max(self.range.lowerBound, end), placeholder: lowerPlaceholder, wasSet: $wasSet1)
DateRangeSubfield(date: $upperDate, range: begin...self.range.upperBound, placeholder: upperPlaceholder, wasSet: $wasSet2)
}

Expand All @@ -69,7 +69,7 @@ public struct DateRangeField: FormComponent {
self.lowerDate = self.range.lowerBound == .distantPast ? .now : self.range.lowerBound
}
.onChange(of: wasSet2) { _ in
self.upperDate = Calendar.current.date(byAdding: .day, value: upperOffset, to: .now) ?? (self.range.upperBound == .distantFuture ? .now : self.range.upperBound)
self.upperDate = min(Calendar.current.date(byAdding: .day, value: upperOffset, to: self.range.lowerBound == .distantPast ? .now : self.range.lowerBound) ?? .now, self.range.upperBound)
}
}
}
Expand Down
179 changes: 103 additions & 76 deletions Sources/PennForms/FormComponents/ImagePicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,48 +31,30 @@ public struct ImagePicker: FormComponent {
public var body: some View {
VStack(alignment: .leading, spacing: 10) {
if existingImages.count > 0 {
AsyncImage(
url: URL(string: existingImages[0]),
content: { image in
ZStack {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 0.5))
.frame(width: 350, height: 200)

image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 350, height: 200)
.clipShape(RoundedRectangle(cornerRadius: 8))

}
},
placeholder: {
ProgressView()
}
)
} else if selectedImages.count > 0 {
ZStack {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 0.5))
.frame(width: 350, height: 200)

Image(uiImage: selectedImages[0])
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 350, height: 200)
.clipShape(RoundedRectangle(cornerRadius: 8))


}
} else {

PhotosPicker(selection: $selection,
maxSelectionCount: maxSelectionCount - existingImages.count,
matching: .any(of: [.images, .not(.videos)])) {
VStack(spacing: 8) {
Image(systemName: "photo.badge.plus")
Text("Add Photos")
}
AsyncImage(
url: URL(string: existingImages[0]),
content: { image in
ZStack {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 0.5))
.frame(width: 350, height: 200)

image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 350, height: 200)
.clipShape(RoundedRectangle(cornerRadius: 8))

}
},
placeholder: {
ProgressView()
}
)
.frame(width: 350, height: 200)
.background(RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 1, dash: [7])))
Expand All @@ -88,20 +70,87 @@ public struct ImagePicker: FormComponent {
}
}
}




} else if selectedImages.count > 0 {
PhotosPicker(selection: $selection,
maxSelectionCount: maxSelectionCount - existingImages.count,
matching: .any(of: [.images, .not(.videos)])) {
ZStack {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 0.5))
.frame(width: 350, height: 200)

Image(uiImage: selectedImages[0])
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 350, height: 200)
.clipShape(RoundedRectangle(cornerRadius: 8))


}
.frame(width: 350, height: 200)
.background(RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 1, dash: [7])))
.foregroundColor(!showValidationErrors || validator.isValid(selectedImages.count + existingImages.count) ? Color.secondary : Color.red)
}
.onChange(of: selection) { newSelection in
Task {
selectedImages.removeAll()
for item in newSelection {
if let data = try? await item.loadTransferable(type: Data.self), let image = UIImage(data: data) {
selectedImages.append(image)
}
}
}
}





} else {
PhotosPicker(selection: $selection,
maxSelectionCount: maxSelectionCount - existingImages.count,
matching: .any(of: [.images, .not(.videos)])) {
VStack(spacing: 8) {
Image(systemName: "photo.badge.plus")
Text("Add Photos")
}
.frame(width: 350, height: 200)
.background(RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 1, dash: [7])))
.foregroundColor(!showValidationErrors || validator.isValid(selectedImages.count + existingImages.count) ? Color.secondary : Color.red)
}
.onChange(of: selection) { newSelection in
Task {
selectedImages.removeAll()
for item in newSelection {
if let data = try? await item.loadTransferable(type: Data.self), let image = UIImage(data: data) {
selectedImages.append(image)
}
}
}
}
}


ScrollView(.horizontal) {
HStack(spacing: 8) {
ForEach(Array(existingImages.enumerated()), id: \.offset) { index, image in
ForEach(Array(existingImages.enumerated()), id: \.offset) { index, url in
if index != 0 {
ForEach(existingImages, id: \.self) { url in
// ForEach(existingImages, id: \.self) { url in
AsyncImage(
url: URL(string: url),
content: { image in

image.resizable()
.aspectRatio(contentMode: .fit)
.badge(imageStr: "xmark", badgeColor: Color(uiColor: .systemGray3), textColor: Color(uiColor: .systemGray), action: {
.aspectRatio(contentMode: .fill)
.frame(width: 350, height: 200)
.clipShape(RoundedRectangle(cornerRadius: 8))
.badge(imageStr: "xmark", badgeColor: Color(uiColor: .systemGray3), textColor:
Color(uiColor: .systemGray), action: {
withAnimation {
existingImages.removeAll(where: { $0 == url })
}
Expand All @@ -112,48 +161,26 @@ public struct ImagePicker: FormComponent {
ProgressView()
}
)
}
// }
}
}
if (existingImages.count == 0 && selectedImages.count-1 > 0) || selectedImages.count > 0 {
if (existingImages.count == 0 && selectedImages.count-1 > 0) || selectedImages.count > 0 {
ForEach(Array(selectedImages.enumerated()), id: \.offset) { index, image in
if index != 0 {
ZStack {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 0.5))
.frame(width: 120, height: 120)

Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 120, height: 120)
.clipShape(RoundedRectangle(cornerRadius: 8))
}
Image(uiImage: image)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 120, height: 120)
.clipShape(RoundedRectangle(cornerRadius: 8))
}
}

}
if selectedImages.count + existingImages.count < maxSelectionCount {
ForEach(0..<(maxSelectionCount - selectedImages.count - existingImages.count), id: \.self) { _ in
PhotosPicker(selection: $selection,
maxSelectionCount: maxSelectionCount - existingImages.count,
matching: .any(of: [.images, .not(.videos)])) {

Image(systemName: "photo.badge.plus")
RoundedRectangle(cornerRadius: 8)
.frame(width: 120, height: 120)
.background(RoundedRectangle(cornerRadius: 8)
.strokeBorder(style: StrokeStyle(lineWidth: 1)))
.foregroundColor(Color.secondary)
}
.onChange(of: selection) { newSelection in
Task {
for item in newSelection {
if let data = try? await item.loadTransferable(type: Data.self), let image = UIImage(data: data) {
selectedImages.append(image)
}
}
}
}
.foregroundColor(Color.gray.opacity(0.5)) // Fill color for the rounded rectangle

}
}
}
Expand Down