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

[#151] 업로드 정보 확인 뷰에서 텍스트 필드 순서 변경 #153

Merged
merged 1 commit into from
Jan 9, 2025
Merged

[#151] 업로드 정보 확인 뷰에서 텍스트 필드 순서 변경 #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions TMT/TMT/BusJourneyScanned/Views/ScannedJourneyInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//

import Combine
import SwiftUI
import PhotosUI
import SwiftUI

struct ScannedJourneyInfoView: View {
@EnvironmentObject var imageHandler: ImageHandlerModel
Expand All @@ -34,21 +34,23 @@ struct ScannedJourneyInfoView: View {
ZStack {
Color.brandBackground
.ignoresSafeArea()
VStack {

VStack(spacing: 16) {
ScrollView(showsIndicators: false) {
if !imageHandler.showAlertScreen {
UploadedPhotoView(selectedImage: $imageHandler.selectedImage)
} else {
UploadedPhotoView(selectedImage: .constant(nil))
}

VStack(alignment: .leading) {
uploadedInfoBox(title: "Bus Number", scannedInfo: $imageHandler.scannedJourneyInfo.busNumber)
uploadedInfoBox(title: "Departure Stop", scannedInfo: $imageHandler.scannedJourneyInfo.startStop)
uploadedInfoBox(title: "Arrival Stop", scannedInfo: $imageHandler.scannedJourneyInfo.endStop)
}

uploadedInfoBox(title: "Departure Stop", scannedInfo: $imageHandler.scannedJourneyInfo.startStop)

uploadedInfoBox(title: "Bus Number", scannedInfo: $imageHandler.scannedJourneyInfo.busNumber)

uploadedInfoBox(title: "Arrival Stop", scannedInfo: $imageHandler.scannedJourneyInfo.endStop)

}

if imageHandler.showAlertText {
HStack {
VStack {
Expand All @@ -66,7 +68,7 @@ struct ScannedJourneyInfoView: View {
.frame(height: 42)
.foregroundStyle(.red600)
}

HStack(spacing: 0) {
Group {
if imageHandler.showAlertText {
Expand All @@ -91,7 +93,7 @@ struct ScannedJourneyInfoView: View {
Text("Cancel")
.foregroundStyle(.blue)
}

Button {
showingAlert = false
showingPhotosPicker = true
Expand All @@ -103,19 +105,19 @@ struct ScannedJourneyInfoView: View {
} message: {
Text("The previously uploaded image information will disappear. Do you want to proceed?")
}

PhotosPicker(selection: $pickedItem, matching: .screenshots) {
EmptyView()
}
.onChange(of: pickedItem) {
imageHandler.loadImageByPhotosPickerItem(from: pickedItem, viewCategory: "ScannedJourneyInfoView", completion: {})
}
.photosPicker(isPresented: $showingPhotosPicker, selection: $pickedItem, matching: .screenshots)

NavigationLink(destination: MapView(path: $path), tag: 1, selection: $tag) {
EmptyView()
}

FilledButton(title: "Start",
fillColor: imageHandler.showAlertText ? .grey100 : .brandPrimary) {
isLoading = true
Expand All @@ -127,10 +129,10 @@ struct ScannedJourneyInfoView: View {
startStopString: imageHandler.scannedJourneyInfo.startStop,
endStopString: imageHandler.scannedJourneyInfo.endStop
)

guard let startStop = journeyModel.journeyStops.first else { return }
guard let endStop = journeyModel.journeyStops.last else { return }

cancellable = locationManager.$remainingStops
.sink { newValue in
if newValue != 0 {
Expand All @@ -139,7 +141,7 @@ struct ScannedJourneyInfoView: View {
isLoading = false
tag = 1
path.append("BusStop")

cancellable?.cancel()
}
}
Expand All @@ -165,8 +167,6 @@ struct ScannedJourneyInfoView: View {
)
}
}
.frame(height: 52)
.padding(.vertical, 12.5)
}
.padding(.horizontal, 16)

Expand Down Expand Up @@ -196,7 +196,7 @@ struct ScannedJourneyInfoView: View {
}

private func uploadedInfoBox(title: String, scannedInfo: Binding<String>) -> some View {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 2) {
Text("\(title)")
.label1Medium()
.foregroundStyle(.grey300)
Expand All @@ -206,14 +206,12 @@ struct ScannedJourneyInfoView: View {
.foregroundStyle(.textDefault)
.padding(12)
.frame(maxWidth: .infinity, alignment: .center)
.background(
.background {
RoundedRectangle(cornerRadius: 8)
.strokeBorder(.grey100, lineWidth: 1)
.background(Color.brandBackground.cornerRadius(8))
)
}
.keyboardType(title == "Bus Number" ? .numberPad : .default)
}
.padding(.bottom, 16)
}

private func startLoadingTimeout() {
Expand All @@ -233,5 +231,7 @@ struct ScannedJourneyInfoView: View {

#Preview {
ScannedJourneyInfoView(path: .constant(["ScannedJourneyInfoView"]))
.environmentObject(JourneySettingModel(searchModel: BusSearchModel()))
.environmentObject(LocationManager(journeyModel: JourneySettingModel(searchModel: BusSearchModel())))
.environmentObject(ImageHandlerModel())
}