Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert/#UI수정 UI수정작업 #274

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Projects/App/Resources/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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>
1 change: 0 additions & 1 deletion Projects/App/Resources/Lottie/mapPinBlue.json

This file was deleted.

Binary file removed Projects/App/Resources/appLogo2.png
Binary file not shown.
27 changes: 0 additions & 27 deletions Projects/Core/Sources/Extension/UIColor+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
2 changes: 1 addition & 1 deletion Projects/Core/Sources/Extension/UIView+.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public extension UIView {

func addBorder(
edges: UIRectEdge,
color: UIColor = .adaptiveBlack,
color: UIColor = .black,
thickness: CGFloat = 1
) {
let border = CALayer()
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand Down
Loading
Loading