Merge pull request #465 from dlwns33/feature/#464

fix: 명함 그룹 관련 수정된 API 반영 #464
TeamNADA · May 2, 2023 · 744b026 · 744b026
2 parents aa1e596 + 18e3cac
commit 744b026
Show file tree

Hide file tree

Showing 25 changed files with 373 additions and 170 deletions.
diff --git a/IntentsExtension/IntentsExtension.entitlements b/IntentsExtension/IntentsExtension.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.YJC.NADA-iOS-forRelease</string>
+	</array>
+</dict>
+</plist>
diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj
@@ -329,6 +329,7 @@
 		77703156275005AA002CBD19 /* CardResultBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardResultBottomSheetViewController.swift; sourceTree = "<group>"; };
 		7770315827500C49002CBD19 /* QRScan.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = QRScan.storyboard; sourceTree = "<group>"; };
 		7770315A27500C7B002CBD19 /* QRScanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRScanViewController.swift; sourceTree = "<group>"; };
+		777B2C202A00BEB300A6AB27 /* IntentsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = IntentsExtension.entitlements; sourceTree = "<group>"; };
 		777FF89A27359B7800BF69D3 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = "<group>"; };
 		777FF89C2735B16B00BF69D3 /* GroupAddRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAddRequest.swift; sourceTree = "<group>"; };
 		777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = "<group>"; };
@@ -1090,6 +1091,7 @@
 		F87D222B298ECAFB001A882B /* IntentsExtension */ = {
 			isa = PBXGroup;
 			children = (
+				777B2C202A00BEB300A6AB27 /* IntentsExtension.entitlements */,
 				F87D222C298ECAFB001A882B /* IntentHandler.swift */,
 				F87D222E298ECAFB001A882B /* Info.plist */,
 			);
@@ -2040,6 +2042,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CODE_SIGN_ENTITLEMENTS = IntentsExtension/IntentsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
@@ -2072,6 +2075,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CODE_SIGN_ENTITLEMENTS = IntentsExtension/IntentsExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;

diff --git a/NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements b/NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements
@@ -10,5 +10,9 @@
 	<array>
 		<string>applinks:itznada.page.link</string>
 	</array>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.YJC.NADA-iOS-forRelease</string>
+	</array>
 </dict>
 </plist>
diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/CompanyFrontCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/CompanyFrontCardCell.swift
@@ -37,6 +37,21 @@ class CompanyFrontCardCell: CardCell {
     @IBOutlet weak var linkURLStackView: UIStackView!
     @IBOutlet weak var totalStackView: UIStackView!
 
+    @IBOutlet weak var titleLabelTop: NSLayoutConstraint!
+    @IBOutlet weak var titleLabelLeading: NSLayoutConstraint!
+    @IBOutlet weak var descLabelTop: NSLayoutConstraint!
+    @IBOutlet weak var userNameLabelTop: NSLayoutConstraint!
+    @IBOutlet weak var birthdayImageTop: NSLayoutConstraint!
+    @IBOutlet weak var birthdayImageWidth: NSLayoutConstraint!
+    @IBOutlet weak var mbtiImageLeading: NSLayoutConstraint!
+    @IBOutlet weak var mbtiImageWidth: NSLayoutConstraint!
+    @IBOutlet weak var mailImageWidth: NSLayoutConstraint!
+    @IBOutlet weak var phoneImageWidth: NSLayoutConstraint!
+    @IBOutlet weak var urlImageWidth: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewBottom: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewLeading: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewTrailing: NSLayoutConstraint!
+
     // MARK: - Life Cycle
 
     override func awakeFromNib() {
@@ -81,6 +96,24 @@ extension CompanyFrontCardCell {
 
         linkURLStackView.alignment = .center
     }
+    func setConstraints() {
+        let constraints = [titleLabelTop, titleLabelLeading, descLabelTop,
+                           userNameLabelTop, birthdayImageTop, mbtiImageLeading, totalStackviewBottom, totalStackviewLeading, totalStackviewTrailing]
+        let labels = [titleLabel, descriptionLabel, userNameLabel, birthLabel, mbtiLabel, phoneNumberLabel, linkURLLabel, mailLabel]
+        let widths = [birthdayImageWidth, mbtiImageWidth, mailImageWidth, phoneImageWidth, urlImageWidth]
+
+        constraints.forEach {
+            $0?.constant = ($0?.constant ?? 0) * 0.6
+        }
+        labels.forEach {
+            $0?.font = $0?.font.withSize(($0?.font.pointSize ?? 0) * 0.6)
+        }
+        widths.forEach {
+            $0?.constant = 12
+        }
+        totalStackView.spacing = 5
+        print("✅✅")
+    }
     private func setTapGesture() {
         mailLabel.isUserInteractionEnabled = true
         let mailTapGesture = UITapGestureRecognizer(target: self, action: #selector(tapMailLabel))

diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/CompanyFrontCardCell.xib b/NADA-iOS-forRelease/Sources/Cells/CardCell/CompanyFrontCardCell.xib
@@ -9,7 +9,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="CompanyFrontCardCell" reuseIdentifier="FrontCardCell" id="gTV-IL-0wX" userLabel="CompanyFrontCardCell" customClass="CompanyFrontCardCell" customModule="NADA_iOS_forRelease" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="CompanyFrontCardCell" reuseIdentifier="CompanyFrontCardCell" id="gTV-IL-0wX" userLabel="CompanyFrontCardCell" customClass="CompanyFrontCardCell" customModule="NADA_iOS_forRelease" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="327" height="540"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -55,7 +55,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="24" id="CMJ-4p-lae"/>
-                                            <constraint firstAttribute="height" constant="24" id="Xxs-9N-RXe"/>
+                                            <constraint firstAttribute="width" secondItem="TXF-fP-7YQ" secondAttribute="height" multiplier="1:1" id="LZD-pZ-Hl1"/>
                                         </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="8oi-jO-fkf">
@@ -73,7 +73,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="24" id="cuA-Eh-TkP"/>
-                                            <constraint firstAttribute="height" constant="24" id="e3W-4o-uT7"/>
+                                            <constraint firstAttribute="width" secondItem="GXK-3x-QiF" secondAttribute="height" multiplier="1:1" id="jnT-97-i0t"/>
                                         </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="63p-qi-OcL">
@@ -90,8 +90,8 @@
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconUrl" translatesAutoresizingMaskIntoConstraints="NO" id="el0-x0-WD9">
                                         <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
                                         <constraints>
+                                            <constraint firstAttribute="width" secondItem="el0-x0-WD9" secondAttribute="height" multiplier="1:1" id="AHE-jU-tw4"/>
                                             <constraint firstAttribute="width" constant="24" id="DaP-OT-lYg"/>
-                                            <constraint firstAttribute="height" constant="24" id="cpk-TF-9yb"/>
                                         </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">
@@ -113,7 +113,7 @@
                         <rect key="frame" x="95.5" y="273.5" width="18" height="18"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="18" id="6KF-To-yWi"/>
-                            <constraint firstAttribute="height" constant="18" id="IeI-qi-pnl"/>
+                            <constraint firstAttribute="width" secondItem="SXl-Ls-Qsz" secondAttribute="height" multiplier="1:1" id="fpt-UP-kDc"/>
                         </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="VDj-1w-jyf">
@@ -146,7 +146,7 @@
                         <rect key="frame" x="24" y="273.5" width="18" height="18"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="18" id="4So-UZ-W8E"/>
-                            <constraint firstAttribute="height" constant="18" id="hHE-FG-uuR"/>
+                            <constraint firstAttribute="width" secondItem="Bkm-gK-Pca" secondAttribute="height" multiplier="1:1" id="iJ2-hP-Nvk"/>
                         </constraints>
                     </imageView>
                 </subviews>
@@ -187,21 +187,35 @@
             <connections>
                 <outlet property="backgroundImageView" destination="D6t-Nc-4xH" id="qAU-7F-EMV"/>
                 <outlet property="birthLabel" destination="aik-Vi-yux" id="QTx-yd-LoY"/>
+                <outlet property="birthdayImageTop" destination="fn8-0D-X5B" id="AIc-r8-s4G"/>
+                <outlet property="birthdayImageWidth" destination="4So-UZ-W8E" id="T6M-HV-jJY"/>
+                <outlet property="descLabelTop" destination="W5z-RH-cOC" id="qEx-Zt-AP6"/>
                 <outlet property="descriptionLabel" destination="VDj-1w-jyf" id="YqY-uP-XQV"/>
                 <outlet property="linkURLImageView" destination="el0-x0-WD9" id="kWS-T3-Urt"/>
                 <outlet property="linkURLLabel" destination="LqW-bV-yHr" id="vD7-qs-hSc"/>
                 <outlet property="linkURLStackView" destination="7Qd-rb-YOy" id="6Xj-PV-blN"/>
                 <outlet property="mailImageView" destination="TXF-fP-7YQ" id="CVp-bU-T3I"/>
+                <outlet property="mailImageWidth" destination="CMJ-4p-lae" id="xFF-Bs-Ch9"/>
                 <outlet property="mailLabel" destination="8oi-jO-fkf" id="eIE-ch-cCT"/>
                 <outlet property="mailStackView" destination="D6j-Cz-d99" id="1ZU-Be-asB"/>
+                <outlet property="mbtiImageLeading" destination="m7i-2Q-RNF" id="gw7-1Z-Muu"/>
+                <outlet property="mbtiImageWidth" destination="6KF-To-yWi" id="bUf-Ag-REx"/>
                 <outlet property="mbtiLabel" destination="eyB-c0-PQB" id="waJ-j4-tRM"/>
+                <outlet property="phoneImageWidth" destination="cuA-Eh-TkP" id="rJJ-qI-RCn"/>
                 <outlet property="phoneNumberImageView" destination="GXK-3x-QiF" id="Tyz-f0-Cy3"/>
                 <outlet property="phoneNumberLabel" destination="63p-qi-OcL" id="iYB-x9-hze"/>
                 <outlet property="phoneNumberStackView" destination="32s-jO-RgD" id="hmB-xr-kck"/>
                 <outlet property="shareButton" destination="aAt-PF-ce3" id="tNu-aM-Dsc"/>
                 <outlet property="titleLabel" destination="OeE-mZ-GcL" id="NIa-Yu-Bit"/>
+                <outlet property="titleLabelLeading" destination="kch-bF-wdy" id="wcr-Hc-5JJ"/>
+                <outlet property="titleLabelTop" destination="4yZ-WV-dW5" id="PQ5-4z-Qly"/>
                 <outlet property="totalStackView" destination="AFF-gP-nt6" id="rwP-ON-N2U"/>
+                <outlet property="totalStackviewBottom" destination="NGu-mr-hGB" id="Ola-l0-VQb"/>
+                <outlet property="totalStackviewLeading" destination="0o3-TT-y9X" id="Cfw-gQ-g4f"/>
+                <outlet property="totalStackviewTrailing" destination="TlW-CK-hkZ" id="w4E-Ly-nCB"/>
+                <outlet property="urlImageWidth" destination="DaP-OT-lYg" id="dIG-fr-0e5"/>
                 <outlet property="userNameLabel" destination="cO6-DY-EUn" id="8AO-3c-DDH"/>
+                <outlet property="userNameLabelTop" destination="025-5i-Sid" id="jXj-oi-mVK"/>
             </connections>
             <point key="canvasLocation" x="281.8840579710145" y="226.33928571428569"/>
         </collectionViewCell>

diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/FanFrontCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/FanFrontCardCell.swift
@@ -34,6 +34,19 @@ class FanFrontCardCell: CardCell {
     @IBOutlet weak var secondURLStackView: UIStackView!
     @IBOutlet weak var totalStackView: UIStackView!
 
+    @IBOutlet weak var titleLabelTop: NSLayoutConstraint!
+    @IBOutlet weak var titleLabelBottom: NSLayoutConstraint!
+    @IBOutlet weak var titleLabelLeading: NSLayoutConstraint!
+    @IBOutlet weak var userNameBottom: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewBottom: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewLeading: NSLayoutConstraint!
+    @IBOutlet weak var totalStackviewTrailing: NSLayoutConstraint!
+
+    @IBOutlet weak var birthImageViewWidth: NSLayoutConstraint!
+    @IBOutlet weak var snsImageViewWidth: NSLayoutConstraint!
+    @IBOutlet weak var firstUrlWidth: NSLayoutConstraint!
+    @IBOutlet weak var secondUrlWidth: NSLayoutConstraint!
+
     // MARK: - Life Cycle
 
     override func awakeFromNib() {
@@ -76,6 +89,23 @@ extension FanFrontCardCell {
         firstURLStackView.alignment = .center
         secondURLStackView.alignment = .center
     }
+    func setConstraints() {
+        let constraints = [titleLabelTop, titleLabelBottom, titleLabelLeading,
+                           userNameBottom, totalStackviewBottom, totalStackviewLeading, totalStackviewTrailing]
+        let labels = [titleLabel, userNameLabel, birthLabel, snsLabel, firstURLLabel, secondURLLabel]
+        let widths = [birthImageViewWidth, snsImageViewWidth, firstUrlWidth, secondUrlWidth]
+        constraints.forEach {
+            $0?.constant = ($0?.constant ?? 0) * 0.6
+        }
+        labels.forEach {
+            $0?.font = $0?.font.withSize(($0?.font.pointSize ?? 0) * 0.6)
+        }
+        widths.forEach {
+            $0?.constant = 12
+        }
+        totalStackView.spacing = 5
+        print("✅✅")
+    }
     private func setTapGesture() {
         snsLabel.isUserInteractionEnabled = true
         let instagramTapGesture = UITapGestureRecognizer(target: self, action: #selector(tapSNSLabel))