Skip to content

Commit

Permalink
d
Browse files Browse the repository at this point in the history
  • Loading branch information
@qodhrkawk
qodhrkawk committed Nov 29, 2020
2 parents bb54542 + 8472b78 commit 8b97c19
Show file tree
Hide file tree
Showing 34 changed files with 493 additions and 217 deletions.
6 changes: 5 additions & 1 deletion Mongle/Mongle.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
7F7C097124BA2EE7007C7C52 /* SentenceInfoTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F7C097024BA2EE7007C7C52 /* SentenceInfoTVC.swift */; };
7F7C097324BAF714007C7C52 /* SentenceEdit.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7F7C097224BAF714007C7C52 /* SentenceEdit.storyboard */; };
7F7C097524BAFAAE007C7C52 /* SentenceEditVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F7C097424BAFAAE007C7C52 /* SentenceEditVC.swift */; };
7F9C56FB25727AF500999B22 /* UIImage+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9C56FA25727AF500999B22 /* UIImage+Extensions.swift */; };
7FA8C4AB24C0371C00317F43 /* MainThemeData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FA8C4AA24C0371C00317F43 /* MainThemeData.swift */; };
7FA8C4AD24C0C64F00317F43 /* ThemeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FA8C4AC24C0C64F00317F43 /* ThemeService.swift */; };
7FA8C4AF24C0C74400317F43 /* ThemeInfoData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FA8C4AE24C0C74400317F43 /* ThemeInfoData.swift */; };
Expand Down Expand Up @@ -266,6 +267,7 @@
7F7C097024BA2EE7007C7C52 /* SentenceInfoTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentenceInfoTVC.swift; sourceTree = "<group>"; };
7F7C097224BAF714007C7C52 /* SentenceEdit.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SentenceEdit.storyboard; sourceTree = "<group>"; };
7F7C097424BAFAAE007C7C52 /* SentenceEditVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentenceEditVC.swift; sourceTree = "<group>"; };
7F9C56FA25727AF500999B22 /* UIImage+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extensions.swift"; sourceTree = "<group>"; };
7FA8C4AA24C0371C00317F43 /* MainThemeData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainThemeData.swift; sourceTree = "<group>"; };
7FA8C4AC24C0C64F00317F43 /* ThemeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeService.swift; sourceTree = "<group>"; };
7FA8C4AE24C0C74400317F43 /* ThemeInfoData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeInfoData.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -683,6 +685,7 @@
7F6ABED024ADE9860040746E /* UIView+Extensions.swift */,
7F6ABED224ADE9D60040746E /* UIViewController+Extensions.swift */,
7F6ABED424ADE9FC0040746E /* UIImageView+Extensions.swift */,
7F9C56FA25727AF500999B22 /* UIImage+Extensions.swift */,
EC86B49924B7646600DB930A /* UITextField+Extensions.swift */,
B842A4452557E3B100253275 /* String+Extensions.swift */,
);
Expand Down Expand Up @@ -1090,6 +1093,7 @@
EC30462C254ED0AA00DB6E4A /* ServiceAgreeForSignUpVC.swift in Sources */,
B8E2E17B24C2A33600595752 /* MySentenceService.swift in Sources */,
EC759C3C24BED5CD001D2F81 /* SigninData.swift in Sources */,
7F9C56FB25727AF500999B22 /* UIImage+Extensions.swift in Sources */,
B8218B202560021E003AA1AA /* OpenSourceTVC.swift in Sources */,
EC88960E24B87F66008D29E2 /* ThemeSelectForWritingSentenceVC.swift in Sources */,
7FC5B4D724BC6D2B007C1725 /* AddBookToSentenceVC.swift in Sources */,
Expand Down Expand Up @@ -1307,7 +1311,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6ZTQ76LJPZ;
DEVELOPMENT_TEAM = 4YXV56BSN6;
INFOPLIST_FILE = Mongle/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Resource/APIService/MySentenceService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ struct MySentenceService {
guard let decodedData = try? decoder.decode(GenericResponse<MySentenceData>.self, from: data)
else { return .pathErr }


print("@@@문장 데이터 \(decodedData)")
guard let data = decodedData.data else{
return .requestErr(decodedData.message)
}
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Resource/APIService/MyThemeService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ struct MyThemeService {
guard let decodedData = try? decoder.decode(GenericResponse<MyThemeData>.self, from: data)
else { return .pathErr }


print("@@@테마 데이터 \(decodedData)")
guard let data = decodedData.data else{
return .requestErr(decodedData.message)
}
Expand Down
2 changes: 1 addition & 1 deletion Mongle/Mongle/Resource/Storyboard/CuratorTabMain.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HkO-FQ-aHc">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HkO-FQ-aHc">
<rect key="frame" x="0.0" y="88" width="375" height="690"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="3cs-Ks-9lT">
Expand Down
27 changes: 15 additions & 12 deletions Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="j3y-77-Kqr">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand Down Expand Up @@ -62,6 +61,7 @@
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CsR-8p-m6N">
<rect key="frame" x="0.0" y="0.0" width="350" height="344"/>
<color key="backgroundColor" systemColor="systemGrayColor"/>
</imageView>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mainImgEditorpick" translatesAutoresizingMaskIntoConstraints="NO" id="T1K-sY-59Z">
<rect key="frame" x="0.0" y="0.0" width="350" height="344"/>
Expand Down Expand Up @@ -182,10 +182,10 @@
</subviews>
<constraints>
<constraint firstItem="eC6-2x-8lA" firstAttribute="leading" secondItem="CBz-NU-jwK" secondAttribute="leading" id="6Fz-29-2yU"/>
<constraint firstAttribute="trailing" secondItem="eC6-2x-8lA" secondAttribute="trailing" id="LIe-ff-w1O"/>
<constraint firstItem="eC6-2x-8lA" firstAttribute="trailing" secondItem="CBz-NU-jwK" secondAttribute="trailing" id="LIe-ff-w1O"/>
<constraint firstAttribute="bottom" secondItem="eC6-2x-8lA" secondAttribute="bottom" constant="53" id="LZ6-si-w9x"/>
<constraint firstItem="1xr-Xc-HGI" firstAttribute="top" secondItem="eC6-2x-8lA" secondAttribute="bottom" constant="21" id="XBb-4p-CsU"/>
<constraint firstAttribute="trailing" secondItem="1xr-Xc-HGI" secondAttribute="trailing" id="eYy-5p-2Hw"/>
<constraint firstItem="1xr-Xc-HGI" firstAttribute="trailing" secondItem="CBz-NU-jwK" secondAttribute="trailing" id="eYy-5p-2Hw"/>
<constraint firstItem="eC6-2x-8lA" firstAttribute="top" secondItem="CBz-NU-jwK" secondAttribute="top" id="muw-iD-YkW"/>
<constraint firstItem="1xr-Xc-HGI" firstAttribute="leading" secondItem="CBz-NU-jwK" secondAttribute="leading" id="vrG-yp-16T"/>
</constraints>
Expand Down Expand Up @@ -396,30 +396,31 @@
<rect key="frame" x="0.0" y="0.0" width="159" height="159"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mainImgTheme1" translatesAutoresizingMaskIntoConstraints="NO" id="Cap-Gg-GVD">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Cap-Gg-GVD">
<rect key="frame" x="0.0" y="0.0" width="159" height="159"/>
<color key="backgroundColor" systemColor="systemGrayColor"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N9i-ko-rae">
<rect key="frame" x="18" y="18" width="109" height="22.333333333333329"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N9i-ko-rae">
<rect key="frame" x="18" y="18" width="109" height="0.0"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoSB00" family="AppleSDGothicNeoSB00" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="문장 38개" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8C-ZJ-eVu">
<rect key="frame" x="18" y="122" width="52" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="문장 0개" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v8C-ZJ-eVu">
<rect key="frame" x="17.999999999999996" y="122" width="45.666666666666657" height="16"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mainIcBookmark1" translatesAutoresizingMaskIntoConstraints="NO" id="86a-ca-e7e">
<rect key="frame" x="107.33333333333333" y="125" width="10" height="10"/>
<rect key="frame" x="117" y="125" width="10" height="10"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="9ka-bW-MJx"/>
<constraint firstAttribute="height" constant="10" id="OcM-s1-IVR"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="172" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LoN-DH-lGU">
<rect key="frame" x="123" y="122" width="18" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LoN-DH-lGU">
<rect key="frame" x="132.66666666666666" y="122" width="8.3333333333333428" height="16"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -535,10 +536,12 @@
<image name="mainIcGoTheme" width="7" height="11.333333015441895"/>
<image name="mainImgCurator1" width="62" height="62"/>
<image name="mainImgEditorpick" width="375" height="375"/>
<image name="mainImgTheme1" width="159" height="159"/>
<image name="mongleLogo" width="98" height="29"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemGrayColor">
<color red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
Loading

0 comments on commit 8b97c19

Please sign in to comment.