Merge pull request #124 from mash-up-kr/qa/1.0.1/main

1.0.1 배포 완료
mash-up-kr · Nov 21, 2023 · 75086c7 · 75086c7
2 parents ffd6f31 + 778dabc
commit 75086c7
Show file tree

Hide file tree

Showing 156 changed files with 2,605 additions and 1,106 deletions.
diff --git a/...m/Sources/DesignSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/Contents.json b/...m/Sources/DesignSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "app_logo.png",
+      "filename" : "app_logo@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

diff --git a/.../DesignSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/app_logo.png b/.../DesignSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/app_logo.png
diff --git a/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected] b/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected]
diff --git a/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected] b/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected]
diff --git a/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected] b/...signSystem/Resources/Assets.xcassets/app_icon/app_logo.imageset/[email protected]
diff --git a/...System/Resources/Assets.xcassets/background/flowerPopup_background.imageset/Contents.json b/...System/Resources/Assets.xcassets/background/flowerPopup_background.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "flowerPopup_background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/....xcassets/background/flowerPopup_background.imageset/flowerPopup_background.png b/....xcassets/background/flowerPopup_background.imageset/flowerPopup_background.png
diff --git a/...assets/background/flowerPopup_background.imageset/[email protected] b/...assets/background/flowerPopup_background.imageset/[email protected]
diff --git a/...assets/background/flowerPopup_background.imageset/[email protected] b/...assets/background/flowerPopup_background.imageset/[email protected]
diff --git a/...urces/DesignSystem/Resources/Assets.xcassets/flower_small/img_buds.imageset/Contents.json b/...urces/DesignSystem/Resources/Assets.xcassets/flower_small/img_buds.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "img_buds.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ignSystem/Resources/Assets.xcassets/flower_small/img_buds.imageset/img_buds.png b/...ignSystem/Resources/Assets.xcassets/flower_small/img_buds.imageset/img_buds.png
diff --git a/...System/Resources/Assets.xcassets/flower_small/img_buds.imageset/[email protected] b/...System/Resources/Assets.xcassets/flower_small/img_buds.imageset/[email protected]
diff --git a/...System/Resources/Assets.xcassets/flower_small/img_buds.imageset/[email protected] b/...System/Resources/Assets.xcassets/flower_small/img_buds.imageset/[email protected]
diff --git a/...esources/Assets.xcassets/flower_state_icon/icon_challenge_progress.imageset/Contents.json b/...esources/Assets.xcassets/flower_state_icon/icon_challenge_progress.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_challenge_progress.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/.../flower_state_icon/icon_challenge_progress.imageset/icon_challenge_progress.png b/.../flower_state_icon/icon_challenge_progress.imageset/icon_challenge_progress.png
diff --git a/...ower_state_icon/icon_challenge_progress.imageset/[email protected] b/...ower_state_icon/icon_challenge_progress.imageset/[email protected]
diff --git a/...ower_state_icon/icon_challenge_progress.imageset/[email protected] b/...ower_state_icon/icon_challenge_progress.imageset/[email protected]
diff --git a/...Assets.xcassets/flower_success/flower_success_mate_bling_sunflower.imageset/Contents.json b/...Assets.xcassets/flower_success/flower_success_mate_bling_sunflower.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Property 1=my_bling_sunflower.png",
+      "filename" : "flower_success_mate_bling_sunflower.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Property 1=my_bling_sunflower@2x.png",
+      "filename" : "flower_success_mate_bling_sunflower@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Property 1=my_bling_sunflower@3x.png",
+      "filename" : "flower_success_mate_bling_sunflower@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/.../flower_success_mate_bling_sunflower.imageset/Property 1=my_bling_sunflower.png b/.../flower_success_mate_bling_sunflower.imageset/Property 1=my_bling_sunflower.png
diff --git a/...ower_success_mate_bling_sunflower.imageset/Property [email protected] b/...ower_success_mate_bling_sunflower.imageset/Property [email protected]
diff --git a/...ower_success_mate_bling_sunflower.imageset/Property [email protected] b/...ower_success_mate_bling_sunflower.imageset/Property [email protected]
diff --git a/...r_success_mate_bling_sunflower.imageset/flower_success_mate_bling_sunflower.png b/...r_success_mate_bling_sunflower.imageset/flower_success_mate_bling_sunflower.png
diff --git a/...uccess_mate_bling_sunflower.imageset/[email protected] b/...uccess_mate_bling_sunflower.imageset/[email protected]
diff --git a/...uccess_mate_bling_sunflower.imageset/[email protected] b/...uccess_mate_bling_sunflower.imageset/[email protected]
diff --git a/...urces/Assets.xcassets/flower_success/flower_success_mate_sunflower.imageset/Contents.json b/...urces/Assets.xcassets/flower_success/flower_success_mate_sunflower.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "Property 1=mate_sunflower.png",
+      "filename" : "flower_success_mate_sunflower.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Property 1=mate_sunflower@2x.png",
+      "filename" : "flower_success_mate_sunflower@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Property 1=mate_sunflower@3x.png",
+      "filename" : "flower_success_mate_sunflower@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...er_success/flower_success_mate_sunflower.imageset/Property 1=mate_sunflower.png b/...er_success/flower_success_mate_sunflower.imageset/Property 1=mate_sunflower.png
diff --git a/...success/flower_success_mate_sunflower.imageset/Property [email protected] b/...success/flower_success_mate_sunflower.imageset/Property [email protected]
diff --git a/...success/flower_success_mate_sunflower.imageset/Property [email protected] b/...success/flower_success_mate_sunflower.imageset/Property [email protected]
diff --git a/...uccess/flower_success_mate_sunflower.imageset/flower_success_mate_sunflower.png b/...uccess/flower_success_mate_sunflower.imageset/flower_success_mate_sunflower.png
diff --git a/...ess/flower_success_mate_sunflower.imageset/[email protected] b/...ess/flower_success_mate_sunflower.imageset/[email protected]
diff --git a/...ess/flower_success_mate_sunflower.imageset/[email protected] b/...ess/flower_success_mate_sunflower.imageset/[email protected]
diff --git a/.../DesignSystem/Resources/Assets.xcassets/main_icon/icon_title_arrow.imageset/Contents.json b/.../DesignSystem/Resources/Assets.xcassets/main_icon/icon_title_arrow.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_title_arrow.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ources/Assets.xcassets/main_icon/icon_title_arrow.imageset/icon_title_arrow.png b/...ources/Assets.xcassets/main_icon/icon_title_arrow.imageset/icon_title_arrow.png
diff --git a/...ces/Assets.xcassets/main_icon/icon_title_arrow.imageset/[email protected] b/...ces/Assets.xcassets/main_icon/icon_title_arrow.imageset/[email protected]
diff --git a/...ces/Assets.xcassets/main_icon/icon_title_arrow.imageset/[email protected] b/...ces/Assets.xcassets/main_icon/icon_title_arrow.imageset/[email protected]
diff --git a/Core/DesignSystem/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/Contents.json b/Core/DesignSystem/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...em/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/icon_edit.imageset/Contents.json b/...em/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/icon_edit.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_edit.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...em/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/icon_edit.imageset/icon_edit.pdf b/...em/Sources/DesignSystem/Resources/Assets.xcassets/myinfo/icon_edit.imageset/icon_edit.pdf
diff --git a/Core/DesignSystem/Sources/DesignSystem/Resources/Assets.xcassets/speechBubble/Contents.json b/Core/DesignSystem/Sources/DesignSystem/Resources/Assets.xcassets/speechBubble/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ystem/Resources/Assets.xcassets/speechBubble/bubble_challenge_fail.imageset/Contents.json b/...ystem/Resources/Assets.xcassets/speechBubble/bubble_challenge_fail.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "bubble_challenge_fail.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/....xcassets/speechBubble/bubble_challenge_fail.imageset/bubble_challenge_fail.png b/....xcassets/speechBubble/bubble_challenge_fail.imageset/bubble_challenge_fail.png
diff --git a/...assets/speechBubble/bubble_challenge_fail.imageset/[email protected] b/...assets/speechBubble/bubble_challenge_fail.imageset/[email protected]
diff --git a/...assets/speechBubble/bubble_challenge_fail.imageset/[email protected] b/...assets/speechBubble/bubble_challenge_fail.imageset/[email protected]
diff --git a/.../Resources/Assets.xcassets/speechBubble/icon_bubble_flowerLanguage.imageset/Contents.json b/.../Resources/Assets.xcassets/speechBubble/icon_bubble_flowerLanguage.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_bubble_flowerLanguage.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...speechBubble/icon_bubble_flowerLanguage.imageset/icon_bubble_flowerLanguage.png b/...speechBubble/icon_bubble_flowerLanguage.imageset/icon_bubble_flowerLanguage.png
diff --git a/...echBubble/icon_bubble_flowerLanguage.imageset/[email protected] b/...echBubble/icon_bubble_flowerLanguage.imageset/[email protected]
diff --git a/...echBubble/icon_bubble_flowerLanguage.imageset/[email protected] b/...echBubble/icon_bubble_flowerLanguage.imageset/[email protected]
diff --git a/...on_bubble_not_mate.imageset/Contents.json → ...on_bubble_not_mate.imageset/Contents.json b/...on_bubble_not_mate.imageset/Contents.json → ...on_bubble_not_mate.imageset/Contents.json
diff --git a/..._mate.imageset/icon_bubble_not_mate 1.png → ..._mate.imageset/icon_bubble_not_mate 1.png b/..._mate.imageset/icon_bubble_not_mate 1.png → ..._mate.imageset/icon_bubble_not_mate 1.png
diff --git a/...te.imageset/icon_bubble_not_mate@2x 1.png → ...te.imageset/icon_bubble_not_mate@2x 1.png b/...te.imageset/icon_bubble_not_mate@2x 1.png → ...te.imageset/icon_bubble_not_mate@2x 1.png
diff --git a/...te.imageset/icon_bubble_not_mate@3x 1.png → ...te.imageset/icon_bubble_not_mate@3x 1.png b/...te.imageset/icon_bubble_not_mate@3x 1.png → ...te.imageset/icon_bubble_not_mate@3x 1.png
diff --git a/...con_bubble_tail_my.imageset/Contents.json → ...con_bubble_tail_my.imageset/Contents.json b/...con_bubble_tail_my.imageset/Contents.json → ...con_bubble_tail_my.imageset/Contents.json
diff --git a/...bble_tail_my.imageset/img_yellow_tail.png → ...bble_tail_my.imageset/img_yellow_tail.png b/...bble_tail_my.imageset/img_yellow_tail.png → ...bble_tail_my.imageset/img_yellow_tail.png
diff --git a/...e_tail_my.imageset/[email protected] → ...e_tail_my.imageset/[email protected] b/...e_tail_my.imageset/[email protected] → ...e_tail_my.imageset/[email protected]
diff --git a/...e_tail_my.imageset/[email protected] → ...e_tail_my.imageset/[email protected] b/...e_tail_my.imageset/[email protected] → ...e_tail_my.imageset/[email protected]
diff --git a/...ubble_tail_partner.imageset/Contents.json → ...ubble_tail_partner.imageset/Contents.json b/...ubble_tail_partner.imageset/Contents.json → ...ubble_tail_partner.imageset/Contents.json
diff --git a/...e_tail_partner.imageset/img_pink_tail.png → ...e_tail_partner.imageset/img_pink_tail.png b/...e_tail_partner.imageset/img_pink_tail.png → ...e_tail_partner.imageset/img_pink_tail.png
diff --git a/...ail_partner.imageset/[email protected] → ...ail_partner.imageset/[email protected] b/...ail_partner.imageset/[email protected] → ...ail_partner.imageset/[email protected]
diff --git a/...ail_partner.imageset/[email protected] → ...ail_partner.imageset/[email protected] b/...ail_partner.imageset/[email protected] → ...ail_partner.imageset/[email protected]
diff --git a/.../icon_bubble_write.imageset/Contents.json → .../icon_bubble_write.imageset/Contents.json b/.../icon_bubble_write.imageset/Contents.json → .../icon_bubble_write.imageset/Contents.json
diff --git a/...le_write.imageset/icon_bubble_write 1.png → ...le_write.imageset/icon_bubble_write 1.png b/...le_write.imageset/icon_bubble_write 1.png → ...le_write.imageset/icon_bubble_write 1.png
diff --git a/...write.imageset/icon_bubble_write@2x 1.png → ...write.imageset/icon_bubble_write@2x 1.png b/...write.imageset/icon_bubble_write@2x 1.png → ...write.imageset/icon_bubble_write@2x 1.png
diff --git a/...write.imageset/icon_bubble_write@3x 1.png → ...write.imageset/icon_bubble_write@3x 1.png b/...write.imageset/icon_bubble_write@3x 1.png → ...write.imageset/icon_bubble_write@3x 1.png
diff --git a/Core/DesignSystem/Sources/DesignSystem/Sources/Assets/Assets.swift b/Core/DesignSystem/Sources/DesignSystem/Sources/Assets/Assets.swift
@@ -119,6 +119,7 @@ public enum Assets: String {
     case icon_buds
     case icon_bubble_tail_my
     case icon_bubble_tail_partner
+    case icon_bubble_flowerLanguage
     case icon_check
     case icon_cryingseed
     case icon_blossome
@@ -132,6 +133,12 @@ public enum Assets: String {
     case history_certificate
     case history_line
     case history_waiting
+    case icon_edit
+    case img_buds
+    case bubble_challenge_fail
+    case flowerPopup_background
+    case icon_challenge_progress
+    case icon_title_arrow
 
     public var image: UIImage {
         return .init(named: self.rawValue, in: Bundle.module, with: nil)!

diff --git a/...gnSystem/Sources/DesignSystem/Sources/Component/NavigationBar/TTNavigationDetailBar.swift b/...gnSystem/Sources/DesignSystem/Sources/Component/NavigationBar/TTNavigationDetailBar.swift
@@ -49,37 +49,29 @@ public final class TTNavigationDetailBar: UIView {
 
     // MARK: - Init
 
-    override public init(frame: CGRect) {
+    override init(frame: CGRect) {
         super.init(frame: frame)
         self.layout()
     }
 
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
     /// - Parameters:
     ///  - title: 타이틀 설정
     ///  - leftButtonImage: 좌측 버튼 이미지 설정
     ///  - rightButtonImage: 우측 버튼 이미지 설정
-    ///  사용 예시
-    ///  ```swift
-    /// TTNavigationDetailBar(title: "Hello",
-    ///                       leftButtonImage: .asset(.icon_more),
-    ///                       rightButtonImage: nil)
-    ///  ```
-    public convenience init(title: String?,
-                            leftButtonImage: UIImage?,
-                            rightButtonImage: UIImage?) {
-        self.init()
+    public func configure(title: String?,
+                   leftButtonImage: UIImage?,
+                   rightButtonImage: UIImage?) {
         self.titleLabel.text = title
         self.leftButton.setImage(leftButtonImage, for: .normal)
         self.rightButton.setImage(rightButtonImage , for: .normal)
-
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
     }
 
     // MARK: - Layout
-
+    
     private func layout() {
         [self.titleLabel, self.leftButton, self.rightButton].forEach {
             self.addSubview($0)