Skip to content

Commit

Permalink
Merge pull request #187 from Sopt-Mongle/feature/#186
Browse files Browse the repository at this point in the history 
[fix] ๋ฒ„์ „์ •๋ณด, ์˜คํ”ˆ์†Œ์Šค ๋ผ์ด์„ ์Šค ์ˆ˜์ •
  • Loading branch information
@seu11ee
seu11ee committed Nov 26, 2020
2 parents 7551d1a + af028ee commit b1faab5
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 42 deletions.
23 changes: 23 additions & 0 deletions Mongle/Mongle/Resource/Assets.xcassets/mySettingsOpensource2BoxBlur.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "mySettingsOpensource2BoxBlur.png"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...xcassets/mySettingsOpensource2BoxBlur.imageset/mySettingsOpensource2BoxBlur.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ssets/mySettingsOpensource2BoxBlur.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ssets/mySettingsOpensource2BoxBlur.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions Mongle/Mongle/Resource/Storyboard/MySetting/OpenSource.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down Expand Up @@ -55,9 +54,10 @@
<constraint firstItem="L22-Qd-0eh" firstAttribute="top" secondItem="xf3-Go-QpK" secondAttribute="top" constant="-7" id="oO7-ut-LVJ"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NmI-Gi-DHX">
<tableView clipsSubviews="YES" contentMode="scaleToFill" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NmI-Gi-DHX">
<rect key="frame" x="0.0" y="88" width="375" height="690"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="OpenSourceTVC" id="bdg-6M-B4M" customClass="OpenSourceTVC" customModule="Mongle" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="375" height="43.666667938232422"/>
Expand Down
22 changes: 16 additions & 6 deletions Mongle/Mongle/Resource/Storyboard/MySetting/OpenSourceDetail.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand All @@ -23,7 +22,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Rv0-89-wWs">
<rect key="frame" x="0.0" y="88" width="375" height="690"/>
<rect key="frame" x="0.0" y="88" width="375" height="724"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
<color key="textColor" systemColor="labelColor"/>
Expand Down Expand Up @@ -60,32 +59,43 @@
<constraint firstItem="8Mb-tf-TGG" firstAttribute="leading" secondItem="1Vs-KP-42c" secondAttribute="leading" id="nku-j0-EBC"/>
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mySettingsOpensource2BoxBlur" translatesAutoresizingMaskIntoConstraints="NO" id="rGy-h9-Zx8">
<rect key="frame" x="0.0" y="726" width="375" height="86"/>
<constraints>
<constraint firstAttribute="width" secondItem="rGy-h9-Zx8" secondAttribute="height" multiplier="375:86" id="5ox-lx-z3V"/>
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="nA4-4A-iIJ"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="rGy-h9-Zx8" firstAttribute="leading" secondItem="nA4-4A-iIJ" secondAttribute="leading" id="0zj-fb-qz2"/>
<constraint firstItem="nA4-4A-iIJ" firstAttribute="trailing" secondItem="rGy-h9-Zx8" secondAttribute="trailing" id="6E4-Lv-PT3"/>
<constraint firstItem="nA4-4A-iIJ" firstAttribute="trailing" secondItem="Rv0-89-wWs" secondAttribute="trailing" id="7kD-2g-lms"/>
<constraint firstItem="Rv0-89-wWs" firstAttribute="top" secondItem="1Vs-KP-42c" secondAttribute="bottom" id="Ctt-Sq-IFb"/>
<constraint firstAttribute="bottom" secondItem="rGy-h9-Zx8" secondAttribute="bottom" id="IgT-M2-4Ea"/>
<constraint firstItem="1Vs-KP-42c" firstAttribute="top" secondItem="nA4-4A-iIJ" secondAttribute="top" id="Jm7-Wb-rfm"/>
<constraint firstItem="nA4-4A-iIJ" firstAttribute="bottom" secondItem="Rv0-89-wWs" secondAttribute="bottom" id="Vlu-oO-Pfb"/>
<constraint firstAttribute="bottom" secondItem="Rv0-89-wWs" secondAttribute="bottom" id="Vlu-oO-Pfb"/>
<constraint firstItem="Rv0-89-wWs" firstAttribute="leading" secondItem="nA4-4A-iIJ" secondAttribute="leading" id="Wec-y3-UgA"/>
<constraint firstItem="1Vs-KP-42c" firstAttribute="leading" secondItem="nA4-4A-iIJ" secondAttribute="leading" id="aEA-iP-qm6"/>
<constraint firstItem="nA4-4A-iIJ" firstAttribute="trailing" secondItem="1Vs-KP-42c" secondAttribute="trailing" id="dIJ-4W-Mpb"/>
</constraints>
</view>
<connections>
<outlet property="blurImageView" destination="rGy-h9-Zx8" id="zs7-E2-NNh"/>
<outlet property="textView" destination="Rv0-89-wWs" id="pQz-Zp-BDn"/>
<outlet property="titleLabel" destination="bNK-ZN-eJ0" id="toE-kq-I5i"/>
<outlet property="titleView" destination="1Vs-KP-42c" id="3ch-WG-RN5"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="nx6-fx-f1Z" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53.623188405797109" y="59.598214285714285"/>
<point key="canvasLocation" x="53.600000000000001" y="59.11330049261084"/>
</scene>
</scenes>
<resources>
<image name="curatorInfoThemeSubscribeBtnBack" width="10.666666984558105" height="19"/>
<image name="mySettingsOpensource2BoxBlur" width="375" height="86"/>
<systemColor name="labelColor">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
Expand Down
Loading

0 comments on commit b1faab5

Please sign in to comment.