Feat [#21] 회원가입_약관동의뷰 UI 구현

DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj

@@ -26,11 +26,15 @@
 		2A8D70C32B4D7FF5009F4C6C /* BackButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */; };
 		2A8D70C52B4D8079009F4C6C /* UIViewController+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70C42B4D8079009F4C6C /* UIViewController+.swift */; };
 		2A8D70C72B4D8C1C009F4C6C /* OnboardingEndingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70C62B4D8C1C009F4C6C /* OnboardingEndingViewModel.swift */; };
-		2A8D70CA2B4D9787009F4C6C /* OnboardingEndingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70C92B4D9787009F4C6C /* OnboardingEndingView.swift */; };
+		2A8D70CA2B4D9787009F4C6C /* IntroductionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70C92B4D9787009F4C6C /* IntroductionView.swift */; };
 		2A8D70CC2B4DA7BD009F4C6C /* UITextField+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70CB2B4DA7BD009F4C6C /* UITextField+.swift */; };
+		2A8D70D12B4DD356009F4C6C /* JoinAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70D02B4DD356009F4C6C /* JoinAgreementViewController.swift */; };
+		2A8D70D32B4DD360009F4C6C /* JoinAgreeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8D70D22B4DD360009F4C6C /* JoinAgreeViewModel.swift */; };
 		2AAA845F2B494AC50098A824 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2AAA845E2B494AC50098A824 /* SnapKit */; };
 		2AAEFC972B4A9C3700C2D323 /* DontBeTabBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAEFC962B4A9C3700C2D323 /* DontBeTabBarItem.swift */; };
 		2AAEFC992B4A9E3B00C2D323 /* DontBeTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */; };
+		2AC9FB1B2B4DE77400D31071 /* CustomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC9FB1A2B4DE77400D31071 /* CustomView.swift */; };
+		2AC9FB1F2B4E634A00D31071 /* JoinAgreeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC9FB1E2B4E634A00D31071 /* JoinAgreeView.swift */; };
 		3C01692A2B4DC82D0075334B /* DontBePopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */; };
 		3C0920DE2B4D98CD003BD080 /* DontBeToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */; };
 		3C2854F72B3A9E8300369C99 /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854F62B3A9E8300369C99 /* View.swift */; };
@@ -78,10 +82,14 @@
 		2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackButton.swift; sourceTree = "<group>"; };
 		2A8D70C42B4D8079009F4C6C /* UIViewController+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+.swift"; sourceTree = "<group>"; };
 		2A8D70C62B4D8C1C009F4C6C /* OnboardingEndingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndingViewModel.swift; sourceTree = "<group>"; };
-		2A8D70C92B4D9787009F4C6C /* OnboardingEndingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingEndingView.swift; sourceTree = "<group>"; };
+		2A8D70C92B4D9787009F4C6C /* IntroductionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroductionView.swift; sourceTree = "<group>"; };
 		2A8D70CB2B4DA7BD009F4C6C /* UITextField+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+.swift"; sourceTree = "<group>"; };
+		2A8D70D02B4DD356009F4C6C /* JoinAgreementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinAgreementViewController.swift; sourceTree = "<group>"; };
+		2A8D70D22B4DD360009F4C6C /* JoinAgreeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinAgreeViewModel.swift; sourceTree = "<group>"; };
 		2AAEFC962B4A9C3700C2D323 /* DontBeTabBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeTabBarItem.swift; sourceTree = "<group>"; };
 		2AAEFC982B4A9E3B00C2D323 /* DontBeTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeTabBarController.swift; sourceTree = "<group>"; };
+		2AC9FB1A2B4DE77400D31071 /* CustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomView.swift; sourceTree = "<group>"; };
+		2AC9FB1E2B4E634A00D31071 /* JoinAgreeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinAgreeView.swift; sourceTree = "<group>"; };
 		3C0920DB2B4D78DA003BD080 /* DontBePopupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBePopupView.swift; sourceTree = "<group>"; };
 		3C0920DD2B4D98CD003BD080 /* DontBeToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeToastView.swift; sourceTree = "<group>"; };
 		3C2854F62B3A9E8300369C99 /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
@@ -129,7 +137,6 @@
 			children = (
 				2A2671FA2B4C3A7B009D214F /* ViewControllers */,
 				2A2671FB2B4C3A8E009D214F /* ViewModels */,
-				2A2672032B4C3BF7009D214F /* Helpers */,
 			);
 			path = Login;
 			sourceTree = "<group>";
@@ -158,14 +165,6 @@
 			path = Protocol;
 			sourceTree = "<group>";
 		};
