chore #51: 디자인 세부조정

Nexters · Aug 18, 2023 · 2b5cbf2 · 2b5cbf2
1 parent 5b89512
commit 2b5cbf2
Show file tree

Hide file tree

Showing 41 changed files with 367 additions and 410 deletions.
diff --git a/Projects/Core/Sources/Utility/UI/Animation/CustomInteractiveSpringAnimation.swift b/Projects/Core/Sources/Utility/UI/Animation/CustomInteractiveSpringAnimation.swift
@@ -11,6 +11,6 @@ import SwiftUI
 public extension Animation {
  // 테스트하고프면 https://www.cssportal.com/css-cubic-bezier-generator/
  static func customInteractiveSpring(duration: CGFloat = 0.5) -> Animation {
- .timingCurve(0.175, 0.885, 0.32, 1.05, duration: 0.5) // default: 0.5
+ .timingCurve(0.175, 0.885, 0.32, 1.05, duration: duration) // default: 0.5
  }
 }
diff --git a/.../Image.xcassets/유머.imageset/Contents.json → ...xcassets/affection.imageset/Contents.json b/.../Image.xcassets/유머.imageset/Contents.json → ...xcassets/affection.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "유머.png",
+ "filename" : "affection.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

diff --git a/...sources/Image.xcassets/애정.imageset/애정.png → ...xcassets/affection.imageset/affection.png b/...sources/Image.xcassets/애정.imageset/애정.png → ...xcassets/affection.imageset/affection.png
diff --git a/.../Image.xcassets/센스.imageset/Contents.json → ...mage.xcassets/body.imageset/Contents.json b/.../Image.xcassets/센스.imageset/Contents.json → ...mage.xcassets/body.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "센스.png",
+ "filename" : "body.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

diff --git a/...sources/Image.xcassets/신체.imageset/신체.png → ...ces/Image.xcassets/body.imageset/body.png b/...sources/Image.xcassets/신체.imageset/신체.png → ...ces/Image.xcassets/body.imageset/body.png
diff --git a/.../Image.xcassets/신체.imageset/Contents.json → ...xcassets/emotional.imageset/Contents.json b/.../Image.xcassets/신체.imageset/Contents.json → ...xcassets/emotional.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "신체.png",
+ "filename" : "emotional.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

diff --git a/...sources/Image.xcassets/감성.imageset/감성.png → ...xcassets/emotional.imageset/emotional.png b/...sources/Image.xcassets/감성.imageset/감성.png → ...xcassets/emotional.imageset/emotional.png
diff --git a/.../Image.xcassets/애정.imageset/Contents.json → ...mage.xcassets/food.imageset/Contents.json b/.../Image.xcassets/애정.imageset/Contents.json → ...mage.xcassets/food.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
  "images" : [
  {
- "filename" : "애정.png",
+ "filename" : "food.png",
  "idiom" : "universal",
  "scale" : "1x"
  },

diff --git a/...urces/Image.xcassets/먹거리.imageset/먹거리.png → ...ces/Image.xcassets/food.imageset/food.png b/...urces/Image.xcassets/먹거리.imageset/먹거리.png → ...ces/Image.xcassets/food.imageset/food.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/humor.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/humor.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "humor.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...sources/Image.xcassets/유머.imageset/유머.png → ...s/Image.xcassets/humor.imageset/humor.png b/...sources/Image.xcassets/유머.imageset/유머.png → ...s/Image.xcassets/humor.imageset/humor.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/inteligence.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/inteligence.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "inteligence.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...sources/Image.xcassets/지능.imageset/지능.png → ...sets/inteligence.imageset/inteligence.png b/...sources/Image.xcassets/지능.imageset/지능.png → ...sets/inteligence.imageset/inteligence.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/money.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/money.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "money.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...urces/Image.xcassets/돈관리.imageset/돈관리.png → ...s/Image.xcassets/money.imageset/money.png b/...urces/Image.xcassets/돈관리.imageset/돈관리.png → ...s/Image.xcassets/money.imageset/money.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/passion.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/passion.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "passion.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...sources/Image.xcassets/열정.imageset/열정.png → ...age.xcassets/passion.imageset/passion.png b/...sources/Image.xcassets/열정.imageset/열정.png → ...age.xcassets/passion.imageset/passion.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/planning.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/planning.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "planning.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...urces/Image.xcassets/계획적.imageset/계획적.png → ...e.xcassets/planning.imageset/planning.png b/...urces/Image.xcassets/계획적.imageset/계획적.png → ...e.xcassets/planning.imageset/planning.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/relationship.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/relationship.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "relationship.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...ces/Image.xcassets/인간관계.imageset/인간관계.png → ...ts/relationship.imageset/relationship.png b/...ces/Image.xcassets/인간관계.imageset/인간관계.png → ...ts/relationship.imageset/relationship.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/sense.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/sense.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "filename" : "sense.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/...sources/Image.xcassets/센스.imageset/센스.png → ...s/Image.xcassets/sense.imageset/sense.png b/...sources/Image.xcassets/센스.imageset/센스.png → ...s/Image.xcassets/sense.imageset/sense.png
diff --git a/Projects/DSKit/Resources/Image.xcassets/감성.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/감성.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/계획적.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/계획적.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/돈관리.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/돈관리.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/먹거리.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/먹거리.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/열정.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/열정.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/인간관계.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/인간관계.imageset/Contents.json
diff --git a/Projects/DSKit/Resources/Image.xcassets/지능.imageset/Contents.json b/Projects/DSKit/Resources/Image.xcassets/지능.imageset/Contents.json
diff --git a/Projects/DSKit/Sources/Button/SegmentControlView.swift b/Projects/DSKit/Sources/Button/SegmentControlView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import SwiftUIIntrospect
 import Core
 
-public struct SegmentControlView<SegmentType: Identifiable, Content: View>: View {
+public struct SegmentControlView<SegmentType: Identifiable, Content: View>: View where SegmentType: Equatable {
  let segments: [SegmentType]
  @Binding var selected: SegmentType
 
@@ -51,6 +51,7 @@ public struct SegmentControlView<SegmentType: Identifiable, Content: View>: View
  .frame(width: bounds.size.width / CGFloat(segments.count))
  }
  }
+ .animation(Animation.customInteractiveSpring(), value: selected)
  }
  .padding(4)
 
@@ -82,9 +83,7 @@ extension SegmentControlView {
  GeometryReader { bounds in
  Button(action: {
  HapticManager.shared.tok()
- withAnimation(Animation.customInteractiveSpring()) {
- selectedId = id
- }
+ selectedId = id
  }) {
  content()
  }
@@ -104,7 +103,7 @@ extension SegmentControlView {
  }
 }
 
-public enum Segment: Identifiable, CaseIterable {
+public enum MyPageSegment: Identifiable, CaseIterable, Equatable {
  case similar, different
 
  public var id: String {