Skip to content

Commit

Permalink
Merge pull request #159 from Sopt-Mongle/feature/#156
Browse files Browse the repository at this point in the history 
탭바 변경, 각종 버그 삭제:
  • Loading branch information
@qodhrkawk
qodhrkawk authored Nov 19, 2020
2 parents 2d3bc2a + 72f8c32 commit 6224536
Show file tree
Hide file tree
Showing 11 changed files with 211 additions and 90 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 @@ -1303,7 +1303,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = HAWSBW2KW5;
DEVELOPMENT_TEAM = 6ZTQ76LJPZ;
INFOPLIST_FILE = Mongle/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1322,7 +1322,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = HAWSBW2KW5;
DEVELOPMENT_TEAM = 6ZTQ76LJPZ;
INFOPLIST_FILE = Mongle/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
4 changes: 3 additions & 1 deletion Mongle/Mongle/Resource/Storyboard/LogIn.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PSL-gp-YOC">
<rect key="frame" x="0.0" y="375" width="375" height="437"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="z8u-Gu-SgQ">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="z8u-Gu-SgQ">
<rect key="frame" x="0.0" y="0.0" width="375" height="437"/>
<constraints>
<constraint firstAttribute="width" secondItem="z8u-Gu-SgQ" secondAttribute="height" multiplier="375:437" id="yNo-KB-eFt"/>
</constraints>
</imageView>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="awA-8z-038">
<rect key="frame" x="28" y="112" width="319" height="45"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="4cR-s5-0Gb"/>
</constraints>
Expand All @@ -43,6 +44,7 @@
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Dld-lB-cOo">
<rect key="frame" x="28" y="59" width="319" height="45"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="x4T-2F-Epb"/>
</constraints>
Expand Down
22 changes: 11 additions & 11 deletions Mongle/Mongle/Resource/Storyboard/MainTabMain.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<rect key="frame" x="0.0" y="0.0" width="350" height="344"/>
</imageView>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XTk-TW-Boh">
<rect key="frame" x="42" y="37.000000000000007" width="258" height="91.666666666666686"/>
<rect key="frame" x="42" y="37.000000000000007" width="258" height="116.66666666666669"/>
<string key="text">온 세상에
나만 깨어있는 것 같은
새벽감성에 읽기 좋은 문장</string>
Expand All @@ -76,14 +76,14 @@
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9IE-gO-9rY" userLabel="bar">
<rect key="frame" x="42" y="154" width="64" height="1"/>
<rect key="frame" x="42" y="179" width="64" height="1"/>
<color key="backgroundColor" red="0.85098039215686272" green="0.85098039215686272" blue="0.85098039215686272" alpha="0.73999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="M6p-CL-Y2v"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="문장 15개" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mSr-nK-5fu">
<rect key="frame" x="42" y="142.66666666666666" width="56" height="18.333333333333343"/>
<rect key="frame" x="42" y="142.66666666666666" width="60" height="18.333333333333343"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="15"/>
<color key="textColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -92,7 +92,7 @@
<rect key="frame" x="167" y="264" width="139" height="38"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GsZ-On-G8Z">
<rect key="frame" x="24" y="9" width="82" height="19"/>
<rect key="frame" x="24" y="9" width="83" height="19"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoM00" family="AppleSDGothicNeoM00" pointSize="15"/>
<state key="normal" title="테마 보러가기">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down Expand Up @@ -237,7 +237,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z6z-fN-ZSv">
<rect key="frame" x="41" y="85.666666666666671" width="243" height="21"/>
<rect key="frame" x="41" y="86" width="243" height="20"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="17"/>
<color key="textColor" red="0.73725490196078436" green="0.73725490196078436" blue="0.73725490196078436" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -320,13 +320,13 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wJ9-Ie-Gvf">
<rect key="frame" x="31.333333333333332" y="87" width="33.666666666666671" height="18.333333333333329"/>
<rect key="frame" x="29.666666666666671" y="87" width="37" height="18.333333333333329"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoM00" family="AppleSDGothicNeoM00" pointSize="15"/>
<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="W3f-8z-erq">
<rect key="frame" x="33.333333333333336" y="108.33333333333333" width="29.333333333333336" height="16"/>
<rect key="frame" x="32" y="108.33333333333333" width="32" height="16"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" red="0.73725490196078436" green="0.73725490196078436" blue="0.73725490196078436" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -393,26 +393,26 @@
<rect key="frame" x="0.0" y="0.0" width="159" height="159"/>
</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"/>
<rect key="frame" x="18" y="18" width="109" height="20"/>
<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="17.999999999999996" y="122" width="51.666666666666657" height="16"/>
<rect key="frame" x="18" y="122" width="52" 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="103.33333333333333" 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"/>
<rect key="frame" x="119" y="122.33333333333333" width="22" height="15.333333333333329"/>
<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
Loading

0 comments on commit 6224536

Please sign in to comment.