Skip to content

배경화면 변경 및 OnboardingView 의 NavigationView 제거 #7

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

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

배경화면 변경 및 OnboardingView 의 NavigationView 제거 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b6d1c6
-
iyungui May 3, 2024
d9bc525
remove NavigationStack in AddShareLuggageView, ViewBuilder -> ViewMod…
iyungui May 4, 2024
f2ffddd
use gradientbackground viewModifier in AddJourneyView, PackingListView
iyungui May 4, 2024
09690d9
use gradientbackground viewModifier in AddLuggageView
iyungui May 4, 2024
e9283dc
Merge branch 'main' of https://github.com/APP-iOS5th/Packing into iyu…
iyungui May 9, 2024
441ac2e
refactoring journeyListView
iyungui May 9, 2024
faff268
delete navigationView in OnboardingView, Change backgroundColor
iyungui May 9, 2024
b2dd412
change background, journeylist color
iyungui May 9, 2024
61f0d7a
sync
iyungui May 9, 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: 8 additions & 0 deletions Packing.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,14 @@
path = "Preview Content";
sourceTree = "<group>";
};
C6EFA8002BE4CFB400AA4686 /* Recovered References */ = {
isa = PBXGroup;
children = (
B8232FB22BE4BB04009CD6FA /* GoogleService-Info.plist */,
);
name = "Recovered References";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down
259 changes: 137 additions & 122 deletions Packing/View/AddJourneyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,155 +26,170 @@ struct AddJourneyView: View {


var body: some View {
ZStack{
LinearGradient(gradient: Gradient(colors: colorScheme == .light ? [Color(hex: "AEC6CF"), Color(hex: "ECECEC"), Color(hex: "FFFDD0")] : [Color(hex: "34495E"), Color(hex: "555555"), Color(hex: "333333")]), startPoint: .topLeading, endPoint: .bottomTrailing)
.ignoresSafeArea()
VStack{

VStack{

// MARK: - Image

ZStack{
PhotosPicker(selection: $selectedItem, matching: .images, photoLibrary: .shared()) {
if let image = image {
Image(uiImage: image)
.resizable()
// MARK: - Image

ZStack{
PhotosPicker(selection: $selectedItem, matching: .images, photoLibrary: .shared()) {
if let image = image {
Image(uiImage: image)
.resizable()
.clipShape(RoundedRectangle(cornerRadius: 30))
.frame(minWidth: 200, maxWidth: .infinity, maxHeight: .infinity)
.padding(.top, 60)
.shadow(radius: 3)
} else {
Spacer()
ZStack{
Rectangle()
.clipShape(RoundedRectangle(cornerRadius: 30))
.frame(minWidth: 200, maxWidth: .infinity, maxHeight: .infinity)
.padding(.top, 60)
.shadow(radius: 3)
} else {
Spacer()
ZStack{
Rectangle()
.clipShape(RoundedRectangle(cornerRadius: 30))
.frame(minWidth: 200, maxWidth: .infinity, maxHeight: .infinity)
.padding(.top, 60)
.shadow(radius: 3)
.foregroundStyle(colorScheme == .dark ? Color("DarkColor") : .white)
VStack{
Image(systemName: "photo.badge.plus")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 100)
.padding(.top, 50)
.foregroundStyle(Color(hex: 0x566375))
}
.foregroundStyle(colorScheme == .dark ? Color("DarkColor") : .white)
VStack{
Image(systemName: "photo.badge.plus")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 100)
.padding(.top, 50)
.foregroundStyle(Color(hex: 0x566375))
}
}
}.onChange(of: selectedItem) {
loadImage()
}
}.onChange(of: selectedItem) {
loadImage()
}


ZStack{
RoundedRectangle(cornerRadius: 30)
.foregroundStyle(colorScheme == .dark ? Color("DarkColor") : .white)
.frame(minHeight: 550, maxHeight: .infinity)
VStack {
VStack(alignment:.center){

// MARK: 여행 목적지
Text("여행목적지")
.font(.title2)
.fontWeight(.bold)
}


ZStack{
RoundedRectangle(cornerRadius: 30)
.foregroundStyle(colorScheme == .dark ? Color("DarkColor") : .white)
.frame(minHeight: 550, maxHeight: .infinity)
VStack {
VStack(alignment:.center){

// MARK: 여행 목적지
Text("여행목적지")
.font(.title2)
.fontWeight(.bold)

TextField("여행목적지",text: $testString)
.padding()
.font(.subheadline)
.background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.frame(width: 300)
.padding(.bottom,30)

// MARK: - 여행 기간
Text("여행 기간")
.font(.title2)
.fontWeight(.bold)
VStack{
DatePicker("시작 날짜", selection: $startdate,displayedComponents: [.date])

TextField("여행목적지",text: $testString)
.padding()
.font(.subheadline)
.background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.frame(width: 300)
.padding(.bottom,30)

// MARK: - 여행 기간
Text("여행 기간")
.font(.title2)
.fontWeight(.bold)
VStack{
DatePicker("시작 날짜", selection: $startdate,displayedComponents: [.date])
DatePicker("종료 날짜", selection: $endDate, displayedComponents: [.date])
.padding()
}
.bold()
.font(.body)
.frame(width: 300 , alignment: .leading)
.background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.padding()

//MARK: - 여행 목적
// Picker("여행 활동", selection: $travelActivitys){
// ForEach(TravelActivity.allCases, id: \.self) {
// Text($0.rawValue)
// .font(.body)
// }
// }
// .foregroundStyle(colorScheme == .dark ? .white : .black)
// .font(.title3)
// .bold()
// .padding()
// .pickerStyle(.navigationLink)
// .frame(width: 300,height: 60)
// .background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
// .clipShape(RoundedRectangle(cornerRadius: 15.0))
NavigationLink(destination: MultiSelector(selections: $travelActivitys)) {
HStack{

Text("여행활동")
.font(.title3)
.padding()
DatePicker("종료 날짜", selection: $endDate, displayedComponents: [.date])
.padding()
}
.bold()
.font(.body)
.frame(width: 300 , alignment: .leading)
.background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.padding()

//MARK: - 여행 목적
// Picker("여행 활동", selection: $travelActivitys){
// ForEach(TravelActivity.allCases, id: \.self) {
// Text($0.rawValue)
// .font(.body)
// }
// }
// .foregroundStyle(colorScheme == .dark ? .white : .black)
// .font(.title3)
// .bold()
// .padding()
// .pickerStyle(.navigationLink)
// .frame(width: 300,height: 60)
// .background(colorScheme == .dark ? Color(hex: 0x1A1A1A) : Color(hex: 0xF3F3F3))
// .clipShape(RoundedRectangle(cornerRadius: 15.0))
NavigationLink(destination: MultiSelector(selections: $travelActivitys)) {
HStack{

Text("여행활동")
.font(.title3)
.padding()
.bold()
Spacer()
if travelActivitys.isEmpty {
Text("추가")
.foregroundStyle(.gray)
.font(.title3)
.padding()
}
Text("\(travelActivitysString(travelActivitys: travelActivitys))")
.bold()
Spacer()
if travelActivitys.isEmpty {
Text("추가")
.foregroundStyle(.gray)
.font(.title3)
.padding()

}
.foregroundStyle(.black)
.background(Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.frame(width: 300 , alignment: .leading)

Text("\(travelActivitysString(travelActivitys: travelActivitys))")
.foregroundStyle(.gray)
.padding()

}
.foregroundStyle(.black)
.background(Color(hex: 0xF3F3F3))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
.frame(width: 300 , alignment: .leading)


}

//MARK: - 확인 버튼
if isUploading {
ProgressView()
} else {
Button{
addJourney()
} label: {
Text("확인")
.fontWeight(.bold)
.foregroundStyle(.white)
.padding(.horizontal,50)
.padding(.vertical,20)
.background(testString.isEmpty ? Color(hex: 0x566375).opacity(0.5) : Color(hex: 0x566375))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
}
.padding(.top, 30)
.disabled(testString.isEmpty)
}

}

//MARK: - 확인 버튼
if isUploading {
ProgressView()
} else {
Button{
addJourney()
} label: {
Text("확인")
.fontWeight(.bold)
.foregroundStyle(.white)
.padding(.horizontal,50)
.padding(.vertical,20)
.background(testString.isEmpty ? Color(hex: 0x566375).opacity(0.5) : Color(hex: 0x566375))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
}


}
.ignoresSafeArea(.all)

//MARK: - 확인 버튼
if isUploading {
ProgressView()
} else {
Button{
addJourney()
} label: {
Text("확인")
.fontWeight(.bold)
.foregroundStyle(.white)
.padding(.horizontal,50)
.padding(.vertical,20)
.background(testString.isEmpty ? Color(hex: 0x566375).opacity(0.5) : Color(hex: 0x566375))
.clipShape(RoundedRectangle(cornerRadius: 15.0))
}
.padding(.top, 30)
.disabled(testString.isEmpty)
}
}
}
.ignoresSafeArea(.all)

}
.gradientBackground()
// MARK: - ALERT

.alert("알람", isPresented: $showAlert) {
Expand Down
3 changes: 1 addition & 2 deletions Packing/View/AddPersonalLuggageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ struct AddPersonalLuggageView: View {
.font(.title2)
.fontWeight(.bold)
.scrollContentBackground(.hidden)
.background(RoundedRectangle(cornerRadius: 30)
.fill(LinearGradient(colors: [Color(hex: "AEC6CF"),Color(hex: "ECECEC"),Color(hex: "FFFDD0")], startPoint: .topLeading, endPoint: .bottomTrailing)))
.gradientBackground()
.ignoresSafeArea()
}
}
Expand Down
4 changes: 2 additions & 2 deletions Packing/View/AddShareLuggageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ struct AddShareLuggageView: View {
.font(.title2)
.fontWeight(.bold)
.scrollContentBackground(.hidden)
.background(RoundedRectangle(cornerRadius: 30)
.fill(LinearGradient(colors: [Color(hex: "AEC6CF"),Color(hex: "ECECEC"),Color(hex: "FFFDD0")], startPoint: .topLeading, endPoint: .bottomTrailing)))
.gradientBackground()
.ignoresSafeArea()
}
}
}

Loading