Skip to content

Commit 4762d69

Browse files
oscbysprooscbyspro
committed
Cleanup.
1 parent f9bdec4 commit 4762d69

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreen.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ struct NumberScreen: View {
4040

4141
var controls: some View {
4242
Scroller {
43-
NumberScreenOptionality(context.optional)
43+
NumberScreenOptionalToggle(context.optional)
4444

4545
Segments(context.format.xwrapped)
4646

47-
NumberScreenLocalization(context)
47+
NumberScreenOptionsWheel(context)
4848

4949
NumberScreenIntegerInterval("Bounds (9s)",
5050
interval: context.bounds.interval, in: context.boundsLimits)

Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenInterval.swift renamed to Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenIntegerInterval.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct NumberScreenIntegerInterval: View {
4949

5050
var body: some View {
5151
VStack(alignment: .leading) {
52-
Text(description).font(.headline.bold())
52+
Text(description).font(.subheadline.weight(.light))
5353
Sliders($interval.wrapped.values, in: limits)
5454
}
5555
}

Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenOptionality.swift renamed to Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenOptionalToggle.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import SwiftUI
1313
// MARK: Declaration
1414
//*============================================================================*
1515

16-
struct NumberScreenOptionality: View {
16+
struct NumberScreenOptionalToggle: View {
1717
typealias Context = NumberScreenContext
1818

1919
//=------------------------------------------------------------------------=

Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenLocalization.swift renamed to Examples/DiffableTextAppXUIKit/App/Screens.Number/NumberScreenOptionsWheel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import SwiftUI
1313
// MARK: Declaration
1414
//*============================================================================*
1515

16-
struct NumberScreenLocalization: View {
16+
struct NumberScreenOptionsWheel: View {
1717
typealias Context = NumberScreenContext
1818
typealias FormatID = Context.FormatID
1919

‎Examples/DiffableTextAppXUIKit/DiffableTextAppXUIKit.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
55B38EE72827CA4C005159F4 /* NumberScreenContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EE62827CA4C005159F4 /* NumberScreenContext.swift */; };
2525
55B38EE92827CD46005159F4 /* NumberScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EE82827CD46005159F4 /* NumberScreen.swift */; };
2626
55B38EEF2827D51D005159F4 /* NumberScreenExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EEE2827D51D005159F4 /* NumberScreenExample.swift */; };
27-
55B38EF52827FAE6005159F4 /* NumberScreenInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF42827FAE6005159F4 /* NumberScreenInterval.swift */; };
28-
55B38EF72827FBB9005159F4 /* NumberScreenLocalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF62827FBB9005159F4 /* NumberScreenLocalization.swift */; };
29-
55B38EF92827FD81005159F4 /* NumberScreenOptionality.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF82827FD81005159F4 /* NumberScreenOptionality.swift */; };
27+
55B38EF52827FAE6005159F4 /* NumberScreenIntegerInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF42827FAE6005159F4 /* NumberScreenIntegerInterval.swift */; };
28+
55B38EF72827FBB9005159F4 /* NumberScreenOptionsWheel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF62827FBB9005159F4 /* NumberScreenOptionsWheel.swift */; };
29+
55B38EF92827FD81005159F4 /* NumberScreenOptionalToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EF82827FD81005159F4 /* NumberScreenOptionalToggle.swift */; };
3030
55B38EFB28280F0F005159F4 /* Toggler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B38EFA28280F0F005159F4 /* Toggler.swift */; };
3131
55C9EC4D27F9996A00DA6CEB /* Sliders in Frameworks */ = {isa = PBXBuildFile; productRef = 55C9EC4C27F9996A00DA6CEB /* Sliders */; };
3232
55DDC62C27A8D81D00B2AB4A /* Example.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55DDC62B27A8D81D00B2AB4A /* Example.swift */; };
@@ -58,9 +58,9 @@
5858
55B38EE62827CA4C005159F4 /* NumberScreenContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenContext.swift; sourceTree = "<group>"; };
5959
55B38EE82827CD46005159F4 /* NumberScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreen.swift; sourceTree = "<group>"; };
6060
55B38EEE2827D51D005159F4 /* NumberScreenExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenExample.swift; sourceTree = "<group>"; };
61-
55B38EF42827FAE6005159F4 /* NumberScreenInterval.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenInterval.swift; sourceTree = "<group>"; };
62-
55B38EF62827FBB9005159F4 /* NumberScreenLocalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenLocalization.swift; sourceTree = "<group>"; };
63-
55B38EF82827FD81005159F4 /* NumberScreenOptionality.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenOptionality.swift; sourceTree = "<group>"; };
61+
55B38EF42827FAE6005159F4 /* NumberScreenIntegerInterval.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenIntegerInterval.swift; sourceTree = "<group>"; };
62+
55B38EF62827FBB9005159F4 /* NumberScreenOptionsWheel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenOptionsWheel.swift; sourceTree = "<group>"; };
63+
55B38EF82827FD81005159F4 /* NumberScreenOptionalToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberScreenOptionalToggle.swift; sourceTree = "<group>"; };
6464
55B38EFA28280F0F005159F4 /* Toggler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toggler.swift; sourceTree = "<group>"; };
6565
55DDC62B27A8D81D00B2AB4A /* Example.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Example.swift; sourceTree = "<group>"; };
6666
55F2783627AD7C1C001400D7 /* PatternScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PatternScreen.swift; sourceTree = "<group>"; };
@@ -188,10 +188,10 @@
188188
children = (
189189
55B38EE62827CA4C005159F4 /* NumberScreenContext.swift */,
190190
55B38EE82827CD46005159F4 /* NumberScreen.swift */,
191-
55B38EF42827FAE6005159F4 /* NumberScreenInterval.swift */,
191+
55B38EF42827FAE6005159F4 /* NumberScreenIntegerInterval.swift */,
192192
55B38EEE2827D51D005159F4 /* NumberScreenExample.swift */,
193-
55B38EF62827FBB9005159F4 /* NumberScreenLocalization.swift */,
194-
55B38EF82827FD81005159F4 /* NumberScreenOptionality.swift */,
193+
55B38EF62827FBB9005159F4 /* NumberScreenOptionsWheel.swift */,
194+
55B38EF82827FD81005159F4 /* NumberScreenOptionalToggle.swift */,
195195
);
196196
path = Screens.Number;
197197
sourceTree = "<group>";
@@ -296,10 +296,10 @@
296296
557DAF1D27BA415500D9F0E5 /* PatternScreenExamples.swift in Sources */,
297297
55AA28CE27A7F472003778FE /* Tabs.swift in Sources */,
298298
55DDC62C27A8D81D00B2AB4A /* Example.swift in Sources */,
299-
55B38EF72827FBB9005159F4 /* NumberScreenLocalization.swift in Sources */,
299+
55B38EF72827FBB9005159F4 /* NumberScreenOptionsWheel.swift in Sources */,
300300
55B38EE72827CA4C005159F4 /* NumberScreenContext.swift in Sources */,
301301
557DAF2327BA4AE600D9F0E5 /* PatternScreenActions.swift in Sources */,
302-
55B38EF52827FAE6005159F4 /* NumberScreenInterval.swift in Sources */,
302+
55B38EF52827FAE6005159F4 /* NumberScreenIntegerInterval.swift in Sources */,
303303
55FD23CB27BA17C7008F65E1 /* PatternScreenExample.swift in Sources */,
304304
55F2783927AD7C1C001400D7 /* PatternScreen.swift in Sources */,
305305
557DAF2127BA493200D9F0E5 /* Action.swift in Sources */,
@@ -314,7 +314,7 @@
314314
55B38EE92827CD46005159F4 /* NumberScreen.swift in Sources */,
315315
5527C21327AA6C6A0098546E /* Interval.swift in Sources */,
316316
5507BD1627AD66A800F5292D /* Wheel.swift in Sources */,
317-
55B38EF92827FD81005159F4 /* NumberScreenOptionality.swift in Sources */,
317+
55B38EF92827FD81005159F4 /* NumberScreenOptionalToggle.swift in Sources */,
318318
);
319319
runOnlyForDeploymentPostprocessing = 0;
320320
};

