TeamNADA · mini-min · Nov 19, 2021 · Nov 19, 2021 · Nov 19, 2021
diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj
@@ -38,6 +38,11 @@
 		39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 39D88B632745FDD400A72164 /* TabBar.storyboard */; };
 		39D88B662745FE5F00A72164 /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D88B652745FE5F00A72164 /* TabBarViewController.swift */; };
 		39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */; };
+		39DA4D862747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */; };
+		39DA4D872747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */; };
+		39DA4D882747DAC00082D572 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */; };
+		39DA4D892747DAC00082D572 /* NotoSansCJKkr-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */; };
+		39DA4D8A2747DAC00082D572 /* NotoSansCJKkr-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */; };
 		39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39F5A3CE271461EA00191F94 /* BackCardCell.swift */; };
 		39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39F5A3CF271461EA00191F94 /* BackCardCell.xib */; };
 		7729171F2743D604001593E0 /* CardsInGroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7729171E2743D604001593E0 /* CardsInGroupResponse.swift */; };
@@ -123,6 +128,11 @@
 		39D88B632745FDD400A72164 /* TabBar.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = TabBar.storyboard; sourceTree = "<group>"; };
 		39D88B652745FE5F00A72164 /* TabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
 		39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonBottomSheetViewController.swift; sourceTree = "<group>"; };
+		39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Spoqa Han Sans Neo Bold.otf"; path = "../../../../../NADA_fonts 2/Spoqa Han Sans Neo Bold.otf"; sourceTree = "<group>"; };
+		39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Spoqa Han Sans Neo Regular.otf"; path = "../../../../../NADA_fonts 2/Spoqa Han Sans Neo Regular.otf"; sourceTree = "<group>"; };
+		39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Medium.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Medium.otf"; sourceTree = "<group>"; };
+		39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Bold.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Bold.otf"; sourceTree = "<group>"; };
+		39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "NotoSansCJKkr-Regular.otf"; path = "../../../../../NADA_fonts 2/NotoSansCJKkr-Regular.otf"; sourceTree = "<group>"; };
 		39F5A3CE271461EA00191F94 /* BackCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCell.swift; sourceTree = "<group>"; };
 		39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = "<group>"; };
 		4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -314,6 +324,18 @@
 			path = BottomSheet;
 			sourceTree = "<group>";
 		};
+		39DA4D7B2747D7060082D572 /* Font */ = {
+			isa = PBXGroup;
+			children = (
+				39DA4D842747DAC00082D572 /* NotoSansCJKkr-Bold.otf */,
+				39DA4D832747DAC00082D572 /* NotoSansCJKkr-Medium.otf */,
+				39DA4D852747DAC00082D572 /* NotoSansCJKkr-Regular.otf */,
+				39DA4D812747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf */,
+				39DA4D822747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf */,
+			);
+			path = Font;
+			sourceTree = "<group>";
+		};
 		4D28D444572353D68574D2B0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -513,6 +535,7 @@
 			isa = PBXGroup;
 			children = (
 				F857FC8A26C03A5C00A48D01 /* Assets */,
+				39DA4D7B2747D7060082D572 /* Font */,
 				F8FC43A326C01F420033E151 /* Constants */,
 				F8FC43A426C01F5B0033E151 /* Extensions */,
 				F8FC43A226C01F2B0033E151 /* Storyboards */,
@@ -710,22 +733,27 @@
 			buildActionMask = 2147483647;
 			files = (
 				F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */,
+				39DA4D8A2747DAC00082D572 /* NotoSansCJKkr-Regular.otf in Resources */,
 				39D88B622745FBA900A72164 /* More.storyboard in Resources */,
 				F82FF8262702000000E57F8B /* RequiredFlavorCollectionViewCell.xib in Resources */,
 				F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */,
 				F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */,
+				39DA4D872747DAC00082D572 /* Spoqa Han Sans Neo Regular.otf in Resources */,
 				3958F23C270FFBD500B100B2 /* Group.storyboard in Resources */,
 				F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */,
 				394F314F27081B4C00C83291 /* Front.storyboard in Resources */,
 				3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */,
+				39DA4D862747DAC00082D572 /* Spoqa Han Sans Neo Bold.otf in Resources */,
 				F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */,
 				39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */,
 				39523E5C2701A48900536900 /* CardListTableViewCell.xib in Resources */,
 				F8FC439226C01CDE0033E151 /* LaunchScreen.storyboard in Resources */,
+				39DA4D892747DAC00082D572 /* NotoSansCJKkr-Bold.otf in Resources */,
 				F8FC438F26C01CDE0033E151 /* Assets.xcassets in Resources */,
 				39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */,
 				39523E0B270184B100536900 /* CardList.storyboard in Resources */,
 				F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */,
+				39DA4D882747DAC00082D572 /* NotoSansCJKkr-Medium.otf in Resources */,
 				392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */,
 				390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */,
 			);

diff --git a/NADA-iOS-forRelease/Info.plist b/NADA-iOS-forRelease/Info.plist
@@ -2,6 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIAppFonts</key>
+	<array>
+		<string>NotoSansCJKkr-Bold.otf</string>
+		<string>NotoSansCJKkr-Medium.otf</string>
+		<string>NotoSansCJKkr-Regular.otf</string>
+		<string>Spoqa Han Sans Neo Bold.otf</string>
+		<string>Spoqa Han Sans Neo Regular.otf</string>
+	</array>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconCards.imageset/Contents.json
@@ -1,19 +1,19 @@
 {
   "images" : [
     {
-      "scale" : "1x",
       "idiom" : "universal",
-      "filename" : "iconCards.png"
+      "filename" : "iconCards.png",
+      "scale" : "1x"
     },
     {
-      "filename" : "iconCards@2x.png",
       "idiom" : "universal",
+      "filename" : "iconCards@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "iconCards@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "iconCards@3x.png"
     }
   ],
   "info" : {

diff --git a/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift b/NADA-iOS-forRelease/Resouces/Extensions/UIFont+Extension.swift
@@ -10,96 +10,56 @@ import UIKit
 
 extension UIFont {
 
-  class var appname: UIFont {
-    return UIFont.systemFont(ofSize: 30.0, weight: .heavy)
+    @nonobjc class var title01: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Bold", size: 20.0)!
   }
 
-  class var menu: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 26.0)!
+    @nonobjc class var textRegular01: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Regular", size: 20.0)!
   }
 
-  class var cardName: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 24.0)!
+    @nonobjc class var title02: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Bold", size: 18.0)!
   }
 
