Skip to content

Commit

Permalink
Auto stash before merge of "develop" and "origin/develop"
Browse files Browse the repository at this point in the history
  • Loading branch information
@MoonJisu
MoonJisu committed Dec 10, 2020
1 parent 42e520b commit ea50f78
Show file tree
Hide file tree
Showing 25 changed files with 786 additions and 231 deletions.
43 changes: 43 additions & 0 deletions Darner-dan-uh/Darner-dan-uh.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@
9F2CE42D25674F600024FD12 /* RankingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F2CE42C25674F600024FD12 /* RankingModel.swift */; };
9F5765482577360A003B37BA /* Mypage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F5765472577360A003B37BA /* Mypage.storyboard */; };
9FC343302566BA54003AEE58 /* RankingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC3432F2566BA54003AEE58 /* RankingViewModel.swift */; };
9FC7CC91257E1CE000412C16 /* StackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC7CC90257E1CE000412C16 /* StackViewController.swift */; };
9FC7CC94257E47FE00412C16 /* MemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC7CC93257E47FE00412C16 /* MemoViewController.swift */; };
9FC7CC99257E5CA900412C16 /* MemoTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC7CC98257E5CA900412C16 /* MemoTableViewCell.swift */; };
9FC7CC9D257E681400412C16 /* MemoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC7CC9C257E681400412C16 /* MemoModel.swift */; };
9FCC818A25772C6B0010123B /* SeeMypageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FCC818925772C6B0010123B /* SeeMypageViewModel.swift */; };
<<<<<<< Updated upstream
D620C5372582587800AA628B /* CharacterCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D620C5362582587800AA628B /* CharacterCollectionViewCell.swift */; };
=======
9FE5E5482582566B008D2255 /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FE5E5472582566B008D2255 /* DetailViewController.swift */; };
>>>>>>> Stashed changes
D63FE3212535EF4600DCD75F /* BinggraeMelona-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D63FE31F2535EF4500DCD75F /* BinggraeMelona-Bold.ttf */; };
D63FE3222535EF4600DCD75F /* BinggraeMelona.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D63FE3202535EF4500DCD75F /* BinggraeMelona.ttf */; };
D644AC8825700665002905AE /* CheckCertificationNumberViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D644AC8725700665002905AE /* CheckCertificationNumberViewModel.swift */; };
Expand Down Expand Up @@ -73,8 +81,16 @@
9F2CE42C25674F600024FD12 /* RankingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingModel.swift; sourceTree = "<group>"; };
9F5765472577360A003B37BA /* Mypage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Mypage.storyboard; sourceTree = "<group>"; };
9FC3432F2566BA54003AEE58 /* RankingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingViewModel.swift; sourceTree = "<group>"; };
9FC7CC90257E1CE000412C16 /* StackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackViewController.swift; sourceTree = "<group>"; };
9FC7CC93257E47FE00412C16 /* MemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoViewController.swift; sourceTree = "<group>"; };
9FC7CC98257E5CA900412C16 /* MemoTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoTableViewCell.swift; sourceTree = "<group>"; };
9FC7CC9C257E681400412C16 /* MemoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemoModel.swift; sourceTree = "<group>"; };
9FCC818925772C6B0010123B /* SeeMypageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeeMypageViewModel.swift; sourceTree = "<group>"; };
<<<<<<< Updated upstream
D620C5362582587800AA628B /* CharacterCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterCollectionViewCell.swift; sourceTree = "<group>"; };
=======
9FE5E5472582566B008D2255 /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
>>>>>>> Stashed changes
D63FE31F2535EF4500DCD75F /* BinggraeMelona-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "BinggraeMelona-Bold.ttf"; sourceTree = "<group>"; };
D63FE3202535EF4500DCD75F /* BinggraeMelona.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = BinggraeMelona.ttf; sourceTree = "<group>"; };
D644AC8725700665002905AE /* CheckCertificationNumberViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckCertificationNumberViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -159,6 +175,14 @@
path = Cell;
sourceTree = "<group>";
};
9FC7CC97257E5C8500412C16 /* Cell */ = {
isa = PBXGroup;
children = (
9FC7CC98257E5CA900412C16 /* MemoTableViewCell.swift */,
);
path = Cell;
sourceTree = "<group>";
};
A2011636CCE48406938D6CA0 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -318,7 +342,11 @@
children = (
9FC3431925668426003AEE58 /* Cell */,
D6A6E26B2563561300A77E05 /* RankingViewController.swift */,
<<<<<<< Updated upstream
D660A21D257DA10600C5FE6F /* StackViewController.swift */,
=======
9FC7CC90257E1CE000412C16 /* StackViewController.swift */,
>>>>>>> Stashed changes
);
path = Ranking;
sourceTree = "<group>";
Expand Down Expand Up @@ -348,7 +376,10 @@
D6BB3744255D1BF30049BB65 /* Writing */ = {
isa = PBXGroup;
children = (
9FC7CC97257E5C8500412C16 /* Cell */,
D6A6E266256355D900A77E05 /* WritingViewController.swift */,
9FC7CC93257E47FE00412C16 /* MemoViewController.swift */,
9FE5E5472582566B008D2255 /* DetailViewController.swift */,
);
path = Writing;
sourceTree = "<group>";
Expand All @@ -359,6 +390,7 @@
D660A211257DA01F00C5FE6F /* LevelModel.swift */,
D660A214257DA03900C5FE6F /* TestResultModel.swift */,
9F2CE42C25674F600024FD12 /* RankingModel.swift */,
9FC7CC9C257E681400412C16 /* MemoModel.swift */,
);
path = Model;
sourceTree = "<group>";
Expand Down Expand Up @@ -523,8 +555,12 @@
D6A6E12025634B6400A77E05 /* UIViewController.swift in Sources */,
D6A6E23C2563544F00A77E05 /* RegisterViewModel.swift in Sources */,
9F2CE42D25674F600024FD12 /* RankingModel.swift in Sources */,
<<<<<<< Updated upstream
D660A21E257DA10600C5FE6F /* StackViewController.swift in Sources */,
D660A21A257DA0D700C5FE6F /* RankingCell.swift in Sources */,
=======
9FC7CC9D257E681400412C16 /* MemoModel.swift in Sources */,
>>>>>>> Stashed changes
D6A6E22F2563541E00A77E05 /* EnterPwViewController.swift in Sources */,
D6A6E22E2563541E00A77E05 /* SetMainCharacterViewController.swift in Sources */,
D6A6E11D25634B6400A77E05 /* ViewControllerName.swift in Sources */,
Expand All @@ -543,8 +579,10 @@
D6A6E25D2563557600A77E05 /* MemorizationViewController.swift in Sources */,
D6A6E2302563541E00A77E05 /* CharacterCollectionViewController.swift in Sources */,
D6A6E2472563554D00A77E05 /* CheckCertificationNumberViewController.swift in Sources */,
9FC7CC94257E47FE00412C16 /* MemoViewController.swift in Sources */,
D6578ACB2500867A000185F1 /* AppDelegate.swift in Sources */,
9FC343302566BA54003AEE58 /* RankingViewModel.swift in Sources */,
9FE5E5482582566B008D2255 /* DetailViewController.swift in Sources */,
D6A6E26C2563561300A77E05 /* RankingViewController.swift in Sources */,
D6A6E23A2563544F00A77E05 /* MypageViewModel.swift in Sources */,
D644AC9225700B21002905AE /* TokenMessageModel.swift in Sources */,
Expand All @@ -558,11 +596,16 @@
D6A6E11E25634B6400A77E05 /* UIColor.swift in Sources */,
D6A6E2312563541E00A77E05 /* ModifyViewController.swift in Sources */,
D6A6E25A2563557600A77E05 /* TestViewController.swift in Sources */,
<<<<<<< Updated upstream
D644AC9E257011FF002905AE /* MessageModel.swift in Sources */,
=======
9FC7CC99257E5CA900412C16 /* MemoTableViewCell.swift in Sources */,
>>>>>>> Stashed changes
D6A6E2572563557600A77E05 /* SelectWordNumViewController.swift in Sources */,
D6A6E23B2563544F00A77E05 /* ViewModelType.swift in Sources */,
D644AC8825700665002905AE /* CheckCertificationNumberViewModel.swift in Sources */,
D6A6E267256355D900A77E05 /* WritingViewController.swift in Sources */,
9FC7CC91257E1CE000412C16 /* StackViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified ...h/Darner-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
52 changes: 50 additions & 2 deletions ...er-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,60 @@
filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPI.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "122"
endingLineNumber = "122"
startingLineNumber = "126"
endingLineNumber = "126"
landmarkName = "parameter"
landmarkType = "24">
>>>>>>> MypageNetworking
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C3B05FBC-CA57-4D86-A2CE-9C08E842CF05"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Darner-dan-uh/Source/Modules/Writing/WritingViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "53"
endingLineNumber = "53"
landmarkName = "save(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9701E502-DC91-4273-A73C-373632E82A24"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Darner-dan-uh/Source/Model/MemoModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "12"
endingLineNumber = "12"
landmarkName = "MemoModel"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A66466C6-A00F-415C-A827-906FCB1663B3"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Darner-dan-uh/Source/Model/MemoModel.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "13"
endingLineNumber = "13"
landmarkName = "MemoModel"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
31 changes: 13 additions & 18 deletions Darner-dan-uh/Darner-dan-uh/Source/Base/Mypage.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</attributedString>
</state>
<connections>
<segue destination="x8z-rV-U7r" kind="show" id="66q-1J-qUY"/>
<segue destination="x8z-rV-U7r" kind="presentation" id="sfn-eL-O78"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cl5-s7-HeJ">
Expand Down Expand Up @@ -235,19 +235,6 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<navigationBar contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IIE-Xj-XAP">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="eJg-Zc-ezQ"/>
</constraints>
<items>
<navigationItem title="마이페이지" id="Jds-uM-9hc">
<barButtonItem key="rightBarButtonItem" title="Cancle" id="qLG-Ci-CtZ">
<color key="tintColor" red="0.99792057280000002" green="0.45095777510000001" blue="0.48626422879999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</barButtonItem>
</navigationItem>
</items>
</navigationBar>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zdA-RM-q8r">
<rect key="frame" x="72" y="244" width="270" height="29.5"/>
<constraints>
Expand Down Expand Up @@ -317,20 +304,28 @@
</attributedString>
</state>
</button>
<navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jFG-kj-npE">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<items>
<navigationItem title="마이페이지" id="nYG-YL-nd2">
<barButtonItem key="rightBarButtonItem" title="Cancel" id="pBt-x4-vd3">
<color key="tintColor" red="0.99792057280000002" green="0.45095777510000001" blue="0.48626422879999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</barButtonItem>
</navigationItem>
</items>
</navigationBar>
</subviews>
<viewLayoutGuide key="safeArea" id="9vJ-yM-AhF"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="IIE-Xj-XAP" firstAttribute="centerX" secondItem="zdA-RM-q8r" secondAttribute="centerX" id="1pt-sU-KV2"/>
<constraint firstItem="eaI-HP-I9y" firstAttribute="leading" secondItem="a16-yT-foq" secondAttribute="trailing" constant="5" id="Fqu-hQ-59i"/>
<constraint firstItem="9vJ-yM-AhF" firstAttribute="trailing" secondItem="eaI-HP-I9y" secondAttribute="trailing" constant="72" id="Gxj-nH-jKu"/>
<constraint firstItem="a16-yT-foq" firstAttribute="leading" secondItem="9vJ-yM-AhF" secondAttribute="leading" constant="72" id="H6v-hb-60E"/>
<constraint firstItem="dIj-yf-P85" firstAttribute="centerX" secondItem="qMY-wF-u5v" secondAttribute="centerX" id="Lir-fJ-p80"/>
<constraint firstItem="IIE-Xj-XAP" firstAttribute="top" secondItem="9vJ-yM-AhF" secondAttribute="top" id="NSx-Pw-uq2"/>
<constraint firstItem="IIE-Xj-XAP" firstAttribute="leading" secondItem="qMY-wF-u5v" secondAttribute="leading" id="Opk-X4-WJN"/>
<constraint firstItem="eaI-HP-I9y" firstAttribute="top" secondItem="Vei-a7-Ng4" secondAttribute="bottom" constant="95" id="ZNQ-nK-IYW"/>
<constraint firstItem="zdA-RM-q8r" firstAttribute="top" secondItem="9vJ-yM-AhF" secondAttribute="top" constant="244" id="d1N-2b-gKU"/>
<constraint firstItem="zdA-RM-q8r" firstAttribute="centerX" secondItem="qMY-wF-u5v" secondAttribute="centerX" id="lqG-Ns-piZ"/>
<constraint firstItem="zdA-RM-q8r" firstAttribute="top" secondItem="IIE-Xj-XAP" secondAttribute="bottom" constant="200" id="m2a-XH-lpS"/>
<constraint firstItem="a16-yT-foq" firstAttribute="top" secondItem="Vei-a7-Ng4" secondAttribute="bottom" constant="100" id="ovN-fF-Ghq"/>
<constraint firstItem="9vJ-yM-AhF" firstAttribute="bottom" secondItem="dIj-yf-P85" secondAttribute="bottom" constant="187" id="owJ-ka-g1P"/>
<constraint firstItem="Vei-a7-Ng4" firstAttribute="top" secondItem="zdA-RM-q8r" secondAttribute="bottom" constant="30" id="siK-5g-xsn"/>
Expand Down
Loading

0 comments on commit ea50f78

Please sign in to comment.