Skip to content

Commit

Permalink
Merge pull request #192 from Sopt-Mongle/feature/#191
Browse files Browse the repository at this point in the history 
Feature/#191
  • Loading branch information
@seu11ee
seu11ee committed Nov 27, 2020
2 parents 2800de8 + 01e988a commit bcc7973
Show file tree
Hide file tree
Showing 19 changed files with 163 additions and 137 deletions.
4 changes: 2 additions & 2 deletions Mongle/Mongle.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1307,15 +1307,15 @@
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 = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.11;
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
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
10 changes: 5 additions & 5 deletions Mongle/Mongle/Resource/Storyboard/MyTab.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,10 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="searchResultSentenceTVC" id="seG-tn-jv4" customClass="SearchResultSentenceTVC" customModule="Mongle" customModuleProvider="target">
<rect key="frame" x="0.0" y="148.33333587646484" width="375" height="121"/>
<rect key="frame" x="0.0" y="148.33333587646484" width="375" height="121.33333587646484"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="seG-tn-jv4" id="RNw-tD-tyf">
<rect key="frame" x="0.0" y="0.0" width="375" height="121"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="121.33333587646484"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcV-0r-6QI">
Expand All @@ -351,7 +351,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="maX-5S-sW2">
<rect key="frame" x="33" y="88" width="31" height="15"/>
<rect key="frame" x="33" y="88" width="31" height="15.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -423,7 +423,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="g2r-eO-KY6">
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" contentInsetAdjustmentBehavior="never" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="g2r-eO-KY6">
<rect key="frame" x="0.0" y="66" width="375" height="712"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="k2o-kV-M0c">
Expand Down Expand Up @@ -547,7 +547,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" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="0EA-KZ-DyD">
<tableView clipsSubviews="YES" contentMode="scaleToFill" contentInsetAdjustmentBehavior="never" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="0EA-KZ-DyD">
<rect key="frame" x="0.0" y="44" width="375" height="734"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
Expand Down
21 changes: 10 additions & 11 deletions Mongle/Mongle/Resource/Storyboard/SearchTabMain.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="searchBox" translatesAutoresizingMaskIntoConstraints="NO" id="US7-AI-z1w">
<rect key="frame" x="42" y="99" width="318" height="45"/>
<rect key="frame" x="42" y="55" width="318" height="45"/>
<constraints>
<constraint firstAttribute="width" secondItem="US7-AI-z1w" secondAttribute="height" multiplier="317:45" id="Tgf-rG-rGL"/>
</constraints>
</imageView>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="키워드, 테마, 큐레이터 등을 검색하세요." adjustsFontForContentSizeCategory="YES" minimumFontSize="15" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Lwb-4h-hu7">
<rect key="frame" x="57" y="99" width="265" height="45"/>
<rect key="frame" x="57" y="55" width="265" height="45"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="15"/>
<textInputTraits key="textInputTraits" enablesReturnKeyAutomatically="YES"/>
</textField>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="최근 키워드" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y7v-Kt-Ghm">
<rect key="frame" x="16" y="178" width="69" height="18"/>
<rect key="frame" x="16" y="134" width="69" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xP2-ng-tW5">
<rect key="frame" x="3.6666666666666679" y="99" width="40.333333333333329" height="45"/>
<rect key="frame" x="3.6666666666666679" y="55" width="40.333333333333329" height="45"/>
<constraints>
<constraint firstAttribute="width" secondItem="xP2-ng-tW5" secondAttribute="height" multiplier="43:48" id="nJF-js-B8o"/>
</constraints>
Expand All @@ -52,7 +52,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QFo-py-E32">
<rect key="frame" x="315" y="99" width="45" height="45"/>
<rect key="frame" x="315" y="55" width="45" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="CdM-RU-Haz"/>
<constraint firstAttribute="width" constant="45" id="Yh8-l9-STf"/>
Expand All @@ -64,7 +64,7 @@
</connections>
</button>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="lKG-dS-PS1">
<rect key="frame" x="0.0" y="217" width="375" height="48"/>
<rect key="frame" x="0.0" y="173" width="375" height="48"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="MTz-Fo-GGb"/>
Expand Down Expand Up @@ -108,13 +108,13 @@
</cells>
</collectionView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="추천 키워드" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lmw-dy-d2r">
<rect key="frame" x="16" y="295" width="69" height="18"/>
<rect key="frame" x="16" y="251" width="69" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" semanticContentAttribute="playback" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="uen-Fo-bY7">
<rect key="frame" x="0.0" y="334" width="375" height="95"/>
<rect key="frame" x="0.0" y="290" width="375" height="95"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="95" id="qdJ-x1-uTK"/>
Expand Down Expand Up @@ -158,7 +158,7 @@
</cells>
</collectionView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D7q-ZQ-n3h">
<rect key="frame" x="294" y="163" width="81" height="48"/>
<rect key="frame" x="294" y="119" width="81" height="48"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="DES-Rd-f9I"/>
<constraint firstAttribute="width" constant="81" id="O8x-SB-NAq"/>
Expand Down Expand Up @@ -216,10 +216,9 @@
<!--Navigation Controller-->
<scene sceneID="czT-7m-mD5">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="cQt-Mz-wap" sceneMemberID="viewController">
<navigationController storyboardIdentifier="SearchNavigationController" automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="cQt-Mz-wap" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="8WV-fk-yPl">
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
Expand Down
Loading

0 comments on commit bcc7973

Please sign in to comment.