-  class var modalName: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 22.0)!
+    @nonobjc class var textRegular02: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Regular", size: 18.0)!
   }
 
-  class var menuSub: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 20.0)!
+    @nonobjc class var button01: UIFont {
+    return UIFont(name: "NotoSansCJKKR-Bold", size: 16.0)!
   }
 
-  class var cardBQue: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 18.0)!
+    @nonobjc class var textBold01: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Bold", size: 16.0)!
   }
 
-  class var cardPart: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 18.0)!
+    @nonobjc class var textRegular03: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Regular", size: 16.0)!
   }
 
-  class var cardBAns: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Light", size: 18.0)!
+    @nonobjc class var textBold02: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Bold", size: 14.0)!
   }
 
-  class var cardMbti: UIFont {
-    return UIFont.systemFont(ofSize: 18.0, weight: .light)
+    @nonobjc class var button02: UIFont {
+    return UIFont(name: "NotoSansCJKKR-Medium", size: 14.0)!
   }
 
-  class var cardAge: UIFont {
-    return UIFont.systemFont(ofSize: 18.0, weight: .light)
+    @nonobjc class var button03: UIFont {
+    return UIFont(name: "NotoSansCJKKR-Regular", size: 14.0)!
   }
 
-  class var listName: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 16.0)!
+    @nonobjc class var textRegular04: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Regular", size: 14.0)!
   }
 
-  class var step: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 16.0)!
+    @nonobjc class var textBold03: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Bold", size: 12.0)!
   }
 
