Feat/#34

Projects/Chat/Sources/View/ChatViewController.swift

@@ -31,11 +31,6 @@ public class ChatViewController: BaseViewController {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
-    public override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        self.navigationController?.setNavigationBarHidden(true, animated: false)
-    }
 
     public override func viewDidLoad() {
         super.viewDidLoad()

Projects/CommonUI/CommonUI.xcodeproj/project.pbxproj

@@ -27,8 +27,8 @@
 		736D1C5EB53FB204B030C397 /* DiaryAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 179BF0E6EE3B59F510B8AF40 /* DiaryAddView.swift */; };
 		7D319882A302F75CCE46A48C /* HomeQuizView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39A77FC9A0E2D7F62CA16E90 /* HomeQuizView.swift */; };
 		7DC59B80630854028C7C80F4 /* TuistBundle+CommonUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94EF204F3CD6F86C6167C300 /* TuistBundle+CommonUI.swift */; };
-		7DD1D21C569B040F1AB7067B /* DiaryResultView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EEBE047F5F8EC16F0985204 /* DiaryResultView.swift */; };
 		8E0E6BDEA9574116ECBD55E4 /* ChatAnalysisView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963B9323B265D5683B336EF2 /* ChatAnalysisView.swift */; };
+		95256BFF2E82F7F900AC3FE1 /* SpellingCategoryColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95256BFE2E82F7F800AC3FE1 /* SpellingCategoryColor.swift */; };
 		9532C7A92E786B3C00B4BADE /* DiaryLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9532C7A82E786B3800B4BADE /* DiaryLoadingView.swift */; };
 		956C4D852E76F05000E32F93 /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 956C4D842E76F04A00E32F93 /* CalendarView.swift */; };
 		956C4D892E76F0F500E32F93 /* DividerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 956C4D882E76F0F400E32F93 /* DividerView.swift */; };
@@ -93,10 +93,10 @@
 		75EF1CA00DA4B6E64F0CB1F0 /* CommonUIAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonUIAssets.swift; sourceTree = "<group>"; };
 		7CE59FBFD1AAA1B5E7B45FD5 /* HomeProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeProgressView.swift; sourceTree = "<group>"; };
 		7DE79D12719B54383633DF73 /* SignInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInView.swift; sourceTree = "<group>"; };
-		7EEBE047F5F8EC16F0985204 /* DiaryResultView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryResultView.swift; sourceTree = "<group>"; };
 		83D64639CB805B71A9CA6C17 /* ChatAnalysisLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatAnalysisLoadingView.swift; sourceTree = "<group>"; };
 		9266801EFBA6178C5B70C641 /* MyPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageView.swift; sourceTree = "<group>"; };
 		94EF204F3CD6F86C6167C300 /* TuistBundle+CommonUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TuistBundle+CommonUI.swift"; sourceTree = "<group>"; };
+		95256BFE2E82F7F800AC3FE1 /* SpellingCategoryColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpellingCategoryColor.swift; sourceTree = "<group>"; };
 		9532C7A82E786B3800B4BADE /* DiaryLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryLoadingView.swift; sourceTree = "<group>"; };
 		956C4D842E76F04A00E32F93 /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
 		956C4D882E76F0F400E32F93 /* DividerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DividerView.swift; sourceTree = "<group>"; };
@@ -174,6 +174,7 @@
 		2DBBCE824C7AA1459F0CEA0F /* Enum */ = {
 			isa = PBXGroup;
 			children = (
+				95256BFE2E82F7F800AC3FE1 /* SpellingCategoryColor.swift */,
 				75EF1CA00DA4B6E64F0CB1F0 /* CommonUIAssets.swift */,
 			);
 			path = Enum;
@@ -260,7 +261,6 @@
 				FDCDDE79ED900C96E8D0EC4A /* DiaryEditView.swift */,
 				9532C7A82E786B3800B4BADE /* DiaryLoadingView.swift */,
 				95EDE8D42E7E60C50091ED75 /* DiaryDetailView.swift */,
-				7EEBE047F5F8EC16F0985204 /* DiaryResultView.swift */,
 				ACC4F396C35AD4C9F54E4BF6 /* DiaryTodayView.swift */,
 			);
 			path = Diary;
@@ -424,6 +424,7 @@
 				21B9DB651F4D3F7DFB5CE055 /* LMTextField.swift in Sources */,
 				E0865F2849CCB89CC83D3B77 /* Coordinator.swift in Sources */,
 				E055AA66777B1D4CC8C884E4 /* CommonUIAssets.swift in Sources */,
+				95256BFF2E82F7F900AC3FE1 /* SpellingCategoryColor.swift in Sources */,
 				956C4D852E76F05000E32F93 /* CalendarView.swift in Sources */,
 				B9F3C0F9AA675E70FB8ED969 /* UIStackView+Extension.swift in Sources */,
 				F151F3B566BCA8E16853B241 /* ChatAnalysisLoadingView.swift in Sources */,
@@ -435,7 +436,6 @@
 				736D1C5EB53FB204B030C397 /* DiaryAddView.swift in Sources */,
 				9532C7A92E786B3C00B4BADE /* DiaryLoadingView.swift in Sources */,
 				F8B8A383C8670A714B41F2EE /* DiaryEditView.swift in Sources */,
