Skip to content

Commit 987e6c3

Browse files
committed
[BOOK-119] fix: reflect reviews
1 parent fe48210 commit 987e6c3

5 files changed

Lines changed: 41 additions & 38 deletions

File tree

src/Projects/BKDesign/Sources/Components/BKBaseTextField.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private extension BKBaseTextField {
9898
backgroundColor = .bkBackgroundColor(.secondary)
9999
font = BKTextStyle.body2(weight: .medium).uiFont
100100
textColor = .bkContentColor(.primary)
101-
textAlignment = .justified
101+
textAlignment = .natural
102102
applyPlaceholderStyle()
103103
}
104104

src/Projects/BKDesign/Sources/Components/BKCheckBox.swift

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import UIKit
66
public final class BKCheckBox: UIControl {
77
public enum CheckboxType {
88
case round
9+
case roundStroke
910
case rectangle
11+
case rectangleStroke
1012
}
1113

1214
private let imageView = UIImageView()
@@ -52,25 +54,33 @@ public final class BKCheckBox: UIControl {
5254
}
5355
imageView.image = type.defaultImage
5456
addTarget(self, action: #selector(toggleCheck), for: .touchUpInside)
55-
}
56-
57-
@objc private func toggleCheck() {
58-
isChecked.toggle()
59-
sendActions(for: .valueChanged)
57+
58+
isAccessibilityElement = true
59+
accessibilityTraits = .button
60+
updateAccessibilityValue()
6061
}
6162

6263
private func updateImage() {
6364
if isEnabled {
6465
imageView.image = isChecked
6566
? type.checkedImage
66-
: type.unCheckedImage
67+
: type.defaultImage
6768
} else {
6869
imageView.image = type.disabledImage
6970
}
7071
}
7172
}
7273

7374
private extension BKCheckBox {
75+
@objc private func toggleCheck() {
76+
isChecked.toggle()
77+
sendActions(for: .valueChanged)
78+
}
79+
80+
func updateAccessibilityValue() {
81+
accessibilityValue = isChecked ? "선택됨" : "선택 안됨"
82+
}
83+
7484
enum LayoutConstants {
7585
static let size: CGFloat = 24
7686
}
@@ -79,9 +89,9 @@ private extension BKCheckBox {
7989
extension BKCheckBox.CheckboxType {
8090
var defaultImage: UIImage {
8191
switch self {
82-
case .round:
92+
case .round, .roundStroke:
8393
return BKImage.Checkbox.defaultRound
84-
case .rectangle:
94+
case .rectangle, .rectangleStroke:
8595
return BKImage.Checkbox.defaultRectangle
8696
}
8797
}
@@ -90,25 +100,20 @@ extension BKCheckBox.CheckboxType {
90100
switch self {
91101
case .round:
92102
return BKImage.Checkbox.filled
93-
case .rectangle:
94-
return BKImage.Checkbox.filledRectangle
95-
}
96-
}
97-
98-
var unCheckedImage: UIImage {
99-
switch self {
100-
case .round:
103+
case .roundStroke:
101104
return BKImage.Checkbox.strokeRound
102105
case .rectangle:
106+
return BKImage.Checkbox.filledRectangle
107+
case .rectangleStroke:
103108
return BKImage.Checkbox.strokeRectangle
104109
}
105110
}
106111

107112
var disabledImage: UIImage {
108113
switch self {
109-
case .round:
114+
case .round, .roundStroke:
110115
return BKImage.Checkbox.disabledRound
111-
case .rectangle:
116+
case .rectangle, .rectangleStroke:
112117
return BKImage.Checkbox.disabledRectangle
113118
}
114119
}

src/Projects/BKDesign/Sources/Components/BKLabel.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public final class BKLabel: UILabel {
1111
case error
1212
}
1313

14-
private let type: LabelType? = nil
1514
private var labelText: String
1615
private var fontStyle: BKTextStyle
1716
private var labelColor: UIColor
@@ -45,7 +44,7 @@ public final class BKLabel: UILabel {
4544
self.labelText = text
4645
self.fontStyle = fontStyle
4746
self.labelColor = color
48-
self.alignment = .justified
47+
self.alignment = alignment
4948
super.init(frame: frame)
5049
apply()
5150
}

src/Projects/BKDesign/Sources/Components/BKSearchTextField.swift

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,15 @@ public final class BKSearchTextField: BKBaseTextField {
1919
}()
2020

2121
override public func textRect(forBounds bounds: CGRect) -> CGRect {
22-
return bounds.inset(
23-
by: UIEdgeInsets(
24-
top: BKInset.inset2,
25-
left: BKInset.inset3,
26-
bottom: BKInset.inset2,
27-
right: BKInset.inset4
28-
)
29-
)
22+
return bounds.inset(by: textInsets())
3023
}
3124

3225
override public func editingRect(forBounds bounds: CGRect) -> CGRect {
33-
return bounds.inset(
34-
by: UIEdgeInsets(
35-
top: BKInset.inset2,
36-
left: BKInset.inset3,
37-
bottom: BKInset.inset2,
38-
right: BKInset.inset4
39-
)
40-
)
26+
return bounds.inset(by: textInsets())
27+
}
28+
29+
public override func placeholderRect(forBounds bounds: CGRect) -> CGRect {
30+
return bounds.inset(by: textInsets())
4131
}
4232

4333
public override init(
@@ -79,4 +69,13 @@ private extension BKSearchTextField {
7969
$0.centerY.equalToSuperview()
8070
}
8171
}
72+
73+
func textInsets() -> UIEdgeInsets {
74+
return UIEdgeInsets(
75+
top: BKInset.inset2,
76+
left: BKInset.inset3,
77+
bottom: BKInset.inset2,
78+
right: BKInset.inset4
79+
)
80+
}
8281
}

src/Projects/BKPresentation/Sources/Common/Component/BaseViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class BaseViewController<T: BaseView>: UIViewController {
2020
// MARK: - Life Cycle
2121
override func loadView() {
2222
if contentView.backgroundColor == nil {
23-
contentView.backgroundColor = .white
23+
contentView.backgroundColor = .bkBaseColor(.primary)
2424
}
2525
view = contentView
2626
}

0 commit comments

Comments
 (0)