Revert "UI수정 UI수정작업 " (#274)

Pepsi-Club · May 7, 2024 · e57079e · e57079e
1 parent 178c62f
commit e57079e
Show file tree

Hide file tree

Showing 78 changed files with 306 additions and 773 deletions.
diff --git a/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/1024.png b/Projects/App/Resources/Assets.xcassets/AppIcon.appiconset/1024.png
diff --git a/Projects/App/Resources/Base.lproj/LaunchScreen.storyboard b/Projects/App/Resources/Base.lproj/LaunchScreen.storyboard
@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="appLogo2.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="applogo.png" translatesAutoresizingMaskIntoConstraints="NO" id="SN6-pt-WKY">
                                 <rect key="frame" x="116.66666666666669" y="276" width="170" height="300"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="170" id="asc-3z-qNR"/>
@@ -25,7 +25,7 @@
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                        <color key="backgroundColor" red="0.37647058823529411" green="0.47058823529411764" blue="0.81960784313725488" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.20392156862745098" green="0.23137254901960785" blue="0.23137254901960785" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="SN6-pt-WKY" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="FsO-Z9-kQF"/>
                             <constraint firstItem="SN6-pt-WKY" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" constant="5" id="cME-92-iZn"/>
@@ -38,6 +38,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="appLogo2.png" width="500" height="500"/>
+        <image name="applogo.png" width="1024" height="1024"/>
     </resources>
 </document>
diff --git a/Projects/App/Resources/Lottie/mapPinBlue.json b/Projects/App/Resources/Lottie/mapPinBlue.json
diff --git a/Projects/App/Resources/appLogo2.png b/Projects/App/Resources/appLogo2.png
diff --git a/Projects/Core/Sources/Extension/UIColor+.swift b/Projects/Core/Sources/Extension/UIColor+.swift
@@ -31,30 +31,3 @@ public extension UIColor {
         )
     }
 }
-
-public extension UIColor {
-    static var adaptiveWhite: UIColor {
-        return UIColor { traitCollection in
-            if traitCollection.userInterfaceStyle == .dark {
-                return UIColor(
-                    red: 20/255,
-                    green: 20/255,
-                    blue: 23/255,
-                    alpha: 1.0
-                )
-            } else {
-                return UIColor.white
-            }
-        }
-    }
-
-    static var adaptiveBlack: UIColor {
-        return UIColor { traitCollection in
-            if traitCollection.userInterfaceStyle == .dark {
-                return UIColor.white
-            } else {
-                return UIColor.black
-            }
-        }
-    }
-}
diff --git a/Projects/Core/Sources/Extension/UIView+.swift b/Projects/Core/Sources/Extension/UIView+.swift
@@ -25,7 +25,7 @@ public extension UIView {
 
     func addBorder(
         edges: UIRectEdge,
-        color: UIColor = .adaptiveBlack,
+        color: UIColor = .black,
         thickness: CGFloat = 1
     ) {
         let border = CALayer()

diff --git a/...DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/BusStopImage1.png b/...DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/BusStopImage1.png
diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "BusStopImage1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/BusStopImage2.png b/...DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/BusStopImage2.png
diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/BusStopImage2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "BusStopImage2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json b/Projects/DesignSystem/Resources/Assets.xcassets/CarrotOrange.colorset/Contents.json
@@ -11,42 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "light"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x61",
-          "green" : "0x6E",
-          "red" : "0xEF"
-        }
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0x61",
-          "green" : "0x6E",
-          "red" : "0xEF"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {