Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
dae0ad8
[Feat] EventView 1차 완성
insub4067 Sep 8, 2022
89bb05e
Merge branch 'develop' into master
insub4067 Sep 8, 2022
f26c76f
[Refactor] Mock 분리, Component 분리
insub4067 Sep 8, 2022
bbf666a
Merge remote-tracking branch 'insub4067/master'
insub4067 Sep 8, 2022
b6d16f1
Merge remote-tracking branch 'origin/develop'
insub4067 Sep 8, 2022
946c3ea
[Refactor] EventDetailView 뷰 분리
insub4067 Sep 8, 2022
ad8cc7f
[Refactor] SessionView 뷰 분리
insub4067 Sep 8, 2022
872aebb
[Refactor] EventDetailView 변수명 변경
insub4067 Sep 8, 2022
ce0d6c7
[Refactor] EventDetailView 코드 제거
insub4067 Sep 8, 2022
76af98c
[Refactor] property keyword 추가, naming 변경
insub4067 Sep 8, 2022
437c325
[Refactor] AppData.swift, EventView.swift
insub4067 Sep 8, 2022
ff61cfc
[Refactor] font size, weight 에 대한 수정
insub4067 Sep 8, 2022
3039a55
[Refactor] EvenDetailView 에서 TODO 추가
insub4067 Sep 8, 2022
c3dd9e5
[Refactor] todo comment 수정, font 내용 수정
insub4067 Sep 8, 2022
337e411
[Add File] Color+, Extensions 를 추가하였습니다
insub4067 Sep 8, 2022
3d0632c
init
insub4067 Sep 9, 2022
f65ff1d
init
insub4067 Sep 9, 2022
01855f9
[Refactor] 하드코딩을 Data Binding으로 뺐습니다
insub4067 Sep 9, 2022
9c340c7
[Refactor] EventDetailView의 Calendar 기능
insub4067 Sep 9, 2022
814e347
[Refactor] 길찾기 ConfirmationDialog Title 제거
insub4067 Sep 9, 2022
8e1a610
[Refactor] customDivider 를 View 의 extension 으로 옮겼습니다
insub4067 Sep 9, 2022
29e043a
[Refactor] dateFormate 을 extension으로 옮겼습니다
insub4067 Sep 9, 2022
91e9a73
[Refactor] EKEvent instance 의 위치를 함수 내부로 이동했습니다
insub4067 Sep 9, 2022
3e49ec7
[Refactor] PR 리뷰를 전부 수정하였습니다
insub4067 Sep 9, 2022
5bfa569
[Refactor] 변수의 위치 변화에 따른 불필요한 keyword를 제거 하였습니다
insub4067 Sep 9, 2022
0593232
[Refactor] url의 if let을 제거했습니다
insub4067 Sep 9, 2022
1525eba
[Refactor] PR 수정 요청 사항 수정 완료
insub4067 Sep 11, 2022
9340ff0
[Refactor] PR 내용 수정 요청 사항 적용 하였습니다
insub4067 Sep 11, 2022
21fa50a
[Refactor] PR 요청 사항 수정
insub4067 Sep 11, 2022
d50c20d
[FIX] Conflict 수정에서 누락된 파일 참조를 수동으로 추가
unnnyong Sep 12, 2022
7b43a35
[Refactor] PR 수정 사항 추가 및 Alert 기능 수정
insub4067 Sep 12, 2022
3878141
Merge branch 'EventView' of https://github.com/Async-Swift/AsyncSwift…
insub4067 Sep 12, 2022
a2139b2
[Refactor] EventDetailView의 Alert들 최종 수정하였습니다
insub4067 Sep 12, 2022
0635829
[Refactor] PR 수정 요청 사항 수정 및 AsyncImage 기능 추가
insub4067 Sep 12, 2022
54f13dd
[Refactor] SessionView+Observed 파일추가
insub4067 Sep 12, 2022
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
68 changes: 48 additions & 20 deletions AsyncSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

