Skip to content

[Feat] JsonParsing #22

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

Merged
merged 18 commits into from
Sep 14, 2022
Merged

[Feat] JsonParsing #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b601741
[init]
insub4067 Sep 12, 2022
e3c0cda
[Refactor] VMO 패턴
insub4067 Sep 12, 2022
52b0774
[Refactor] init
insub4067 Sep 12, 2022
9e16ca0
[Refactor] Animation
insub4067 Sep 12, 2022
da63a99
[Feat] 일정 계산 기능
insub4067 Sep 12, 2022
03e52f3
[Refactor] placeholder image color opacity
insub4067 Sep 12, 2022
b8d9b33
[Refactor] EventView 하드코딩을 Json으로 이동했습니다
insub4067 Sep 13, 2022
a70100e
[Refactor] json storage url을 AsyncSwift Organization Repo로 이동했습니다
insub4067 Sep 13, 2022
81d1d12
[Refactor] Speaker Profile Image Placeholder 변경
insub4067 Sep 13, 2022
14af6b5
[Refactor] SessionView layout 수정
insub4067 Sep 13, 2022
5bb38e7
[Refactor] SessionView 수정
insub4067 Sep 13, 2022
9e69914
Merge branch 'develop' into JSONParsing
insub4067 Sep 14, 2022
27a182b
[Refactor] Review 수정 사항을 적용 하였습니다
insub4067 Sep 14, 2022
fee9b91
[Refactor] Mode 설정 수정
insub4067 Sep 14, 2022
6fd1150
[Refactor] Struct 구조를 수정하였습니다
insub4067 Sep 14, 2022
40187be
[Refactor] print를 제거 하였습니다
insub4067 Sep 14, 2022
db8ff7c
[Refactor] comment를 제거했습니다
insub4067 Sep 14, 2022
0970590
[Refactor] 요청 사항 수정
insub4067 Sep 14, 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
38 changes: 23 additions & 15 deletions AsyncSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
B289943328CA69FF002B9F67 /* StampView+Observed.swift in Sources */ = {isa = PBXBuildFile; fileRef = B289943228CA69FF002B9F67 /* StampView+Observed.swift */; };
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 */; };
C66C68D328D1B00A0091F960 /* EventModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C66C68D228D1B00A0091F960 /* EventModel.swift */; };
C66C68D528D1B0130091F960 /* SessionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C66C68D428D1B0130091F960 /* SessionModel.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 */; };
Expand All @@ -27,7 +28,6 @@
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 */; };
C6F7798F28C9D1BF0036773B /* SessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7798E28C9D1BF0036773B /* SessionView.swift */; };
C6F7799128C9E5DD0036773B /* EventDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F7799028C9E5DD0036773B /* EventDetailView.swift */; };
E9171F0028D15426002FAF52 /* TicketingView+Observed.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9171EFF28D15426002FAF52 /* TicketingView+Observed.swift */; };
Expand All @@ -38,9 +38,10 @@
B289943228CA69FF002B9F67 /* StampView+Observed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StampView+Observed.swift"; sourceTree = "<group>"; };
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>"; };
C66C68D228D1B00A0091F960 /* EventModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventModel.swift; sourceTree = "<group>"; };
C66C68D428D1B0130091F960 /* SessionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionModel.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>"; };
Expand All @@ -56,7 +57,6 @@
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>"; };
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>"; };
E9171EFF28D15426002FAF52 /* TicketingView+Observed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TicketingView+Observed.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -100,7 +100,7 @@
C68DE93528C7685800CA4CC8 /* AsyncSwiftApp.swift */,
C68DE94B28C76F3200CA4CC8 /* AppDelegate.swift */,
C6E7449E28CA556800B7B2BD /* Extensions */,
C6F7798828C9CB9B0036773B /* Identifiable */,
C6F7798828C9CB9B0036773B /* Models */,
C68DE95228C77F4800CA4CC8 /* Views */,
C6F7798928C9CBA60036773B /* Observed */,
C68DE93928C7685900CA4CC8 /* Assets.xcassets */,
Expand Down Expand Up @@ -142,13 +142,13 @@
path = Extensions;
sourceTree = "<group>";
};
C6F7798828C9CB9B0036773B /* Identifiable */ = {
C6F7798828C9CB9B0036773B /* Models */ = {
isa = PBXGroup;
children = (
C6F7798C28C9CBD80036773B /* EventResponse.swift */,
C63A866028CB252D0064C417 /* Mock.swift */,
C66C68D228D1B00A0091F960 /* EventModel.swift */,
C66C68D428D1B0130091F960 /* SessionModel.swift */,
);
path = Identifiable;
path = Models;
sourceTree = "<group>";
};
C6F7798928C9CBA60036773B /* Observed */ = {
Expand Down Expand Up @@ -247,6 +247,7 @@
C6E744A028CA557100B7B2BD /* Color+.swift in Sources */,
C68DE95128C77DDA00CA4CC8 /* TicketingView.swift in Sources */,
C6F7798B28C9CBC60036773B /* EventView+Observed.swift in Sources */,
C66C68D528D1B0130091F960 /* SessionModel.swift in Sources */,
E9171F0028D15426002FAF52 /* TicketingView+Observed.swift in Sources */,
C6F7798728C9CB3A0036773B /* StampView.swift in Sources */,
B289943328CA69FF002B9F67 /* StampView+Observed.swift in Sources */,
Expand All @@ -255,12 +256,11 @@
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 */,
C66C68D328D1B00A0091F960 /* EventModel.swift in Sources */,
B2E1083128C9CD6900C3DD59 /* AppData.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -395,11 +395,15 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AsyncSwift/Info.plist;
INFOPLIST_KEY_NSCalendarsUsageDescription = "캘린더에 일정 추가를 위해서는 권한이 필요해요.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIStatusBarHidden = NO;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -426,11 +430,15 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = AsyncSwift/Info.plist;
INFOPLIST_KEY_NSCalendarsUsageDescription = "캘린더에 일정 추가를 위해서는 권한이 필요해요.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIStatusBarHidden = NO;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/kiminsub.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions AsyncSwift/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
let data1Key = "DATA1"
let data2Key = "DATA2"

static var orientationLock = UIInterfaceOrientationMask.all

func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
return AppDelegate.orientationLock
}

// Register for remote notifications
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
FirebaseApp.configure()
Expand Down
2 changes: 1 addition & 1 deletion AsyncSwift/AsyncSwiftApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftUI
struct AsyncSwiftApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
@ObservedObject var appData: AppData = AppData()

var body: some Scene {
WindowGroup {
MainTabView()
Expand Down
14 changes: 0 additions & 14 deletions AsyncSwift/Identifiable/EventResponse.swift
View file
Open in desktop

This file was deleted.

Loading