Skip to content

Commit 282f84b

Browse files
committed
[#250] OptionalIntOptionView
1 parent 3331d8f commit 282f84b

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

Diff for: YDS-Storybook/SwiftUI/Storybook/OptionView/Base/Option.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import SwiftUI
1010
enum Option: View {
1111
case bool(description: String?, isOn: Binding<Bool>)
1212
case `enum`(description: String?, cases: [Any], selectedIndex: Binding<Int>)
13-
case int(description: String?, value: Binding<Int>)
13+
case optionalInt(description: String?, value: Binding<Int?>)
1414
case optionalString(description: String?, text: Binding<String?>)
1515
case optionalIcon(description: String?, icons: [SwiftUIIcon], selectedIcon: Binding<SwiftUIIcon?>)
1616
case optionalImage(description: String?, images: [SwiftUIImage], selectedImage: Binding<SwiftUIImage?>)
@@ -22,8 +22,8 @@ enum Option: View {
2222
BoolOptionView(description: description, isOn: isOn)
2323
case .enum(let description, let cases, let selectedIndex):
2424
EnumOptionView(description: description, cases: cases, selectedIndex: selectedIndex)
25-
case .int(let description, let value):
26-
IntOptionView(description: description, value: value)
25+
case .optionalInt(let description, let value):
26+
OptionalIntOptionView(description: description, value: value)
2727
case .optionalString(let description, let text):
2828
OptionalStringOptionView(description: description, text: text)
2929
case .optionalIcon(let description, let icons, let selectedIcon):

Diff for: YDS-Storybook/SwiftUI/Storybook/OptionView/IntOptionView.swift renamed to YDS-Storybook/SwiftUI/Storybook/OptionView/OptionalIntOptionView.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//
2-
// IntOptionView.swift
2+
// OptionalIntOptionView.swift
33
// YDS-Storybook
44
//
5-
// Created by 정지혁 on 2023/08/19.
5+
// Created by 박지윤 on 1/16/24.
66
//
77

88
import SwiftUI
99
import YDS_SwiftUI
1010

11-
struct IntOptionView: View {
11+
struct OptionalIntOptionView: View {
1212
private enum Dimension {
1313
enum Spacing {
1414
static let vstack: CGFloat = 8
@@ -24,11 +24,11 @@ struct IntOptionView: View {
2424
}
2525
}
2626

27-
@Binding private var value: Int
27+
@Binding private var value: Int?
2828

2929
private let description: String?
3030

31-
init(description: String?, value: Binding<Int>) {
31+
init(description: String?, value: Binding<Int?>) {
3232
self.description = description
3333
self._value = value
3434
}
@@ -40,7 +40,7 @@ struct IntOptionView: View {
4040
Text(description)
4141
.font(YDSFont.subtitle2)
4242
}
43-
Text("Int")
43+
Text("Optional<Int>")
4444
.font(YDSFont.body2)
4545
}
4646

@@ -56,8 +56,8 @@ struct IntOptionView: View {
5656
}
5757
}
5858

59-
struct IntOptionView_Previews: PreviewProvider {
59+
struct OptionalIntOptionView_Previews: PreviewProvider {
6060
static var previews: some View {
61-
IntOptionView(description: "numberOfLines", value: .constant(1))
61+
OptionalIntOptionView(description: "lineLimit", value: .constant(1))
6262
}
6363
}

Diff for: YDS-Storybook/SwiftUI/Storybook/StorybookPageView.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct StorybookPageView_Previews: PreviewProvider {
8686

8787
@State var text: String? = "BoxButton"
8888
@State var isDisabled = false
89-
@State var numberOfLines = 1
89+
@State var lineLimit: Int? = 1
9090
@State var selectedBoxButtonType = 0
9191
@State var icon: SwiftUIIcon?
9292

@@ -98,14 +98,14 @@ struct StorybookPageView_Previews: PreviewProvider {
9898
icon
9999
}
100100
Text(text ?? "")
101-
.lineLimit(numberOfLines)
101+
.lineLimit(lineLimit)
102102
}
103103
}
104104
.disabled(isDisabled)
105105
},
106106
options: [
107107
Option.bool(description: "isDisabled", isOn: $isDisabled),
108-
Option.int(description: "numberOfLines", value: $numberOfLines),
108+
Option.optionalInt(description: "lineLimit", value: $lineLimit),
109109
Option.enum(
110110
description: "buttonType",
111111
cases: BoxButtonType.allCases,

Diff for: YDS.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
954C48392B036D5D002F9FAC /* BottomBarControllerPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954C48382B036D5D002F9FAC /* BottomBarControllerPageView.swift */; };
130130
956C40172A949B640098BB8F /* SwiftUIYDSTypoArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 956C40162A949B640098BB8F /* SwiftUIYDSTypoArray.swift */; };
131131
956C40192A949BAE0098BB8F /* TypoPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 956C40182A949BAE0098BB8F /* TypoPageView.swift */; };
132+
95CC861E2B55A81F0088E44E /* OptionalIntOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CC861D2B55A81F0088E44E /* OptionalIntOptionView.swift */; };
132133
95E535C72AB482E200FA2492 /* LabelPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95E535C62AB482E200FA2492 /* LabelPageView.swift */; };
133134
AF1E6F002AB88DEB0071C963 /* YDSToast.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1E6EFF2AB88DEB0071C963 /* YDSToast.swift */; };
134135
AF23ED812AEE9BF600F3D5E2 /* YDSSimpleTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF23ED802AEE9BF600F3D5E2 /* YDSSimpleTextField.swift */; };
@@ -148,7 +149,6 @@
148149
B9E4E8C82A90BDB90076473C /* StorybookPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8C72A90BDB90076473C /* StorybookPageView.swift */; };
149150
B9E4E8CE2A90BF500076473C /* BoolOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8CD2A90BF500076473C /* BoolOptionView.swift */; };
150151
B9E4E8D02A90BF7E0076473C /* EnumOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8CF2A90BF7E0076473C /* EnumOptionView.swift */; };
151-
B9E4E8D22A90BF870076473C /* IntOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8D12A90BF870076473C /* IntOptionView.swift */; };
152152
B9E4E8D42A90BFA10076473C /* OptionalStringOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8D32A90BFA10076473C /* OptionalStringOptionView.swift */; };
153153
B9E4E8D62A90BFB60076473C /* OptionalIconOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8D52A90BFB60076473C /* OptionalIconOptionView.swift */; };
154154
B9E4E8E22A93B1AF0076473C /* Option.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9E4E8E12A93B1AF0076473C /* Option.swift */; };
@@ -365,6 +365,7 @@
365365
954C48382B036D5D002F9FAC /* BottomBarControllerPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomBarControllerPageView.swift; sourceTree = "<group>"; };
366366
956C40162A949B640098BB8F /* SwiftUIYDSTypoArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIYDSTypoArray.swift; sourceTree = "<group>"; };
367367
956C40182A949BAE0098BB8F /* TypoPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypoPageView.swift; sourceTree = "<group>"; };
368+
95CC861D2B55A81F0088E44E /* OptionalIntOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionalIntOptionView.swift; sourceTree = "<group>"; };
368369
95E535C62AB482E200FA2492 /* LabelPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelPageView.swift; sourceTree = "<group>"; };
369370
AF1E6EFF2AB88DEB0071C963 /* YDSToast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YDSToast.swift; sourceTree = "<group>"; };
370371
AF23ED802AEE9BF600F3D5E2 /* YDSSimpleTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YDSSimpleTextField.swift; sourceTree = "<group>"; };
@@ -384,7 +385,6 @@
384385
B9E4E8C72A90BDB90076473C /* StorybookPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorybookPageView.swift; sourceTree = "<group>"; };
385386
B9E4E8CD2A90BF500076473C /* BoolOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoolOptionView.swift; sourceTree = "<group>"; };
386387
B9E4E8CF2A90BF7E0076473C /* EnumOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumOptionView.swift; sourceTree = "<group>"; };
387-
B9E4E8D12A90BF870076473C /* IntOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntOptionView.swift; sourceTree = "<group>"; };
388388
B9E4E8D32A90BFA10076473C /* OptionalStringOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionalStringOptionView.swift; sourceTree = "<group>"; };
389389
B9E4E8D52A90BFB60076473C /* OptionalIconOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionalIconOptionView.swift; sourceTree = "<group>"; };
390390
B9E4E8E12A93B1AF0076473C /* Option.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Option.swift; sourceTree = "<group>"; };
@@ -936,7 +936,7 @@
936936
B9E4E8CA2A90BF180076473C /* Base */,
937937
B9E4E8CD2A90BF500076473C /* BoolOptionView.swift */,
938938
B9E4E8CF2A90BF7E0076473C /* EnumOptionView.swift */,
939-
B9E4E8D12A90BF870076473C /* IntOptionView.swift */,
939+
95CC861D2B55A81F0088E44E /* OptionalIntOptionView.swift */,
940940
B9E4E8D32A90BFA10076473C /* OptionalStringOptionView.swift */,
941941
B9E4E8D52A90BFB60076473C /* OptionalIconOptionView.swift */,
942942
AF7528232AA5F637001174E7 /* OptionalImageOptionView.swift */,
@@ -1516,6 +1516,7 @@
15161516
533A27B926A5351E009FD90A /* PageListTableViewCell.swift in Sources */,
15171517
956C40172A949B640098BB8F /* SwiftUIYDSTypoArray.swift in Sources */,
15181518
539110B426C049BD0094FD08 /* SingleTitleTopBarPageViewController.swift in Sources */,
1519+
95CC861E2B55A81F0088E44E /* OptionalIntOptionView.swift in Sources */,
15191520
6FFDB97D2A7183F7003A9519 /* PickerControllerView.swift in Sources */,
15201521
5337939026AF0A0600BE5860 /* OptionalStringControllerView.swift in Sources */,
15211522
5337938E26AF09BF00BE5860 /* ControllerView.swift in Sources */,
@@ -1532,7 +1533,6 @@
15321533
533A27B326A52E56009FD90A /* PageListViewController.swift in Sources */,
15331534
532DBFD226EC7323008C2354 /* UITableView+Generic.swift in Sources */,
15341535
5359A5C526BED19900FCCECC /* DoubleTitleTopBarPageViewController.swift in Sources */,
1535-
B9E4E8D22A90BF870076473C /* IntOptionView.swift in Sources */,
15361536
538ACCB426EB40A60044A437 /* ColorsListTableViewController.swift in Sources */,
15371537
AF7528222AA5F0A1001174E7 /* ProfileImagePageView.swift in Sources */,
15381538
53441B0426AF287600CB6BC9 /* BoolControllerView.swift in Sources */,

0 commit comments

Comments
 (0)