Skip to content

Commit

Permalink
Merge branch 'develop' into feature/#164
Browse files Browse the repository at this point in the history
  • Loading branch information
@qodhrkawk
qodhrkawk authored Nov 20, 2020
2 parents 99902fd + 88b9c37 commit 3f3fb50
Show file tree
Hide file tree
Showing 13 changed files with 166 additions and 99 deletions.
5 changes: 3 additions & 2 deletions Mongle/Mongle.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6ZTQ76LJPZ;
DEVELOPMENT_TEAM = 4YXV56BSN6;
INFOPLIST_FILE = Mongle/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1327,12 +1327,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 6ZTQ76LJPZ;
DEVELOPMENT_TEAM = 4YXV56BSN6;
INFOPLIST_FILE = Mongle/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);

MARKETING_VERSION = 1.01;
PRODUCT_BUNDLE_IDENTIFIER = io.github.juhyeoklee.Mongle12;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
21 changes: 12 additions & 9 deletions Mongle/Mongle/Resource/Storyboard/CuratorList.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="QyW-Ye-5su">
<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="QyW-Ye-5su">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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"/>
<capability name="collection view cell content view" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -36,7 +38,7 @@
</label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="c6S-0e-xBy">
<rect key="frame" x="0.0" y="102" width="375" height="676"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="zid-iL-K7m">
<size key="itemSize" width="343" height="99"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
Expand Down Expand Up @@ -66,13 +68,13 @@
<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="BSG-QW-UI0">
<rect key="frame" x="105" y="51" width="48" height="15.666666666666671"/>
<rect key="frame" x="105" y="51" width="33" height="15.666666666666671"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/>
<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="f0p-JM-B5C">
<rect key="frame" x="105" y="74.666666666666671" width="140" height="14.333333333333329"/>
<rect key="frame" x="105" y="74.666666666666671" width="31" height="14.333333333333329"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -111,15 +113,13 @@
<constraint firstItem="W8B-J8-hEM" firstAttribute="leading" secondItem="TkI-tQ-YSw" secondAttribute="leading" id="5vx-hR-f6N"/>
<constraint firstItem="GnB-aI-Jho" firstAttribute="top" secondItem="TkI-tQ-YSw" secondAttribute="top" constant="28" id="D46-Ia-PKG"/>
<constraint firstItem="BSG-QW-UI0" firstAttribute="leading" secondItem="lef-yV-mDn" secondAttribute="leading" id="Gfx-Hy-MD0"/>
<constraint firstItem="dVu-qR-hC6" firstAttribute="leading" secondItem="f0p-JM-B5C" secondAttribute="trailing" constant="10" id="Jwx-VO-0S3"/>
<constraint firstItem="lef-yV-mDn" firstAttribute="top" secondItem="TkI-tQ-YSw" secondAttribute="top" constant="30" id="RSL-q5-ZAw"/>
<constraint firstItem="f0p-JM-B5C" firstAttribute="top" secondItem="BSG-QW-UI0" secondAttribute="bottom" constant="8" id="Sre-gm-g2Y"/>
<constraint firstItem="GnB-aI-Jho" firstAttribute="leading" secondItem="TkI-tQ-YSw" secondAttribute="leading" constant="18" id="fAr-Ou-34z"/>
<constraint firstItem="BSG-QW-UI0" firstAttribute="top" secondItem="lef-yV-mDn" secondAttribute="bottom" constant="3" id="ixw-LM-7YG"/>
<constraint firstItem="f0p-JM-B5C" firstAttribute="leading" secondItem="lef-yV-mDn" secondAttribute="leading" id="sdh-SU-qJa"/>
<constraint firstAttribute="trailing" secondItem="W8B-J8-hEM" secondAttribute="trailing" id="sfl-4s-gRH"/>
<constraint firstAttribute="trailing" secondItem="dVu-qR-hC6" secondAttribute="trailing" constant="28" id="tah-vw-c2U"/>
<constraint firstAttribute="trailing" secondItem="BSG-QW-UI0" secondAttribute="trailing" constant="190" id="xSa-Um-8Vt"/>
<constraint firstItem="lef-yV-mDn" firstAttribute="leading" secondItem="GnB-aI-Jho" secondAttribute="trailing" constant="22" id="z0y-tZ-Sct"/>
</constraints>
</collectionViewCellContentView>
Expand All @@ -134,7 +134,8 @@
</cells>
</collectionView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="oll-w6-SSQ"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="oll-w6-SSQ" firstAttribute="bottom" secondItem="c6S-0e-xBy" secondAttribute="bottom" id="1AM-Rq-oUF"/>
<constraint firstItem="syc-b5-DS5" firstAttribute="centerY" secondItem="mgh-I4-aBn" secondAttribute="centerY" id="V7o-eM-dJY"/>
Expand All @@ -145,7 +146,6 @@
<constraint firstItem="oll-w6-SSQ" firstAttribute="trailing" secondItem="c6S-0e-xBy" secondAttribute="trailing" id="sjO-0t-FPO"/>
<constraint firstItem="syc-b5-DS5" firstAttribute="trailing" secondItem="mgh-I4-aBn" secondAttribute="leading" constant="-74" id="ulm-ta-4y2"/>
</constraints>
<viewLayoutGuide key="safeArea" id="oll-w6-SSQ"/>
</view>
<connections>
<outlet property="curatorListCV" destination="c6S-0e-xBy" id="Jtq-gh-URQ"/>
Expand All @@ -159,5 +159,8 @@
<resources>
<image name="searchBtnBack" width="10.333333015441895" height="18.666666030883789"/>
<image name="sentenceThemeOImgCurator1010" width="69.666664123535156" height="69.666664123535156"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
10 changes: 5 additions & 5 deletions Mongle/Mongle/Resource/Storyboard/CuratorTabKeyword.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ag4-3g-Up6">
<rect key="frame" x="0.0" y="107" width="414" height="755"/>
<rect key="frame" x="0.0" y="92.5" width="414" height="769.5"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Zeg-Dw-LJM">
<size key="itemSize" width="128" height="128"/>
<size key="estimatedItemSize" width="128" height="128"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<inset key="sectionInset" minX="0.0" minY="14" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="CuratorListCVC" id="ewe-Sr-P5O" customClass="CuratorListCVC" customModule="Mongle" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="128" height="120"/>
<rect key="frame" x="0.0" y="14" width="128" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="bay-D4-7N8">
<rect key="frame" x="0.0" y="0.0" width="128" height="120"/>
Expand Down Expand Up @@ -126,7 +126,7 @@
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZuL-Bh-0bc">
<rect key="frame" x="0.0" y="44" width="414" height="63"/>
<rect key="frame" x="0.0" y="44" width="414" height="48.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcX-Xm-wEa">
<rect key="frame" x="207" y="4" width="0.0" height="23"/>
Expand All @@ -151,7 +151,7 @@
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="width" secondItem="ZuL-Bh-0bc" secondAttribute="height" multiplier="375:57" id="1gT-Kt-YxM"/>
<constraint firstAttribute="width" secondItem="ZuL-Bh-0bc" secondAttribute="height" multiplier="375:44" id="1gT-Kt-YxM"/>
<constraint firstItem="fcX-Xm-wEa" firstAttribute="top" secondItem="ZuL-Bh-0bc" secondAttribute="top" constant="4" id="B9D-3r-Epz"/>
<constraint firstItem="bVk-yE-PPh" firstAttribute="top" secondItem="ZuL-Bh-0bc" secondAttribute="top" constant="-7" id="Gpt-0x-ruF"/>
<constraint firstItem="fcX-Xm-wEa" firstAttribute="centerX" secondItem="ZuL-Bh-0bc" secondAttribute="centerX" id="Zvm-fh-rMA"/>
Expand Down
Loading

0 comments on commit 3f3fb50

Please sign in to comment.