/* Begin PBXBuildFile section */
B2E1083128C9CD6900C3DD59 /* AppData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E1083028C9CD6900C3DD59 /* AppData.swift */; };
C63A865F28CA70ED0064C417 /* EventDetailView+Observed.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63A865E28CA70ED0064C417 /* EventDetailView+Observed.swift */; };
C63A866128CB252D0064C417 /* Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63A866028CB252D0064C417 /* Mock.swift */; };
C63A866328CB3D490064C417 /* View+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63A866228CB3D490064C417 /* View+.swift */; };
C63A866528CB3F6D0064C417 /* DateFormatter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63A866428CB3F6D0064C417 /* DateFormatter+.swift */; };
C66DAD5028CF478700195DEB /* SessionView+Observed.swift in Sources */ = {isa = PBXBuildFile; fileRef = C66DAD4F28CF478700195DEB /* SessionView+Observed.swift */; };
C68DE93628C7685800CA4CC8 /* AsyncSwiftApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68DE93528C7685800CA4CC8 /* AsyncSwiftApp.swift */; };
C68DE93828C7685800CA4CC8 /* MainTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68DE93728C7685800CA4CC8 /* MainTabView.swift */; };
C68DE93A28C7685900CA4CC8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C68DE93928C7685900CA4CC8 /* Assets.xcassets */; };
Expand All @@ -18,14 +23,22 @@
C68DE94C28C76F3200CA4CC8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68DE94B28C76F3200CA4CC8 /* AppDelegate.swift */; };
C68DE94F28C77DC900CA4CC8 /* EventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68DE94E28C77DC900CA4CC8 /* EventView.swift */; };
C68DE95128C77DDA00CA4CC8 /* TicketingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C68DE95028C77DDA00CA4CC8 /* TicketingView.swift */; };
C6E744A028CA557100B7B2BD /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6E7449F28CA557100B7B2BD /* Color+.swift */; };
C6F7798728C9CB3A0036773B /* StampView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7798628C9CB3A0036773B /* StampView.swift */; };
C6F7798B28C9CBC60036773B /* EventView+Observed.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7798A28C9CBC60036773B /* EventView+Observed.swift */; };
C6F7798D28C9CBD80036773B /* EventResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7798C28C9CBD80036773B /* EventResponse.swift */; };
E9E25D1E28CA554000986387 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E25D1D28CA554000986387 /* WebView.swift */; };
C6F7798F28C9D1BF0036773B /* SessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7798E28C9D1BF0036773B /* SessionView.swift */; };
C6F7799128C9E5DD0036773B /* EventDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7799028C9E5DD0036773B /* EventDetailView.swift */; };
E9E2A4D828CEC5680016AEFF /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E2A4D728CEC5680016AEFF /* WebView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
B2E1083028C9CD6900C3DD59 /* AppData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppData.swift; sourceTree = "<group>"; };
C63A865E28CA70ED0064C417 /* EventDetailView+Observed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EventDetailView+Observed.swift"; sourceTree = "<group>"; };
C63A866028CB252D0064C417 /* Mock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mock.swift; sourceTree = "<group>"; };
C63A866228CB3D490064C417 /* View+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+.swift"; sourceTree = "<group>"; };
C63A866428CB3F6D0064C417 /* DateFormatter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+.swift"; sourceTree = "<group>"; };
C66DAD4F28CF478700195DEB /* SessionView+Observed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionView+Observed.swift"; sourceTree = "<group>"; };
C68DE93228C7685800CA4CC8 /* AsyncSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AsyncSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
C68DE93528C7685800CA4CC8 /* AsyncSwiftApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncSwiftApp.swift; sourceTree = "<group>"; };
C68DE93728C7685800CA4CC8 /* MainTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabView.swift; sourceTree = "<group>"; };
Expand All @@ -37,10 +50,13 @@
C68DE94D28C77CC400CA4CC8 /* AsyncSwift.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AsyncSwift.entitlements; sourceTree = "<group>"; };
C68DE94E28C77DC900CA4CC8 /* EventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventView.swift; sourceTree = "<group>"; };
C68DE95028C77DDA00CA4CC8 /* TicketingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TicketingView.swift; sourceTree = "<group>"; };
C6E7449F28CA557100B7B2BD /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = "<group>"; };
C6F7798628C9CB3A0036773B /* StampView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StampView.swift; sourceTree = "<group>"; };
C6F7798A28C9CBC60036773B /* EventView+Observed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EventView+Observed.swift"; sourceTree = "<group>"; };
C6F7798C28C9CBD80036773B /* EventResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventResponse.swift; sourceTree = "<group>"; };
E9E25D1D28CA554000986387 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = "<group>"; };
C6F7798E28C9D1BF0036773B /* SessionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionView.swift; sourceTree = "<group>"; };
C6F7799028C9E5DD0036773B /* EventDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailView.swift; sourceTree = "<group>"; };
E9E2A4D728CEC5680016AEFF /* WebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -79,7 +95,7 @@
C68DE94A28C76CE000CA4CC8 /* Info.plist */,
C68DE93528C7685800CA4CC8 /* AsyncSwiftApp.swift */,
C68DE94B28C76F3200CA4CC8 /* AppDelegate.swift */,
E9E25D1F28CA554900986387 /* Extensions */,
C6E7449E28CA556800B7B2BD /* Extensions */,
C6F7798828C9CB9B0036773B /* Identifiable */,
C68DE95228C77F4800CA4CC8 /* Views */,
C6F7798928C9CBA60036773B /* Observed */,
Expand All @@ -103,16 +119,30 @@
children = (
C68DE93728C7685800CA4CC8 /* MainTabView.swift */,
C68DE94E28C77DC900CA4CC8 /* EventView.swift */,
C6F7799028C9E5DD0036773B /* EventDetailView.swift */,
C6F7798E28C9D1BF0036773B /* SessionView.swift */,
C68DE95028C77DDA00CA4CC8 /* TicketingView.swift */,
C6F7798628C9CB3A0036773B /* StampView.swift */,
);
path = Views;
sourceTree = "<group>";
};
C6E7449E28CA556800B7B2BD /* Extensions */ = {
isa = PBXGroup;
children = (
C6E7449F28CA557100B7B2BD /* Color+.swift */,
C63A866228CB3D490064C417 /* View+.swift */,
C63A866428CB3F6D0064C417 /* DateFormatter+.swift */,
E9E2A4D728CEC5680016AEFF /* WebView.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
C6F7798828C9CB9B0036773B /* Identifiable */ = {
isa = PBXGroup;
children = (
C6F7798C28C9CBD80036773B /* EventResponse.swift */,
C63A866028CB252D0064C417 /* Mock.swift */,
);
path = Identifiable;
sourceTree = "<group>";
Expand All @@ -121,19 +151,13 @@
isa = PBXGroup;
children = (
C6F7798A28C9CBC60036773B /* EventView+Observed.swift */,
C63A865E28CA70ED0064C417 /* EventDetailView+Observed.swift */,
C66DAD4F28CF478700195DEB /* SessionView+Observed.swift */,
B2E1083028C9CD6900C3DD59 /* AppData.swift */,
);
path = Observed;
sourceTree = "<group>";
};
E9E25D1F28CA554900986387 /* Extensions */ = {
isa = PBXGroup;
children = (
E9E25D1D28CA554000986387 /* WebView.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -213,13 +237,21 @@
buildActionMask = 2147483647;
files = (
C68DE94C28C76F3200CA4CC8 /* AppDelegate.swift in Sources */,
E9E25D1E28CA554000986387 /* WebView.swift in Sources */,
C66DAD5028CF478700195DEB /* SessionView+Observed.swift in Sources */,
C6E744A028CA557100B7B2BD /* Color+.swift in Sources */,
C68DE95128C77DDA00CA4CC8 /* TicketingView.swift in Sources */,
C6F7798B28C9CBC60036773B /* EventView+Observed.swift in Sources */,
C6F7798728C9CB3A0036773B /* StampView.swift in Sources */,
C63A865F28CA70ED0064C417 /* EventDetailView+Observed.swift in Sources */,
C68DE94F28C77DC900CA4CC8 /* EventView.swift in Sources */,
C68DE93828C7685800CA4CC8 /* MainTabView.swift in Sources */,
C6F7799128C9E5DD0036773B /* EventDetailView.swift in Sources */,
C68DE93628C7685800CA4CC8 /* AsyncSwiftApp.swift in Sources */,
C63A866128CB252D0064C417 /* Mock.swift in Sources */,
E9E2A4D828CEC5680016AEFF /* WebView.swift in Sources */,
C63A866328CB3D490064C417 /* View+.swift in Sources */,
C63A866528CB3F6D0064C417 /* DateFormatter+.swift in Sources */,
C6F7798F28C9D1BF0036773B /* SessionView.swift in Sources */,
C6F7798D28C9CBD80036773B /* EventResponse.swift in Sources */,
B2E1083128C9CD6900C3DD59 /* AppData.swift in Sources */,
);
Expand Down Expand Up @@ -348,11 +380,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = AsyncSwift/AsyncSwift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development: Insub Kim (Y3GMX628H8)";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"AsyncSwift/Preview Content\"";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 76AJ433CP5;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AsyncSwift/Info.plist;
Expand All @@ -368,7 +399,6 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.kim.AsyncSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = AsyncSwiftProfile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand All @@ -381,11 +411,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = AsyncSwift/AsyncSwift.entitlements;
CODE_SIGN_IDENTITY = "Apple Development: Insub Kim (Y3GMX628H8)";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"AsyncSwift/Preview Content\"";
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 76AJ433CP5;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AsyncSwift/Info.plist;
Expand All @@ -401,7 +430,6 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.kim.AsyncSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = AsyncSwiftProfile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
Expand Down
Binary file not shown.
15 changes: 3 additions & 12 deletions AsyncSwift/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,12 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.220",
"green" : "0.318",
"red" : "0.937"
"blue" : "0x38",
"green" : "0x51",
"red" : "0xEE"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal"
}
],
"info" : {
Expand Down
6 changes: 6 additions & 0 deletions AsyncSwift/Assets.xcassets/Colors/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.929",
"green" : "0.929",
"red" : "0.929"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.149",
"green" : "0.267",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF5",
"green" : "0xF4",
"red" : "0xF4"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x93",
"green" : "0x93",
"red" : "0x93"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
15 changes: 15 additions & 0 deletions AsyncSwift/Extensions/Color+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Color+.swift
// AsyncSwift
//
// Created by Kim Insub on 2022/09/09.
//

import Foundation
import SwiftUI

extension Color {
static let seminarOrange = Color("seminarOrange")
static let dividerForeground = Color("dividerForeground")
static let speakerBackground = Color("speakerBackground")
}
16 changes: 16 additions & 0 deletions AsyncSwift/Extensions/DateFormatter+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// DateFormatter+.swift
// AsyncSwift
//
// Created by Kim Insub on 2022/09/09.
//

import Foundation

extension DateFormatter {
static var calendarFormatter: DateFormatter {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

대extension 시대 ~

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

좋으다 좋으다~

let formatter = DateFormatter()
formatter.dateFormat = "yyyy/MM/dd HH:mm"
return formatter
}
}
18 changes: 18 additions & 0 deletions AsyncSwift/Extensions/View+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// View+.swift
// AsyncSwift
//
// Created by Kim Insub on 2022/09/09.
//

import SwiftUI

extension View {
@ViewBuilder
var customDivider: some View {
Rectangle()
.fill(Color.dividerForeground)
.frame(height: 3)
.edgesIgnoringSafeArea(.horizontal)
}
}
5 changes: 3 additions & 2 deletions AsyncSwift/Identifiable/EventResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Foundation

struct EventResponse: Codable, Identifiable {
let id: Int


let id: Int

}
Loading