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

[Chore] #143 - API 헤더 변경 및 각종 뷰 디테일 변경 #148

Merged
merged 8 commits into from
Jan 20, 2022
Merged

[Chore] #143 - API 헤더 변경 및 각종 뷰 디테일 변경 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b641f7
[Design] #143 - 보관함 empty 이미지 세팅
L-j-h-c Jan 20, 2022
ba9d1cc
[Fix] #143 - API 헤더 변경
L-j-h-c Jan 20, 2022
97d9562
[Feat] #143 - 보관함 emptyView 분기처리
L-j-h-c Jan 20, 2022
282d1f1
[Fix] #143 - 코드로 참여 글자수 제한 오류 수정
L-j-h-c Jan 20, 2022
5dc8c47
[Feat] #143 - 인증하기 팝업 바깥 터치 시 dismiss기능 구현
L-j-h-c Jan 20, 2022
63c7c9d
[Fix] #143 - 습관방 참여 버튼 호스트 여부에 따라 default값 조정
L-j-h-c Jan 20, 2022
f8ef767
[Fix] #143 - 불필요한 프린트문 삭제
L-j-h-c Jan 20, 2022
e307b9a
[Merge] #143 - 컨플릭트 해결
L-j-h-c Jan 20, 2022
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
23 changes: 23 additions & 0 deletions Spark-iOS/Spark-iOS/Resource/Assets.xcassets/cardEmpty.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "cardEmpty.png",
"scale" : "1x"
},
{
"scale" : "2x",
"filename" : "cardEmpty@2x.png",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "cardEmpty@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Spark-iOS/Spark-iOS/Resource/Assets.xcassets/cardEmpty.imageset/cardEmpty.png
View file
Open in desktop
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 Spark-iOS/Spark-iOS/Resource/Assets.xcassets/cardEmpty.imageset/cardEmpty@2x.png
View file
Open in desktop
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 Spark-iOS/Spark-iOS/Resource/Assets.xcassets/cardEmpty.imageset/cardEmpty@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/CompleteAuth.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@
<rect key="frame" x="21" y="52" width="293" height="290"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uYS-yb-TR2">
<rect key="frame" x="105" y="411.66666666666663" width="125.33333333333331" height="34.333333333333314"/>
<rect key="frame" x="106.66666666666669" y="411.66666666666663" width="122" height="34.333333333333314"/>
<color key="tintColor" name="sparkDarkGray"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
<attributedString key="attributedTitle">
<fragment content="아니요, 안 할래요">
<fragment content="피드로 보러 가기">
<attributes>
<font key="NSFont" size="14" name="NotoSansKR-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
Expand Down Expand Up @@ -81,7 +82,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N8R-TD-Inj">
<rect key="frame" x="117.33333333333334" y="436.66666666666663" width="100.33333333333334" height="1"/>
<rect key="frame" x="118.66666666666666" y="436.66666666666663" width="97.666666666666657" height="1"/>
<color key="backgroundColor" name="sparkDarkGray"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="UTo-GP-sq1"/>
Expand Down
45 changes: 30 additions & 15 deletions Spark-iOS/Spark-iOS/Resource/Storyboards/HabitRoom/HabitAuth.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,31 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EKP-VZ-8l3">
<rect key="frame" x="0.0" y="0.0" width="375" height="778"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title=" ">
<color key="baseForegroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</buttonConfiguration>
<connections>
<action selector="touchOutsideDismiss:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="I6f-Ge-LWw"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z0p-0Q-vit">
<rect key="frame" x="0.0" y="357.33333333333326" width="375" height="454.66666666666674"/>
<rect key="frame" x="0.0" y="345.33333333333326" width="375" height="466.66666666666674"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stickersBoth" translatesAutoresizingMaskIntoConstraints="NO" id="zz0-Ms-rNq">
<rect key="frame" x="64" y="32" width="247" height="120"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="오늘도 꺼지지 않는 스파크," textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rvF-OO-W5f">
<rect key="frame" x="81.333333333333329" y="168.00000000000006" width="212.66666666666669" height="23.333333333333343"/>
<rect key="frame" x="75.000000000000014" y="168.00000000000006" width="225.33333333333337" height="29"/>
<fontDescription key="fontDescription" name="NotoSansKR-Medium" family="Noto Sans KR" pointSize="20"/>
<color key="textColor" name="sparkDeepGray"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Re3-cM-dzs">
<rect key="frame" x="20" y="247.66666666666669" width="335" height="35"/>
<rect key="frame" x="20" y="254.33333333333334" width="335" height="40.333333333333343"/>
<color key="tintColor" name="sparkGray"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain">
Expand All @@ -58,36 +69,36 @@
</buttonConfiguration>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S38-ze-xdt">
<rect key="frame" x="0.0" y="305.66666666666669" width="375" height="1"/>
<rect key="frame" x="0.0" y="317.66666666666669" width="375" height="1"/>
<color key="backgroundColor" name="sparkLightGray"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="oaU-eL-Vje"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yuZ-wq-8e7">
<rect key="frame" x="187" y="336.66666666666669" width="1" height="64"/>
<rect key="frame" x="187" y="348.66666666666669" width="1" height="64"/>
<color key="backgroundColor" name="sparkLightGray"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="VSL-zX-aUn"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Keep Going!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f4c-OM-hTl">
<rect key="frame" x="132" y="199.33333333333331" width="111.33333333333331" height="23.333333333333343"/>
<rect key="frame" x="131.33333333333334" y="205.00000000000006" width="112.66666666666666" height="24.333333333333343"/>
<fontDescription key="fontDescription" name="FuturaBT-MediumItalic" family="Futura" pointSize="20"/>
<color key="textColor" name="sparkDeepGray"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4tM-Lv-b18">
<rect key="frame" x="18" y="327.66666666666669" width="151" height="73"/>
<rect key="frame" x="18" y="339.66666666666669" width="151" height="73"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="할까 말까..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zkX-X8-OM3">
<rect key="frame" x="43.333333333333336" y="0.0" width="64.333333333333314" height="16.333333333333332"/>
<rect key="frame" x="41.999999999999993" y="0.0" width="67.333333333333314" height="20.333333333333332"/>
<fontDescription key="fontDescription" name="NotoSansKR-Regular" family="Noto Sans KR" pointSize="14"/>
<color key="textColor" name="sparkDarkGray"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N1k-GB-OYv">
<rect key="frame" x="45.333333333333329" y="24.333333333333371" width="60.333333333333329" height="31"/>
<rect key="frame" x="45.333333333333329" y="28.333333333333371" width="60.333333333333329" height="31"/>
<color key="tintColor" name="sparkBrightPinkred"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="고민중"/>
Expand All @@ -102,25 +113,25 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PP9-8R-ph4">
<rect key="frame" x="206" y="327.66666666666669" width="151" height="73"/>
<rect key="frame" x="206" y="339.66666666666669" width="151" height="73"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dOb-C6-Tdw">
<rect key="frame" x="37.33333333333335" y="0.0" width="76.666666666666686" height="16.333333333333332"/>
<rect key="frame" x="35.666666666666664" y="0.0" width="79.666666666666686" height="20.333333333333332"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="남은 횟수 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hEW-uP-4Hd">
<rect key="frame" x="0.0" y="0.0" width="56.333333333333336" height="16.333333333333332"/>
<rect key="frame" x="0.0" y="0.0" width="58.666666666666664" height="20.333333333333332"/>
<fontDescription key="fontDescription" name="NotoSansKR-Regular" family="Noto Sans KR" pointSize="14"/>
<color key="textColor" name="sparkDarkGray"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Shr-DX-2Uw">
<rect key="frame" x="56.333333333333343" y="0.0" width="8" height="16.333333333333332"/>
<rect key="frame" x="58.666666666666657" y="0.0" width="8" height="20.333333333333332"/>
<fontDescription key="fontDescription" name="NotoSansKR-Regular" family="Noto Sans KR" pointSize="14"/>
<color key="textColor" name="sparkDarkPinkRed"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="회" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Fd-9b-dxa">
<rect key="frame" x="64.333333333333343" y="0.0" width="12.333333333333329" height="16.333333333333332"/>
<rect key="frame" x="66.666666666666657" y="0.0" width="13" height="20.333333333333332"/>
<fontDescription key="fontDescription" name="NotoSansKR-Regular" family="Noto Sans KR" pointSize="14"/>
<color key="textColor" name="sparkDarkGray"/>
<nil key="highlightedColor"/>
Expand All @@ -135,7 +146,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BNv-lW-fXW">
<rect key="frame" x="251.33333333333334" y="352.00000000000006" width="60.333333333333343" height="31"/>
<rect key="frame" x="251.33333333333334" y="368.00000000000006" width="60.333333333333343" height="31"/>
<color key="tintColor" name="sparkBrightPinkred"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="쉴래요"/>
Expand Down Expand Up @@ -176,8 +187,12 @@
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="EKP-VZ-8l3" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="Etu-9E-8vq"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="EKP-VZ-8l3" secondAttribute="bottom" id="JyD-dU-ak0"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="z0p-0Q-vit" secondAttribute="trailing" id="P48-Ue-Blq"/>
<constraint firstAttribute="bottom" secondItem="z0p-0Q-vit" secondAttribute="bottom" id="eXr-sd-nRQ"/>
<constraint firstItem="EKP-VZ-8l3" firstAttribute="top" secondItem="5EZ-qb-Rvc" secondAttribute="top" id="fmP-we-wM9"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="EKP-VZ-8l3" secondAttribute="trailing" id="i5n-gy-zxI"/>
<constraint firstItem="z0p-0Q-vit" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="rB0-O8-6SY"/>
</constraints>
</view>
Expand Down
Loading