Skip to content

Commit

Permalink
발표 전 마무리된 부분
Browse files Browse the repository at this point in the history
.
  • Loading branch information
ys00912 committed Dec 14, 2024
2 parents d3f2168 + c733c4d commit 3ee240e
Show file tree
Hide file tree
Showing 162 changed files with 15,379 additions and 278 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Washabit/.DS_Store
Binary file not shown.
6 changes: 6 additions & 0 deletions Washabit/Washabit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Washabit/Preview Content\"";
DEVELOPMENT_TEAM = 4A3YKSVN4S;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -468,6 +470,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "-11.Washabit";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -479,9 +482,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Washabit/Preview Content\"";
DEVELOPMENT_TEAM = 4A3YKSVN4S;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
Expand All @@ -496,6 +501,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "-11.Washabit";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Binary file modified Washabit/Washabit/.DS_Store
Binary file not shown.
34 changes: 20 additions & 14 deletions Washabit/Washabit/AddHabitView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ struct AddHabitView: View {
Image(systemName: "chevron.left")
.font(.system(size: 18, weight: .bold))
.foregroundColor(Color("StrongBlue-font"))
.padding(.top,10)
.padding(.leading,20)
}
}
Spacer()
}
.padding([.top,.leading],20)
ZStack{
HStack{
Text("새 목표 추가하기")
.foregroundColor(Color("StrongBlue-font"))
.bold()
Expand All @@ -83,7 +84,7 @@ struct AddHabitView: View {
}
.padding(.trailing, 40)
}
ZStack{
HStack{
Text("목표 설정하기")
.foregroundColor(Color("StrongBlue-font"))
.bold()
Expand All @@ -98,6 +99,7 @@ struct AddHabitView: View {
.padding([.top,.leading],20)
.bold()
.font(.system(size: 15))
.foregroundColor(Color("StrongGray-font"))
HStack(spacing:25){
Spacer()
ForEach(options, id:\.self){ option in
Expand All @@ -117,7 +119,6 @@ struct AddHabitView: View {
}
.onTapGesture {
selectedOption = option
print("Selected: \(selectedOption!)")
}
}
Spacer()
Expand All @@ -128,13 +129,15 @@ struct AddHabitView: View {
.padding(.bottom, 10)
.bold()
.font(.system(size: 15))
.foregroundColor(Color("StrongGray-font"))
CustomDatePickerView(startDate: $startDate, endDate: $endDate)

HStack{
Text(selectedOption == "고치고 싶은" ? "하루 제한 횟수" : "하루 실행 횟수")
.padding(.leading, 20)
.bold()
.font(.system(size: 15))
.foregroundColor(Color("StrongGray-font"))
Spacer()

Menu {
Expand Down Expand Up @@ -163,6 +166,7 @@ struct AddHabitView: View {
.padding(.leading, 20)
.bold()
.font(.system(size: 15))
.foregroundColor(Color("StrongGray-font"))
Spacer()
Menu {
ForEach(percentageOptions, id: \.self) { option in
Expand Down Expand Up @@ -198,6 +202,7 @@ struct AddHabitView: View {
} else {
showConfirmation = true
}

}
label: {
Circle()
Expand All @@ -217,6 +222,7 @@ struct AddHabitView: View {
.padding()
}
.ignoresSafeArea()
.ignoresSafeArea(.keyboard)
.navigationBarBackButtonHidden(true)
.alert(isPresented: $showAlert) {
Alert(title: Text("알림"), message: Text(alertMessage), dismissButton: .default(Text("확인")))
Expand All @@ -227,16 +233,16 @@ struct AddHabitView: View {
titleVisibility: .visible
) {
Button("등록", role: .none) {
HabitManager.addNewHabit(
title,
selectedOption ?? "고치고 싶은",
selectedCount,
selectedPercentage,
startDate ?? Date(),
endDate ?? Date(),
to: modelContext
)
self.presentationMode.wrappedValue.dismiss()
HabitManager.addNewHabit(
title,
selectedOption ?? "고치고 싶은",
selectedCount,
selectedPercentage,
startDate ?? Date(),
endDate ?? Date(),
to: modelContext
)
self.presentationMode.wrappedValue.dismiss()
}
Button("취소", role: .cancel) {}
}
Expand Down
Binary file modified Washabit/Washabit/Assets.xcassets/.DS_Store
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3ee240e

Please sign in to comment.