Skip to content

Commit c06ef18

Browse files
Zoe0929Zoe0929
committed
[Release] v1.0.2 version update
2 parents eba5ba6 + 38837ea commit c06ef18

32 files changed

+461
-154
lines changed

‎DDANZI_iOS/DDANZI_iOS.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@
19031903
"$(inherited)",
19041904
"@executable_path/Frameworks",
19051905
);
1906-
MARKETING_VERSION = 1.0.1;
1906+
MARKETING_VERSION = 1.0.2;
19071907
PRODUCT_BUNDLE_IDENTIFIER = "com.orangeCo.DDANZI-iOS.dev";
19081908
PRODUCT_NAME = "$(TARGET_NAME)";
19091909
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1940,7 +1940,7 @@
19401940
"$(inherited)",
19411941
"@executable_path/Frameworks",
19421942
);
1943-
MARKETING_VERSION = 1.0.1;
1943+
MARKETING_VERSION = 1.0.2;
19441944
PRODUCT_BUNDLE_IDENTIFIER = "com.orangeCo.DDANZI-iOS";
19451945
PRODUCT_NAME = "$(TARGET_NAME)";
19461946
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎DDANZI_iOS/DDANZI_iOS/Common/Extension/String+.swift‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,24 @@ extension String {
2727

2828
return koreanFormatter.string(from: date)
2929
}
30+
31+
func convertToDateFormat() -> String? {
32+
// 입력 형식에 맞는 DateFormatter 생성
33+
let inputFormatter = DateFormatter()
34+
inputFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
35+
inputFormatter.locale = Locale(identifier: "en_US_POSIX")
36+
37+
// String -> Date로 변환
38+
guard let date = inputFormatter.date(from: self) else {
39+
return nil
40+
}
41+
42+
// 원하는 출력 형식으로 DateFormatter 설정
43+
let outputFormatter = DateFormatter()
44+
outputFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 24시간 형식
45+
outputFormatter.locale = Locale(identifier: "en_US_POSIX")
46+
47+
// Date -> String으로 변환 후 반환
48+
return outputFormatter.string(from: date)
49+
}
3050
}

‎DDANZI_iOS/DDANZI_iOS/Common/Extension/UILabel+.swift‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,22 @@ extension UILabel {
3333
self.attributedText = attributedString
3434
}
3535

36-
func setUnderline(range: NSRange) {
37-
38-
guard let attributedString = self.mutableAttributedString() else { return }
39-
40-
attributedString.addAttribute(NSAttributedString.Key.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: range)
41-
self.attributedText = attributedString
42-
}
36+
func setUnderline(for rangeText: String) {
37+
guard let fullText = self.text else { return }
38+
39+
let attributedString = NSMutableAttributedString(string: fullText)
40+
41+
// 해당 구간의 NSRange 찾기
42+
if let range = fullText.range(of: rangeText) {
43+
let nsRange = NSRange(range, in: fullText)
44+
45+
// 밑줄 스타일 적용
46+
attributedString.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: nsRange)
47+
}
48+
49+
// UILabel의 attributedText에 설정
50+
self.attributedText = attributedString
51+
}
4352

4453
private func mutableAttributedString() -> NSMutableAttributedString? {
4554
guard let labelText = self.text, let labelFont = self.font else { return nil }

‎DDANZI_iOS/DDANZI_iOS/Common/Resource/Assets.xcassets/Color/ErrorRed.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x24",
9+
"green" : "0x24",
10+
"red" : "0xC9"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}

‎DDANZI_iOS/DDANZI_iOS/Common/Resource/Assets.xcassets/Color/discountRed.colorset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x54",
9+
"green" : "0x54",
10+
"red" : "0xE6"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}

‎DDANZI_iOS/DDANZI_iOS/Common/Resource/Literals/String.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ enum StringLiterals {
3232

3333
enum Link {
3434
enum Terms {
35-
static let privacy = ""
36-
static let serviceTerm = ""
35+
static let privacy = "https://www.notion.so/5a8b57e78f594988aaab08b8160c3072?pvs=4"
36+
static let serviceTerm = "https://www.notion.so/faa1517ffed44f6a88021a41407ed736?pvs=4"
37+
static let sellTerm = "https://brawny-guan-098.notion.site/6d77260d027148ceb0f806f0911c284a?pvs=4"
38+
static let purchaseTerm = "https://brawny-guan-098.notion.site/56bcbc1ed0f3454ba08fa1070fa5413d?pvs=4"
3739
}
3840
}
3941
}