-  class var cardOpt: UIFont {
-    return UIFont.systemFont(ofSize: 16.0, weight: .bold)
-  }
-
-  class var inputKor: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)!
-  }
-
-  class var hint: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)!
-  }
-
-  class var btn: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Medium", size: 16.0)!
-  }
-
-  class var inputEng: UIFont {
-    return UIFont.systemFont(ofSize: 16.0, weight: .medium)
-  }
-
-  class var description: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Regular", size: 16.0)!
-  }
-
-  class var cardOptText: UIFont {
-    return UIFont.systemFont(ofSize: 16.0, weight: .regular)
-  }
-
-  class var cardTitle: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Light", size: 16.0)!
-  }
-
-  class var login: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Bold", size: 14.0)!
-  }
-
-  class var hint2: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Medium", size: 14.0)!
-  }
-
-  class var listDate: UIFont {
-    return UIFont(name: "AppleSDGothicNeo-Light", size: 12.0)!
+    @nonobjc class var textRegular05: UIFont {
+    return UIFont(name: "SpoqaHanSansNeo-Regular", size: 12.0)!
   }
 
 }
diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardList.storyboard
@@ -9,6 +9,11 @@
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Spoqa Han Sans Neo Bold.otf">
+            <string>SpoqaHanSansNeo-Bold</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Card List View Controller-->
         <scene sceneID="jHI-XV-01Y">
@@ -34,8 +39,8 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="리스트" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kZi-Mb-irk">
-                                        <rect key="frame" x="166.66666666666666" y="17" width="42" height="20"/>
-                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
+                                        <rect key="frame" x="162.66666666666666" y="17" width="50" height="21.666666666666671"/>
+                                        <fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="18"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>

diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard
@@ -8,6 +8,11 @@
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="NotoSansCJKkr-Regular.otf">
+            <string>NotoSansCJKkr-Regular</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Login View Controller-->
         <scene sceneID="s0d-6b-0kx">
@@ -28,7 +33,7 @@
                                         <constraints>
                                             <constraint firstAttribute="height" constant="48" id="3RT-Mz-xhr"/>
                                         </constraints>
-                                        <fontDescription key="fontDescription" name="NotoSansMyanmar-Regular" family="Noto Sans Myanmar" pointSize="14"/>
+                                        <fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="14"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="75" maxY="0.0"/>
                                         <state key="normal" title="카카오 로그인" image="icnKakao">
                                             <color key="titleColor" name="primary"/>
@@ -50,7 +55,7 @@
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CFr-2z-xuP">
                                         <rect key="frame" x="0.0" y="62" width="327" height="48"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="14"/>
                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="68" maxY="0.0"/>
                                         <state key="normal" title="Apple로 로그인" image="icnApple">
                                             <color key="titleColor" name="primary"/>

diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard
@@ -9,6 +9,11 @@
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Spoqa Han Sans Neo Bold.otf">
+            <string>SpoqaHanSansNeo-Bold</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Front View Controller-->
         <scene sceneID="s0d-6b-0kx">
@@ -22,8 +27,8 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="내 명함" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fmx-Ie-VCf">
-                                        <rect key="frame" x="24" y="18" width="51" height="21"/>
-                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                        <rect key="frame" x="24" y="18" width="60" height="24"/>
+                                        <fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="20"/>
                                         <color key="textColor" name="primary"/>
                                         <nil key="highlightedColor"/>
                                     </label>
@@ -64,6 +69,11 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G4S-UU-Nlv" customClass="VerticalCardSwiper" customModule="VerticalCardSwiper">
                                 <rect key="frame" x="0.0" y="94" width="375" height="635"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="topInset">
+                                        <real key="value" value="20"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>

diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
@@ -9,6 +9,11 @@
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Spoqa Han Sans Neo Bold.otf">
+            <string>SpoqaHanSansNeo-Bold</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--More View Controller-->
         <scene sceneID="s0d-6b-0kx">
@@ -22,8 +27,8 @@
                                 <rect key="frame" x="0.0" y="44" width="375" height="50"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="더보기" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DVO-N6-tSR">
-                                        <rect key="frame" x="24" y="18" width="47" height="21"/>
-                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                        <rect key="frame" x="24.000000000000004" y="18" width="55.333333333333343" height="24"/>
+                                        <fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="20"/>
                                         <color key="textColor" name="primary"/>
                                         <nil key="highlightedColor"/>
                                     </label>