-		2A2672032B4C3BF7009D214F /* Helpers */ = {
-			isa = PBXGroup;
-			children = (
-				2A2672042B4C3C00009D214F /* CancelBag.swift */,
-			);
-			path = Helpers;
-			sourceTree = "<group>";
-		};
 		2A51AE832B4B05AA00FF770A /* Splash */ = {
 			isa = PBXGroup;
 			children = (
@@ -188,9 +187,7 @@
 		2A8D70B52B4C9A2A009F4C6C /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
-				2A8D70B32B4C999F009F4C6C /* CustomButton.swift */,
 				2A8D70BC2B4D61A1009F4C6C /* OnboardingDummy.swift */,
-				2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -215,11 +212,37 @@
 		2A8D70C82B4D8EF1009F4C6C /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				2A8D70C92B4D9787009F4C6C /* OnboardingEndingView.swift */,
+				2A8D70C92B4D9787009F4C6C /* IntroductionView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
 		};
+		2A8D70CD2B4DD2EA009F4C6C /* Join */ = {
+			isa = PBXGroup;
+			children = (
+				2AC9FB192B4DE75700D31071 /* Views */,
+				2A8D70CE2B4DD301009F4C6C /* ViewControllers */,
+				2A8D70CF2B4DD338009F4C6C /* ViewModels */,
+			);
+			path = Join;
+			sourceTree = "<group>";
+		};
+		2A8D70CE2B4DD301009F4C6C /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				2A8D70D02B4DD356009F4C6C /* JoinAgreementViewController.swift */,
+			);
+			path = ViewControllers;
+			sourceTree = "<group>";
+		};
+		2A8D70CF2B4DD338009F4C6C /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+				2A8D70D22B4DD360009F4C6C /* JoinAgreeViewModel.swift */,
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
 		2AAEFC952B4A9BF100C2D323 /* TabBar */ = {
 			isa = PBXGroup;
 			children = (
@@ -229,6 +252,15 @@
 			path = TabBar;
 			sourceTree = "<group>";
 		};
+		2AC9FB192B4DE75700D31071 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				2AC9FB1A2B4DE77400D31071 /* CustomView.swift */,
+				2AC9FB1E2B4E634A00D31071 /* JoinAgreeView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		3C2855022B3AAEE400369C99 /* Example */ = {
 			isa = PBXGroup;
 			children = (
@@ -302,6 +334,7 @@
 				2AAEFC952B4A9BF100C2D323 /* TabBar */,
 				2A51AE832B4B05AA00FF770A /* Splash */,
 				2A2671F52B4BEA0E009D214F /* Login */,
+				2A8D70CD2B4DD2EA009F4C6C /* Join */,
 				2A8D70B22B4C990A009F4C6C /* Onboarding */,
 				3C61930F2B3A7A0700220CEB /* Home */,
 				3CE9C1252B4BE5970086E4A3 /* Write */,
@@ -413,7 +446,6 @@
 			children = (
 				3CE9C1262B4BE5E60086E4A3 /* Views */,
 				3CE9C1282B4BE6580086E4A3 /* ViewControllers */,
-				3CE9C1272B4BE6400086E4A3 /* ViewModel */,
 			);
 			path = Write;
 			sourceTree = "<group>";
@@ -429,13 +461,6 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		3CE9C1272B4BE6400086E4A3 /* ViewModel */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = ViewModel;
-			sourceTree = "<group>";
-		};
 		3CE9C1282B4BE6580086E4A3 /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
@@ -448,6 +473,9 @@
 			isa = PBXGroup;
 			children = (
 				3CE9C1342B4C4BC20086E4A3 /* CircleProgressbar.swift */,
+				2A2672042B4C3C00009D214F /* CancelBag.swift */,
+				2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */,
+				2A8D70B32B4C999F009F4C6C /* CustomButton.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -531,18 +559,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2A8D70CA2B4D9787009F4C6C /* OnboardingEndingView.swift in Sources */,
+				2A8D70CA2B4D9787009F4C6C /* IntroductionView.swift in Sources */,
 				3C6193172B3A7A7B00220CEB /* UIStackView+.swift in Sources */,
 				3CE9C12E2B4C08AE0086E4A3 /* WriteTextView.swift in Sources */,
 				2A8D70BD2B4D61A1009F4C6C /* OnboardingDummy.swift in Sources */,
 				3C6193152B3A7A6400220CEB /* UIView+.swift in Sources */,
+				2AC9FB1F2B4E634A00D31071 /* JoinAgreeView.swift in Sources */,
 				3C6192F12B3A719A00220CEB /* ViewController.swift in Sources */,
 				3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */,
 				2A8D70B42B4C999F009F4C6C /* CustomButton.swift in Sources */,
 				3C2854FB2B3A9E9000369C99 /* Cell.swift in Sources */,
 				3C61930A2B3A781300220CEB /* ImageLiterals.swift in Sources */,
 				2A8D70C52B4D8079009F4C6C /* UIViewController+.swift in Sources */,
 				2A6D54C12B479B4300F9891E /* adjusted+.swift in Sources */,
+				2A8D70D12B4DD356009F4C6C /* JoinAgreementViewController.swift in Sources */,
 				3CE9C1352B4C4BC20086E4A3 /* CircleProgressbar.swift in Sources */,
 				3C6193192B3A7AC700220CEB /* Config.swift in Sources */,
 				3C61931B2B3A7AD000220CEB /* NetworkError.swift in Sources */,
@@ -568,12 +598,14 @@
 				2A8D70BF2B4D68E3009F4C6C /* OnboardingEndingViewController.swift in Sources */,
 				2A51AE852B4B05AA00FF770A /* SplashViewController.swift in Sources */,
 				2A8D70C32B4D7FF5009F4C6C /* BackButton.swift in Sources */,
+				2A8D70D32B4DD360009F4C6C /* JoinAgreeViewModel.swift in Sources */,
 				3C2855012B3AA0A000369C99 /* ExampleCollectionViewCell.swift in Sources */,
 				2A2671FD2B4C3A9F009D214F /* LoginViewModel.swift in Sources */,
 				3C6192EF2B3A719A00220CEB /* SceneDelegate.swift in Sources */,
 				2A2672052B4C3C00009D214F /* CancelBag.swift in Sources */,
 				3C2854FF2B3AA01700369C99 /* ExampleView.swift in Sources */,
 				3C35565B2B494F0A0016BA49 /* UIColor+.swift in Sources */,
+				2AC9FB1B2B4DE77400D31071 /* CustomView.swift in Sources */,
 				3C01692A2B4DC82D0075334B /* DontBePopupView.swift in Sources */,
 				2A2671FF2B4C3AF0009D214F /* Publisher+UIControl.swift in Sources */,
 			);

DontBe-iOS/DontBe-iOS/Application/SceneDelegate.swift

@@ -20,8 +20,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         self.window?.makeKeyAndVisible()
 
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2.0) {
-//            let navigationController = UINavigationController(rootViewController: LoginViewController(viewModel: LoginViewModel()))
-            let navigationController = UINavigationController(rootViewController: DontBeTabBarController())
+            let navigationController = UINavigationController(rootViewController: LoginViewController(viewModel: LoginViewModel()))
+//            let navigationController = UINavigationController(rootViewController: DontBeTabBarController())
             self.window?.rootViewController = navigationController
             self.window?.makeKeyAndVisible()
         }

DontBe-iOS/DontBe-iOS/Global/Extension/UIView+.swift

@@ -13,4 +13,9 @@ extension UIView {
             self.addSubview($0)
         }
     }