-				7DD1D21C569B040F1AB7067B /* DiaryResultView.swift in Sources */,
 				95EDE8D52E7E60CA0091ED75 /* DiaryDetailView.swift in Sources */,
 				568C33E681D9B58B71273564 /* DiaryTodayView.swift in Sources */,
 				318A2464888400F05D38B7E5 /* DiaryView.swift in Sources */,

Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMBlue.colorset/Contents.json → Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMBlue01.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xEA",
-          "red" : "0xD9"
+          "blue" : "0xEA",
+          "green" : "0x77",
+          "red" : "0x1A"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xEA",
-          "red" : "0xD9"
+          "blue" : "0xEA",
+          "green" : "0x77",
+          "red" : "0x1A"
         }
       },
       "idiom" : "universal"

Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMBlue02.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xEA",
-          "green" : "0x77",
-          "red" : "0x1A"
+          "blue" : "0xFF",
+          "green" : "0xEA",
+          "red" : "0xD9"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xEA",
-          "green" : "0x77",
-          "red" : "0x1A"
+          "blue" : "0xFF",
+          "green" : "0xEA",
+          "red" : "0xD9"
         }
       },
       "idiom" : "universal"

Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMGreen01.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x3D",
+          "green" : "0xAA",
+          "red" : "0x1F"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x3D",
+          "green" : "0xAA",
+          "red" : "0x1F"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMOrange00.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x11",
+          "green" : "0x67",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x11",
+          "green" : "0x67",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/CommonUI/Sources/Assets/Colors.xcassets/LMPointColor/LMPink.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xB3",
+          "green" : "0x5B",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xB3",
+          "green" : "0x5B",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/CommonUI/Sources/Assets/Images.xcassets/Icon/next2.imageset/Contents.json

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

Projects/CommonUI/Sources/Component/LMAlert.swift

@@ -98,25 +98,46 @@ public class LMAlert: UIView {
         containerView.snp.makeConstraints {
             $0.center.equalToSuperview()
             $0.width.equalTo(280)
-            $0.height.equalTo(140)
+            $0.height.greaterThanOrEqualTo(140)
         }
 
         titleLabel.snp.makeConstraints {
             $0.top.equalToSuperview().inset(24)
             $0.horizontalEdges.equalToSuperview().inset(20)
+            $0.bottom.lessThanOrEqualTo(buttonStackView.snp.top).offset(-16)
         }
 
         buttonStackView.snp.makeConstraints {
             $0.bottom.equalToSuperview().inset(20)
             $0.horizontalEdges.equalToSuperview().inset(20)
             $0.height.equalTo(44)
+            $0.top.greaterThanOrEqualTo(titleLabel.snp.bottom).offset(16)
         }
     }
 
     private func configure(title: String, cancelTitle: String, confirmTitle: String) {
-        titleLabel.text = title
+        // 줄간격을 적용한 attributed string 생성
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 4
+        paragraphStyle.alignment = .center
+
+        let attributedString = NSAttributedString(
+            string: title,
+            attributes: [
+                .font: UIFont.systemFont(ofSize: 16, weight: .medium),
+                .foregroundColor: UIColor.black,
+                .paragraphStyle: paragraphStyle
+            ]
+        )
+
+        titleLabel.attributedText = attributedString
         cancelButton.setTitle(cancelTitle, for: .normal)
         confirmButton.setTitle(confirmTitle, for: .normal)
+
+        // cancelTitle이 비어있으면 취소 버튼 숨기기
+        if cancelTitle.isEmpty {
+            cancelButton.isHidden = true
+        }
     }
 
     // MARK: - Actions

Projects/CommonUI/Sources/Component/LMInputField.swift

@@ -24,18 +24,21 @@ public class LMInputField: UIStackView {
     private var waringText: String?
     private var inputType: InputType?
     private var buttonTitle: String?
+    private var isSecureTextEntry: Bool = false
 
     public init(inputType: InputType? = nil,
                 inputText: String?,
                 inputPlaceholder: String?,
                 warningText: String?,
-                buttonTitle: String? = ""
+                buttonTitle: String? = "",
+                isSecureTextEntry: Bool = false
     ) {
         self.inputType = inputType
         self.inputText = inputText
         self.inputPlaceholder = inputPlaceholder
         self.waringText = warningText
         self.buttonTitle = buttonTitle
+        self.isSecureTextEntry = isSecureTextEntry
         super.init(frame: .zero)
         initUI()
         initAttribute()
@@ -60,6 +63,7 @@ public class LMInputField: UIStackView {
 
         inputTextField = inputTextField.then {
             $0.placeholder = inputPlaceholder
+            $0.isSecureTextEntry = isSecureTextEntry
         }
 
         warningLabel = warningLabel.then {

Projects/CommonUI/Sources/Enum/CommonUIAssets.swift

@@ -56,9 +56,11 @@ public enum CommonUIAssets {
     public static let IconBubble = image(named: "bubble")
     public static let IconPrevious = image(named: "previous")
     public static let IconNext = image(named: "next")
+    public static let IconNext2 = image(named: "next2")
     public static let IconAdd = image(named: "add")
 
     /// color
+    public static let LMOrange0 = color(named: "LMOrange00")
     public static let LMOrange1 = color(named: "LMOrange01")
     public static let LMOrange3 = color(named: "LMOrange03")
     public static let LMOrange4 = color(named: "LMOrange04")
@@ -69,11 +71,13 @@ public enum CommonUIAssets {
     public static let LMGray4 = color(named: "LMGray04")
     public static let LMGray5 = color(named: "LMGray05")
     public static let LMGray6 = color(named: "LMGray06")
-    public static let LMBlue = color(named: "LMBlue")
+    public static let LMBlue = color(named: "LMBlue01")
     public static let LMBlue2 = color(named: "LMBlue02")
-    public static let LMGreen = color(named: "LMGreen")
+    public static let LMGreen = color(named: "LMGreen01")
+    public static let LMGreen2 = color(named: "LMGreen02")
     public static let LMRed = color(named: "LMRed")
     public static let LMRed2 = color(named: "LMRed02")
+    public static let LMPink = color(named: "LMPink")
 }
 
 private func image(named name: String) -> UIImage? {