‎DDANZI_iOS/DDANZI_iOS/Data/Endpoint/ItemEndpoint.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ enum ItemEndpoint {
1515
case itemCheck(body: ItemCheckRequestBody)
1616
case itemConfirmed(id: String)
1717
case registeItem(body: RegisteItemBody)
18+
case deleteItem(id: String)
1819
case detailItem(id: String)
1920
case optionItem(id: String)
2021

@@ -49,6 +50,8 @@ extension ItemEndpoint: BaseTargetType {
4950
return "/api/v1/item/product/\(id)"
5051
case .registeItem:
5152
return "/api/v1/item"
53+
case .deleteItem(let id):
54+
return "/api/v1/item/\(id)"
5255
case .detailItem(let id):
5356
return "/api/v1/item/\(id)"
5457
case .optionItem(let id):
@@ -68,6 +71,8 @@ extension ItemEndpoint: BaseTargetType {
6871
return .get
6972
case .registeItem:
7073
return .post
74+
case .deleteItem:
75+
return .delete
7176
case .detailItem:
7277
return .get
7378
case .optionItem:
@@ -87,6 +92,8 @@ extension ItemEndpoint: BaseTargetType {
8792
return .requestPlain
8893
case .registeItem(let body):
8994
return .requestJSONEncodable(body)
95+
case .deleteItem:
96+
return .requestPlain
9097
case .detailItem:
9198
return .requestPlain
9299
case .optionItem:
@@ -110,6 +117,8 @@ extension ItemEndpoint: BaseTargetType {
110117
return APIConstants.hasAccessTokenHeader
111118
case .optionItem:
112119
return APIConstants.hasAccessTokenHeader
120+
case .deleteItem(id: let id):
121+
return APIConstants.hasAccessTokenHeader
113122
}
114123
}
115124

‎DDANZI_iOS/DDANZI_iOS/Presentation/Common/NavigationBar/CustomNavigationBarView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ final class CustomNavigationBarView: UIView {
5858
$0.textColor = .black
5959
}
6060

61-
private let backButton = UIButton().then {
61+
let backButton = UIButton().then {
6262
$0.setImage(.leftBtn, for: .normal)
6363
$0.imageView?.contentMode = .scaleAspectFit
6464
}

‎DDANZI_iOS/DDANZI_iOS/Presentation/Common/ReusableView/ProductChipView.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import Then
1111

1212
final class ProductChipView: UIView {
1313
private let label = UILabel().then {
14-
$0.font = .body5R14
15-
$0.textColor = .black
14+
$0.font = .body6M12
15+
$0.textColor = .gray3
1616
}
1717

1818
init(labelText: String) {
@@ -31,9 +31,8 @@ final class ProductChipView: UIView {
3131
}
3232

3333
private func setHierarchy() {
34-
self.backgroundColor = .white
34+
self.backgroundColor = .gray1
3535
self.makeCornerRound(radius: 5)
36-
self.makeBorder(width: 1, color: .black)
3736
self.addSubview(label)
3837
}
3938

‎DDANZI_iOS/DDANZI_iOS/Presentation/Common/TabBar/DdanziTabBarController.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import UIKit
99

10-
class DdanziTabBarController: UITabBarController {
11-
private var tabs: [UIViewController] = []
10+
final class DdanziTabBarController: UITabBarController {
11+
private var tabBarViewControllers: [UIViewController] = []
1212
private let tabBarHeight: CGFloat = 100
1313

1414
private let homeViewController = HomeViewController()
@@ -35,17 +35,17 @@ class DdanziTabBarController: UITabBarController {
3535
}
3636

3737
func setTabBarItems() {
38-
tabs = [
38+
tabBarViewControllers = [
3939
UINavigationController(rootViewController: homeViewController),
4040
UINavigationController(rootViewController: mypageViewController)
4141
]
4242

4343
TabBarItem.allCases.forEach {
44-
tabs[$0.rawValue].tabBarItem = $0.asTabBarItem()
45-
tabs[$0.rawValue].tabBarItem.tag = $0.rawValue
44+
tabBarViewControllers[$0.rawValue].tabBarItem = $0.asTabBarItem()
45+
tabBarViewControllers[$0.rawValue].tabBarItem.tag = $0.rawValue
4646
}
4747

48-
setViewControllers(tabs, animated: true)
48+
setViewControllers(tabBarViewControllers, animated: true)
4949
}
5050

5151
func setTabBarAppearance() {

0 commit comments

Comments
 (0)