Skip to content

Commit

Permalink
[fix] editor content
Browse files Browse the repository at this point in the history
  • Loading branch information
@Juhyeoklee
Juhyeoklee committed Nov 14, 2020
1 parent 87d04f2 commit 8c990bd
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 30 deletions.
44 changes: 22 additions & 22 deletions Mongle/Mongle/Resource/Storyboard/SentenceInfo.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SentenceInfoTVC" id="rzz-hj-wEs" customClass="SentenceInfoTVC" customModule="Mongle" customModuleProvider="target">
<rect key="frame" x="0.0" y="55.333332061767578" width="375" height="400.66665649414062"/>
<rect key="frame" x="0.0" y="55.333332061767578" width="375" height="398"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rzz-hj-wEs" id="8wQ-KA-hOB">
<rect key="frame" x="0.0" y="0.0" width="375" height="400.66665649414062"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="398"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loginImgMarks" translatesAutoresizingMaskIntoConstraints="NO" id="3UE-Uw-XSO">
Expand All @@ -65,27 +65,27 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="처음 마주할 때의 인상, 사소한 것으로 인해 생기는 호감, 알아가면서 느끼는 다양한 감정과 머금고있는 풍" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wFt-IT-Wyd">
<rect key="frame" x="28" y="39" width="319" height="58.666666666666657"/>
<rect key="frame" x="28" y="39" width="319" height="56"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oFA-74-0DZ">
<rect key="frame" x="28" y="149.66666666666666" width="319" height="1"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oFA-74-0DZ">
<rect key="frame" x="28" y="147" width="319" height="1"/>
<color key="backgroundColor" red="0.90588235294117647" green="0.90588235294117647" blue="0.90588235294117647" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="bFa-zZ-n3j"/>
</constraints>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" image="themeImgCurator" translatesAutoresizingMaskIntoConstraints="NO" id="uI2-W8-mJV">
<rect key="frame" x="28" y="164.66666666666666" width="22" height="22"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="themeImgCurator" translatesAutoresizingMaskIntoConstraints="NO" id="uI2-W8-mJV">
<rect key="frame" x="28" y="162" width="22" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="MQe-BD-vQT"/>
<constraint firstAttribute="width" constant="22" id="cid-bD-alz"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="77k-LW-Bmh">
<rect key="frame" x="0.0" y="240.66666666666663" width="375" height="160"/>
<rect key="frame" x="0.0" y="238" width="375" height="160"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="themeWritingSentenceBook4ImgBook" translatesAutoresizingMaskIntoConstraints="NO" id="2fn-vt-8k5">
<rect key="frame" x="28" y="29" width="75" height="102"/>
Expand All @@ -94,7 +94,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TitleTitleTitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eu1-Ue-Fvm">
<rect key="frame" x="128" y="42.666666666666671" width="219" height="18.333333333333329"/>
<rect key="frame" x="128" y="43.333333333333329" width="219" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoM00" family="AppleSDGothicNeoM00" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -149,8 +149,8 @@
<constraint firstItem="BCj-ye-tOR" firstAttribute="leading" secondItem="Eu1-Ue-Fvm" secondAttribute="leading" id="qsS-N9-awV"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8ku-Q0-YFr">
<rect key="frame" x="304" y="150.66666666666666" width="48" height="48"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8ku-Q0-YFr">
<rect key="frame" x="304" y="148" width="48" height="48"/>
<constraints>
<constraint firstAttribute="width" constant="48" id="pmn-3a-ec2"/>
<constraint firstAttribute="height" constant="48" id="z0R-49-hN6"/>
Expand All @@ -160,8 +160,8 @@
<action selector="touchUpEditButtonWithSender:" destination="rzz-hj-wEs" eventType="touchUpInside" id="Dxq-0e-St0"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="62I-Qh-ChY">
<rect key="frame" x="58" y="166.66666666666666" width="34" height="18.333333333333343"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="62I-Qh-ChY">
<rect key="frame" x="58" y="164.33333333333334" width="37" height="17.666666666666657"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="15"/>
<color key="textColor" red="0.65490196078431373" green="0.65490196078431373" blue="0.65490196078431373" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -200,34 +200,34 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SentenceInThemeTVC" id="mgF-sV-hAg" customClass="SentenceInThemeTVC" customModule="Mongle" customModuleProvider="target">
<rect key="frame" x="0.0" y="455.9999885559082" width="375" height="91.333335876464844"/>
<rect key="frame" x="0.0" y="453.33333206176758" width="375" height="90.666664123535156"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mgF-sV-hAg" id="slI-iO-Q6y">
<rect key="frame" x="0.0" y="0.0" width="375" height="91.333335876464844"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="90.666664123535156"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<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="aRU-yn-UxA">
<rect key="frame" x="16" y="19" width="343" height="18.333333333333329"/>
<rect key="frame" x="16" y="19" width="343" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="15"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mainIcBook1" translatesAutoresizingMaskIntoConstraints="NO" id="Rfc-KP-7Lm">
<rect key="frame" x="16" y="49.333333333333336" width="16" height="16.000000000000007"/>
<rect key="frame" x="16" y="48.666666666666664" width="16" height="15.999999999999993"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="ff6-Bg-xtq"/>
<constraint firstAttribute="height" constant="16" id="iKm-mS-pKy"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="몽글이 몽글몽글" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cMd-V9-KTD">
<rect key="frame" x="36.999999999999993" y="49.333333333333336" width="82.333333333333314" height="16.000000000000007"/>
<rect key="frame" x="36.999999999999993" y="49" width="82.333333333333314" height="15.333333333333329"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="13"/>
<color key="textColor" red="0.65490196079999996" green="0.65490196079999996" blue="0.65490196079999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="8lw-XF-D4W">
<rect key="frame" x="264.33333333333331" y="51.333333333333336" width="94.666666666666686" height="12"/>
<rect key="frame" x="264.33333333333331" y="50.666666666666664" width="94.666666666666686" height="12"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Anp-Ds-x8h">
<rect key="frame" x="0.0" y="0.0" width="42.333333333333336" height="12"/>
Expand Down Expand Up @@ -292,7 +292,7 @@
</tableViewCell>
</prototypes>
</tableView>
<view contentMode="scaleToFill" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="hv3-PN-S8H">
<view contentMode="scaleToFill" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="hv3-PN-S8H">
<rect key="frame" x="0.0" y="666" width="375" height="146"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="themeSentenceThemeOBoxBlur2" translatesAutoresizingMaskIntoConstraints="NO" id="qa5-QT-qGw">
Expand Down Expand Up @@ -396,9 +396,9 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="난 여름에 첫사랑이랑 데이트한 적 없" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0MD-b1-XnF">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="751" text="난 여름에 첫사랑이랑 데이트한 적 없SD" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0MD-b1-XnF">
<rect key="frame" x="28" y="103" width="319" height="51"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeo-Medium" family="Apple SD Gothic Neo" pointSize="18"/>
<fontDescription key="fontDescription" name="AppleSDGothicNeoR00" family="AppleSDGothicNeoR00" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
Expand Down
4 changes: 2 additions & 2 deletions Mongle/Mongle/Source/Cell/MainTabFirstTVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ extension MainTabFirstTVC: UICollectionViewDataSource {
return UICollectionViewCell()
}
let editor = editorData[indexPath.item]
cell.displayPictureImageView.imageFromUrl(editor.illust, defaultImgPath: "")
cell.displayPictureImageView.imageFromUrl(editor.illust, defaultImgPath: "themeWritingThemeXSentenceBg")

// cell.themeNameLabel.text = self.names[indexPath.item]
cell.themeNameLabel.text = editor.theme
cell.themeCountLabel.text = "문장 \(editor.sentenceNum)개"


Expand Down
1 change: 0 additions & 1 deletion Mongle/Mongle/Source/Cell/SentenceInfoTVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ class SentenceInfoTVC: UITableViewCell {
self.bookNameLabel.text = bookName
self.bookWriterNameLabel.text = writerName
self.bookPublisherNameLabel.text = publisherName
// self.bookImageView.imageFromUrl(bookImageUrl, defaultImgPath: "themeWritingSentenceBook4ImgBook")
self.bookImageView.image = UIImage(named: "themeWritingSentenceBook4ImgBook")
}
}
Expand Down
Loading

0 comments on commit 8c990bd

Please sign in to comment.