‎Sources/DiffableTextViewsXUIKit/Models/Downstream.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,20 @@ extension Downstream {
127127

128128
@inlinable @inline(__always)
129129
func setDisableAutocorrection(_ environment: EnvironmentValues) {
130-
let disable = environment.diffableTextViews_disableAutocorrection ?? false
131-
self.view.autocorrectionType = disable ? .no : .default
130+
let disable = environment.diffableTextViews_disableAutocorrection
131+
self.view.autocorrectionType = (disable ?? false) ? .no : .default
132132
}
133133

134134
@inlinable @inline(__always)
135135
func setFont(_ environment: EnvironmentValues) {
136-
let font = environment.diffableTextViews_font ?? .body.monospaced()
137-
self.view.font = UIFont(font)
136+
let font = environment.diffableTextViews_font
137+
self.view.font = UIFont(font ?? .body.monospaced())
138138
}
139139

140140
@inlinable @inline(__always)
141141
func setForegroundColor(_ environment: EnvironmentValues) {
142-
let color = environment.diffableTextViews_foregroundColor ?? .primary
143-
self.view.textColor = UIColor(color)
142+
let color = environment.diffableTextViews_foregroundColor
143+
self.view.textColor = UIColor(color ?? .primary)
144144
}
145145

146146
@inlinable @inline(__always)
@@ -178,8 +178,8 @@ extension Downstream {
178178

179179
@inlinable @inline(__always)
180180
func setTint(_ environment: EnvironmentValues) {
181-
let color = environment.diffableTextViews_tint ?? .accentColor
182-
self.view.tintColor = UIColor(color)
181+
let color = environment.diffableTextViews_tint
182+
self.view.tintColor = UIColor(color ?? .accentColor)
183183
}
184184
}
185185

0 commit comments

Comments
 (0)