Cleanup.

Author: oscbyspro

Assets/DiffableTextAppXUIKitXNumber.png

@@ -29,9 +29,9 @@ struct NumberScreen: View {
     var body: some View {
         Screen {
             Scroller {
-                Segments(context.format.xwrapped)
+                Segments(context.optionality.xwrapped)
 
-                NumberScreenOptionalToggle(context.optional)
+                Segments(context.format.xwrapped)
 
                 NumberScreenOptionsWheel(context)
 

Assets/DiffableTextAppXUIKitXPattern.png

@@ -20,8 +20,8 @@ final class NumberScreenContext: ObservableObject {
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    let decimals = ObservableTwinValues(Decimal(string: "1234567.89")!)
-    let optional = Observable(false)
+    let decimals = ObservableTwinValues(Decimal(string: "1234567.89")!)    
+    let optionality = Observable(OptionalityID.standard)
 
     let format = Observable(FormatID.currency)
     let locale = Observable(Locale(identifier: "en_US"))
@@ -40,5 +40,11 @@ final class NumberScreenContext: ObservableObject {
     // MARK: Declaration
     //*========================================================================*
 
-    enum FormatID: String, CaseIterable { case number, currency, percent }
+    enum FormatID: String, CaseIterable {
+        case number, currency, percent
+    }
+    
+    enum OptionalityID: String, CaseIterable {
+        case standard, optional
+    }
 }

…pXUIKit/App/Observables/Observable.swift …/App/Models.Observables/Observable.swiftExamples/DiffableTextAppXUIKit/App/Observables/Observable.swift renamed to Examples/DiffableTextAppXUIKit/App/Models.Observables/Observable.swift Examples/DiffableTextAppXUIKit/App/Observables/Observable.swift renamed to Examples/DiffableTextAppXUIKit/App/Models.Observables/Observable.swift

@@ -18,42 +18,43 @@ import DiffableTextViews
 struct NumberScreenExample: View {
     typealias Context = NumberScreenContext
     typealias FormatID = Context.FormatID
+    typealias OptionalityID = Context.OptionalityID
 
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=
 
     let context: Context
 
-    @ObservedObject var optional: Observable<Bool>
-    @ObservedObject var format: Observable<FormatID>
     @ObservedObject var locale: Observable<Locale>
     @ObservedObject var currency: Observable<String>
+    @ObservedObject var format: Observable<FormatID>
+    @ObservedObject var optionality: Observable<OptionalityID>
 
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable init(  _ context: Context) {
-        self.context  = context
-        self.optional = context.optional
-        self.format   = context.format
-        self.locale   = context.locale
+    @inlinable init( _ context: Context) {
+        self.context = context
+        self.locale = context.locale
         self.currency = context.currency
+        self.format = context.format
+        self.optionality = context.optionality
     }
 
     //=------------------------------------------------------------------------=
     // MARK: Body
     //=------------------------------------------------------------------------=
 
     var body: some View {
-        switch (optional.wrapped, format.wrapped) {
-        case (false,   .number): decimalStandardNumberView
-        case (false, .currency): decimalStandardCurrencyView
-        case (false,  .percent): decimalStandardPercentView
-        case (true,    .number): decimalOptionalNumberView
-        case (true,  .currency): decimalOptionalCurrencyView
-        case (true,   .percent): decimalOptionalPercentView
+        switch (optionality.wrapped, format.wrapped) {
+        case (.standard,    .number): decimalStandardNumberView
+        case (.standard,  .currency): decimalStandardCurrencyView
+        case (.standard,   .percent): decimalStandardPercentView
+        case (.optional,   .number): decimalOptionalNumberView
+        case (.optional, .currency): decimalOptionalCurrencyView
+        case (.optional,  .percent): decimalOptionalPercentView
         }
     }
 

…/ObservableIntegerIntervalAsBounds.swift …/ObservableIntegerIntervalAsBounds.swiftExamples/DiffableTextAppXUIKit/App/Observables/ObservableIntegerIntervalAsBounds.swift renamed to Examples/DiffableTextAppXUIKit/App/Models.Observables/ObservableIntegerIntervalAsBounds.swift Examples/DiffableTextAppXUIKit/App/Observables/ObservableIntegerIntervalAsBounds.swift renamed to Examples/DiffableTextAppXUIKit/App/Models.Observables/ObservableIntegerIntervalAsBounds.swift

@@ -30,9 +30,9 @@ struct PatternScreen: View {
     var body: some View {
         Screen {
             Scroller {
-                Segments(context.kind.xwrapped)
+                Segments(context.pattern.xwrapped)
 
-                PatternScreenVisibilityToggle(visible: context.visible)
+                Segments(context.visibility.xwrapped)                
 
                 PatternScreenActionsStack(context)