Skip to content

Commit

Permalink
Merge pull request #25 from TeamCherish/feat/#12
Browse files Browse the repository at this point in the history 
[fix] ResultVC 결과 이미지
  • Loading branch information
@seohyun-106
seohyun-106 authored Aug 24, 2021
2 parents 212cf17 + 8ffcd22 commit e7d5e89
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Cherish-iOS/Cherish-iOS/Resources/Storyboard/AddUser.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="식물 상세 입력" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="XyP-Hj-Los" customClass="CustomLabel" customModule="Cherish_iOS" customModuleProvider="target">
<rect key="frame" x="141.66666666666666" y="12.666666666666666" width="92" height="18.666666666666671"/>
<rect key="frame" x="139" y="10" width="97.333333333333314" height="24"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Medium" family="Noto Sans CJK KR" pointSize="16"/>
<color key="textColor" name="black"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -302,7 +302,7 @@
<rect key="frame" x="16" y="531" width="343" height="154"/>
</pickerView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(최대8글자)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c0o-5z-5gA" customClass="CustomLabel" customModule="Cherish_iOS" customModuleProvider="target">
<rect key="frame" x="81" y="114" width="54.666666666666657" height="24"/>
<rect key="frame" x="81" y="114" width="59" height="24"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="12"/>
<color key="textColor" name="textGrey"/>
<nil key="highlightedColor"/>
Expand All @@ -313,7 +313,7 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(선택 사항)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lxi-ut-YOD" customClass="CustomLabel" customModule="Cherish_iOS" customModuleProvider="target">
<rect key="frame" x="59" y="203" width="51.333333333333343" height="24"/>
<rect key="frame" x="59" y="203" width="55.666666666666657" height="24"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="12"/>
<color key="textColor" name="textGrey"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -623,7 +623,7 @@
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="식물 등록 친구 선택" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YIW-3M-rMJ" customClass="CustomLabel" customModule="Cherish_iOS" customModuleProvider="target">
<rect key="frame" x="125.33333333333334" y="12.666666666666666" width="124.33333333333334" height="18.666666666666671"/>
<rect key="frame" x="122.00000000000001" y="10" width="131.33333333333337" height="24"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Medium" family="Noto Sans CJK KR" pointSize="16"/>
<color key="textColor" red="0.27058823529999998" green="0.27058823529999998" blue="0.27058823529999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -746,7 +746,7 @@
<rect key="frame" x="0.0" y="124" width="375" height="688"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="주소록에서 연락처를 등록해주세요!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yAr-Z3-Nbg" customClass="CustomLabel" customModule="Cherish_iOS" customModuleProvider="target">
<rect key="frame" x="35.666666666666657" y="352" width="303.66666666666674" height="25.666666666666686"/>
<rect key="frame" x="25.333333333333343" y="352" width="324.33333333333326" height="32.666666666666686"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Bold" family="Noto Sans CJK KR" pointSize="22"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
Expand All @@ -764,7 +764,7 @@
</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="1Hy-r6-oT6">
<rect key="frame" x="114.00000000000001" y="379.66666666666669" width="147.33333333333337" height="18.666666666666686"/>
<rect key="frame" x="109.33333333333333" y="386.66666666666669" width="156.33333333333337" height="24"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Medium" family="Noto Sans CJK KR" pointSize="16"/>
<color key="textColor" name="textGrey"/>
<nil key="highlightedColor"/>
Expand Down
2 changes: 1 addition & 1 deletion Cherish-iOS/Cherish-iOS/Sources/ VC/AddUser/InputDetailVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class InputDetailVC: UIViewController {
UserDefaults.standard.set(resultData.plant.explanation , forKey: "resultExplanation")
UserDefaults.standard.set(resultData.plant.imageURL, forKey: "resultImgURL")
UserDefaults.standard.set(resultData.plant.flowerMeaning, forKey: "flowerMeaning")

self.present(loadingVC, animated: false, completion: nil)
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
self.dismiss(animated: false) {
Expand Down
3 changes: 1 addition & 2 deletions Cherish-iOS/Cherish-iOS/Sources/ VC/AddUser/PlantResultVC.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ class PlantResultVC: UIViewController, UIGestureRecognizerDelegate {

/// 이미지 받아오기

if let url = URL(string: UserDefaults.standard.string(forKey: "resultImageURL") ?? "") {
// let data = try? Data(contentsOf: url)
if let url = URL(string: UserDefaults.standard.string(forKey: "resultImgURL") ?? "") {
if let data = try? Data(contentsOf: url) {
self.resultPlantImgView.image = UIImage(data: data)
}
Expand Down

0 comments on commit e7d5e89

Please sign in to comment.