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

Jump to bottom

iOS/feature/24/loading view controller #25

Merged
merged 3 commits into from
Apr 28, 2021
Merged

iOS/feature/24/loading view controller #25

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
426785a
feat: LoadingViewController 생성 (#24)
HongzCloud Apr 28, 2021
de5f891
chore: 기존 LoadingView 삭제 (#24)
HongzCloud Apr 28, 2021
9e8d6b6
chore: print문 제거 (#24)
HongzCloud Apr 28, 2021
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
4 changes: 2 additions & 2 deletions ...hApp/Pods/Pods.xcodeproj/xcuserdata/ohking.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions SideDishApp/SideDishApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
1E1DBADE262DDDFD0050FE6C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1E1DBADC262DDDFD0050FE6C /* LaunchScreen.storyboard */; };
1E5053C82636F504005615F5 /* DishesEntity+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5053C72636F504005615F5 /* DishesEntity+CoreDataProperties.swift */; };
1E5053C92636F504005615F5 /* DishesEntity+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E5053C52636F504005615F5 /* DishesEntity+CoreDataClass.swift */; };
1E50540B26395ADB005615F5 /* LoadingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E50540A26395ADB005615F5 /* LoadingViewController.swift */; };
1ECD5F62262F256000DC56C0 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F61262F256000DC56C0 /* Endpoint.swift */; };
1ECD5F66262F2E1E00DC56C0 /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F65262F2E1E00DC56C0 /* NetworkManager.swift */; };
1ECD5F6A262F3B6500DC56C0 /* DishNetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F69262F3B6500DC56C0 /* DishNetworkManager.swift */; };
1ECD5F6D262F3C1700DC56C0 /* Dish.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F6C262F3C1700DC56C0 /* Dish.swift */; };
1ECD5F70262F3F1C00DC56C0 /* MenuListUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F6F262F3F1C00DC56C0 /* MenuListUseCase.swift */; };
1ECD5F73262F405100DC56C0 /* MenuListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECD5F72262F405100DC56C0 /* MenuListViewModel.swift */; };
1ECF2E812632A70F006982BE /* LoadingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1ECF2E802632A70F006982BE /* LoadingView.xib */; };
1ECF2E842632A862006982BE /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF2E832632A862006982BE /* LoadingView.swift */; };
1ECF2EBC2635D6FD006982BE /* MenuRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF2EBB2635D6FD006982BE /* MenuRepository.swift */; };
1ECF2EC02635DE65006982BE /* CoreData.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF2EBE2635DE65006982BE /* CoreData.xcdatamodeld */; };
1ECF2EC32635E2EC006982BE /* CoreDataMenuResponseStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF2EC22635E2EC006982BE /* CoreDataMenuResponseStorage.swift */; };
B0911E6F262EA29200D5EBEC /* DishCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0911E6E262EA29200D5EBEC /* DishCardCell.swift */; };
B04466292636911D00DAD616 /* DishCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B04466272636911D00DAD616 /* DishCell.swift */; };
B044662A2636911D00DAD616 /* DishCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B04466282636911D00DAD616 /* DishCell.xib */; };
B0911EA026316B9A00D5EBEC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0911E9F26316B9A00D5EBEC /* String+Extension.swift */; };
Expand All @@ -46,14 +44,13 @@
1E1DBADF262DDDFD0050FE6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Info.plist; sourceTree = "<group>"; };
1E5053C52636F504005615F5 /* DishesEntity+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "DishesEntity+CoreDataClass.swift"; path = "/Users/ohking/Desktop/masters_codesquad/sidedish/SideDishApp/SideDishApp/Data/Persistence/DishesEntity+CoreDataClass.swift"; sourceTree = "<absolute>"; };
1E5053C72636F504005615F5 /* DishesEntity+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "DishesEntity+CoreDataProperties.swift"; path = "/Users/ohking/Desktop/masters_codesquad/sidedish/SideDishApp/SideDishApp/Data/Persistence/DishesEntity+CoreDataProperties.swift"; sourceTree = "<absolute>"; };
1E50540A26395ADB005615F5 /* LoadingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingViewController.swift; sourceTree = "<group>"; };
1ECD5F61262F256000DC56C0 /* Endpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = "<group>"; };
1ECD5F65262F2E1E00DC56C0 /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = "<group>"; };
1ECD5F69262F3B6500DC56C0 /* DishNetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DishNetworkManager.swift; sourceTree = "<group>"; };
1ECD5F6C262F3C1700DC56C0 /* Dish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dish.swift; sourceTree = "<group>"; };
1ECD5F6F262F3F1C00DC56C0 /* MenuListUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuListUseCase.swift; sourceTree = "<group>"; };
1ECD5F72262F405100DC56C0 /* MenuListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuListViewModel.swift; sourceTree = "<group>"; };
1ECF2E802632A70F006982BE /* LoadingView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LoadingView.xib; sourceTree = "<group>"; };
1ECF2E832632A862006982BE /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
1ECF2EBB2635D6FD006982BE /* MenuRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuRepository.swift; sourceTree = "<group>"; };
1ECF2EBF2635DE65006982BE /* CoreData.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = CoreData.xcdatamodel; sourceTree = "<group>"; };
1ECF2EC22635E2EC006982BE /* CoreDataMenuResponseStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataMenuResponseStorage.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -179,9 +176,6 @@
isa = PBXGroup;
children = (
1E1DBAD7262DDDFC0050FE6C /* Main.storyboard */,
B0911E6E262EA29200D5EBEC /* DishCardCell.swift */,
1ECF2E802632A70F006982BE /* LoadingView.xib */,
1ECF2E832632A862006982BE /* LoadingView.swift */,
B04466272636911D00DAD616 /* DishCell.swift */,
B04466282636911D00DAD616 /* DishCell.xib */,
);
Expand All @@ -191,6 +185,7 @@
1E1DBAED262DDE640050FE6C /* ViewController */ = {
isa = PBXGroup;
children = (
1E50540A26395ADB005615F5 /* LoadingViewController.swift */,
1E1DBAD5262DDDFC0050FE6C /* ViewController.swift */,
B0911EA32631AF3400D5EBEC /* DiffableProvider.swift */,
B0911EA72632B7A000D5EBEC /* DishCollectionViewDelegate.swift */,
Expand Down Expand Up @@ -327,7 +322,6 @@
buildActionMask = 2147483647;
files = (
1E1DBADE262DDDFD0050FE6C /* LaunchScreen.storyboard in Resources */,
1ECF2E812632A70F006982BE /* LoadingView.xib in Resources */,
B044662A2636911D00DAD616 /* DishCell.xib in Resources */,
1E1DBADB262DDDFD0050FE6C /* Assets.xcassets in Resources */,
1E1DBAD9262DDDFC0050FE6C /* Main.storyboard in Resources */,
Expand Down Expand Up @@ -390,6 +384,7 @@
1E1DBAD6262DDDFC0050FE6C /* ViewController.swift in Sources */,
1ECD5F70262F3F1C00DC56C0 /* MenuListUseCase.swift in Sources */,
1ECD5F6A262F3B6500DC56C0 /* DishNetworkManager.swift in Sources */,
1E50540B26395ADB005615F5 /* LoadingViewController.swift in Sources */,
1E5053C82636F504005615F5 /* DishesEntity+CoreDataProperties.swift in Sources */,
B04466292636911D00DAD616 /* DishCell.swift in Sources */,
1E1DBAD2262DDDFC0050FE6C /* AppDelegate.swift in Sources */,
Expand All @@ -399,7 +394,6 @@
B0911EA42631AF3400D5EBEC /* DiffableProvider.swift in Sources */,
B0911EA82632B7A100D5EBEC /* DishCollectionViewDelegate.swift in Sources */,
1E1DBAD4262DDDFC0050FE6C /* SceneDelegate.swift in Sources */,
1ECF2E842632A862006982BE /* LoadingView.swift in Sources */,
1E5053C92636F504005615F5 /* DishesEntity+CoreDataClass.swift in Sources */,
1ECD5F73262F405100DC56C0 /* MenuListViewModel.swift in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion ...pp/SideDishApp.xcodeproj/xcuserdata/ohking.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>SideDishApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>0</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file modified ...hApp/SideDishApp.xcworkspace/xcuserdata/ohking.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
117 changes: 0 additions & 117 deletions ...ideDishApp.xcworkspace/xcuserdata/ohking.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,121 +3,4 @@
uuid = "A5E17B2F-95B0-4582-ACBD-4CD3BE453B84"
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4BB5EFC5-F3F1-4674-966F-4AE74C65632A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SideDishApp/Presentation/UI/ViewController/ViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "36"
endingLineNumber = "36"
landmarkName = "setLoadingView()"
<<<<<<< HEAD
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4F83E090-7FC5-43DA-AE9C-A04C07969516"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "22"
endingLineNumber = "22"
landmarkName = "get(url:completion:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9C7CE4A8-E875-4643-AFE7-42E505C743F8"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
landmarkName = "get(url:completion:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7419D406-B14F-429B-AF44-B38479ECF28F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
endingLineNumber = "25"
landmarkName = "get(url:completion:)"
landmarkType = "7">
<Locations>
<Location
uuid = "7419D406-B14F-429B-AF44-B38479ECF28F - 446506456e93e6b6"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "SideDishApp.NetworkManager.get&lt;A where A: Swift.Decodable&gt;(url: Swift.Optional&lt;Foundation.URL&gt;, completion: (Swift.Result&lt;Foundation.Data, SideDishApp.NetworkError&gt;) -&gt; ()) -&gt; Combine.AnyPublisher&lt;A, SideDishApp.NetworkError&gt;"
moduleName = "SideDishApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ohking/Desktop/masters_codesquad/sidedish/SideDishApp/SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "25"
endingLineNumber = "25"
offsetFromSymbolStart = "1232">
</Location>
<Location
uuid = "7419D406-B14F-429B-AF44-B38479ECF28F - b556638f71ad593"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #2 (Foundation.Data, __C.NSURLResponse) -&gt; Combine.AnyPublisher&lt;A, SideDishApp.NetworkError&gt; in SideDishApp.NetworkManager.get&lt;A where A: Swift.Decodable&gt;(url: Swift.Optional&lt;Foundation.URL&gt;, completion: (Swift.Result&lt;Foundation.Data, SideDishApp.NetworkError&gt;) -&gt; ()) -&gt; Combine.AnyPublisher&lt;A, SideDishApp.NetworkError&gt;"
moduleName = "SideDishApp"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/ohking/Desktop/masters_codesquad/sidedish/SideDishApp/SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "26"
endingLineNumber = "26"
offsetFromSymbolStart = "727">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "382E92C7-C346-4A37-9FBC-406221A498C7"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SideDishApp/Data/Network/NetworkManager.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "27"
endingLineNumber = "27"
landmarkName = "get(url:completion:)"
=======
>>>>>>> Dev-iOS
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
33 changes: 30 additions & 3 deletions SideDishApp/SideDishApp/Presentation/UI/View/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4g2-P2-tDV">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="6YG-Ix-hqn">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
Expand All @@ -12,7 +12,7 @@
<!--든든한 국밥 한그릇 뚝딱-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="SideDishApp" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ViewController" id="BYZ-38-t0r" customClass="ViewController" customModule="SideDishApp" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -114,10 +114,36 @@
</objects>
<point key="canvasLocation" x="947.82608695652186" y="88.392857142857139"/>
</scene>
<!--Loading View Controller-->
<scene sceneID="tH1-3s-QBc">
<objects>
<viewController id="6YG-Ix-hqn" customClass="LoadingViewController" customModule="SideDishApp" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="XR6-Eq-Mgd">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="shopping" translatesAutoresizingMaskIntoConstraints="NO" id="u1Y-gj-uGf">
<rect key="frame" x="157" y="398" width="100" height="100"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="iym-qM-cMH"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="iym-qM-cMH" firstAttribute="bottom" secondItem="u1Y-gj-uGf" secondAttribute="bottom" constant="364" id="9Xn-Hh-uqv"/>
<constraint firstItem="iym-qM-cMH" firstAttribute="trailing" secondItem="u1Y-gj-uGf" secondAttribute="trailing" constant="157" id="O7f-BC-QB5"/>
<constraint firstItem="u1Y-gj-uGf" firstAttribute="top" secondItem="iym-qM-cMH" secondAttribute="top" constant="354" id="rve-Sn-m8B"/>
<constraint firstItem="u1Y-gj-uGf" firstAttribute="leading" secondItem="iym-qM-cMH" secondAttribute="leading" constant="157" id="v1Y-zl-Ch4"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="VZv-QW-eQd" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-867" y="88"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="aQT-Ae-jwL">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="4g2-P2-tDV" sceneMemberID="viewController">
<navigationController storyboardIdentifier="MainNavigationController" automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="4g2-P2-tDV" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="YeS-1p-TZm">
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -133,6 +159,7 @@
</scene>
</scenes>
<resources>
<image name="shopping" width="300" height="300"/>
<image name="square.and.arrow.down.fill" catalog="system" width="121" height="128"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down
30 changes: 0 additions & 30 deletions SideDishApp/SideDishApp/Presentation/UI/View/LoadingView.swift
View file
Open in desktop

This file was deleted.

Loading