+    func makeDivisionLine() -> UIView {
+        let divisionLine = UIView()
+        divisionLine.backgroundColor = .donGray2
+        return divisionLine
+    }
 }

DontBe-iOS/DontBe-iOS/Global/Literals/ImageLiterals.swift

@@ -46,6 +46,14 @@ enum ImageLiterals {
         static var icnLogo: UIImage { .load(name: "icn_login_logo") }
     }
 
+    enum Join {
+        static var btnCheckBox: UIImage { .load(name: "btn_checkbox") }
+        static var btnNotCheckBox: UIImage { .load(name: "btn_not_checkbox") }
+        static var btnNecessary: UIImage { .load(name: "btn_necessary") }
+        static var btnSelect: UIImage { .load(name: "btn_select") }
+        static var btnView: UIImage { .load(name: "btn_view") }
+    }
+
     enum Home {
         static var textLogo: UIImage { .load(name: "Logo") }
     }

DontBe-iOS/DontBe-iOS/Global/Literals/StringLiterals.swift

@@ -29,6 +29,23 @@ enum StringLiterals {
         static let title = "온화한 커뮤니티\nDON’T BE에서 만나요."
     }
 
+    enum Join {
+        static let joinNavigationTitle = "회원가입"
+        static let agreement = "약관동의"
+        static let checkTerms = "DON’T BE와 함께하기 전\n필요한 약관들을 확인해주세요!"
+        static let allCheck = "전체선택"
+        static let useAgreement = "이용약관 동의"
+        static let privacyAgreement = "개인정보 수집 및 이용동의"
+        static let checkAge = "만 14세 이상입니다"
+        static let advertisementAgreement = "마케팅 활용 / 광고성 정보 수신동의"
+        static let nickName = "닉네임"
+        static let nickNamePlaceHolder = "닉네임을 입력해주세요."
+        static let duplicationCheck = "중복확인"
+        static let duplicationCheckDescription = "*중복된 닉네임인지 확인해주세요"
+        static let duplicationNotPass = "*사용 불가능한 닉네임입니다."
+        static let duplicationPass = "*사용 가능한 닉네임입니다."
+    }
+
     enum Onboarding {
         static let placeHolder = "한문장으로 소개를 남겨주세요!"
         static let information = "설정한 사진, 닉네임, 한줄소개는 설정에서 변경 가능해요!"
@@ -38,5 +55,6 @@ enum StringLiterals {
         static let skip = "건너뛰기"
         static let next = "다음으로"
         static let start = "시작하기"
+        static let finish = "완료하기"
     }
 }

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/button/btn_checkbox.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_checkbox.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/button/btn_necessary.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_clause.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/button/btn_not_checkbox.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_checkbox.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/button/btn_select.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_clause-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/button/btn_view.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "btn_view.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}