Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] #107 - FrontCardCell 레이아웃 수정 #110

Merged
merged 2 commits into from
Dec 6, 2021
Merged

[FIX] #107 - FrontCardCell 레이아웃 수정 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e099d
[FIX] #107 - FrontCardCell 레이아웃 수정
hyun99999 Dec 5, 2021
b882bd3
Merge branch 'TeamNADA:develop' into feature/#107
hyun99999 Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,13 @@
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconInstagram" translatesAutoresizingMaskIntoConstraints="NO" id="TXF-fP-7YQ">
<rect key="frame" x="24" y="433.5" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="CMJ-4p-lae"/>
<constraint firstAttribute="height" constant="24" id="Xxs-9N-RXe"/>
</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="LqW-bV-yHr">
<rect key="frame" x="53" y="469" width="41.5" height="21"/>
<rect key="frame" x="53" y="472" width="41.5" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand All @@ -80,6 +84,10 @@
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconUrl" translatesAutoresizingMaskIntoConstraints="NO" id="el0-x0-WD9">
<rect key="frame" x="24" y="467.5" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="DaP-OT-lYg"/>
<constraint firstAttribute="height" constant="24" id="cpk-TF-9yb"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aAt-PF-ce3">
<rect key="frame" x="279" y="16" width="24" height="24"/>
Expand Down Expand Up @@ -108,6 +116,7 @@
<constraint firstItem="aik-Vi-yux" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="DzT-ZF-buY"/>
<constraint firstItem="eyB-c0-PQB" firstAttribute="top" secondItem="aik-Vi-yux" secondAttribute="bottom" constant="10" id="Ebd-SK-4i7"/>
<constraint firstAttribute="trailing" secondItem="D6t-Nc-4xH" secondAttribute="trailing" id="GGx-Tf-nEl"/>
<constraint firstItem="LqW-bV-yHr" firstAttribute="top" secondItem="8oi-jO-fkf" secondAttribute="bottom" constant="16" id="Hg4-24-oOy"/>
<constraint firstItem="TXF-fP-7YQ" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="ITf-JC-Tm4"/>
<constraint firstItem="S8I-Fv-fkf" firstAttribute="bottom" secondItem="D6t-Nc-4xH" secondAttribute="bottom" id="N52-K9-r1O"/>
<constraint firstItem="aik-Vi-yux" firstAttribute="top" secondItem="cO6-DY-EUn" secondAttribute="bottom" constant="13" id="RLL-SV-ohE"/>
Expand All @@ -124,7 +133,6 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LqW-bV-yHr" secondAttribute="trailing" constant="16" id="rNN-Bn-HHJ"/>
<constraint firstItem="VDj-1w-jyf" firstAttribute="leading" secondItem="OeE-mZ-GcL" secondAttribute="leading" id="txG-gf-qMy"/>
<constraint firstItem="el0-x0-WD9" firstAttribute="top" secondItem="TXF-fP-7YQ" secondAttribute="bottom" constant="10" id="uLD-KR-vXa"/>
<constraint firstItem="LqW-bV-yHr" firstAttribute="centerY" secondItem="el0-x0-WD9" secondAttribute="centerY" id="v5J-i2-9Ll"/>
</constraints>
<size key="customSize" width="307" height="444"/>
<connections>
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ extension FrontViewController {
linkTextList.append(contentsOf: ["Blog",
"Blog"
])
linkIDList.append(contentsOf: ["https://github.com/TeamNADA",
linkIDList.append(contentsOf: ["https://github.com/TeamNADAgit.luolix.top/TeamNADAgit.luolix.top/TeamNADAgit.luolix.top/TeamNADAgit.luolix.top/TeamNADA",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

나다!! 나다나다!! 나다나다!!! 나다!!!

"https://github.com/TeamNADA"
])
}
Expand Down