add over2.8 tons toggle

weg-li · Mar 26, 2023 · 02cb230 · 02cb230
1 parent f643a7e
commit 02cb230
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 32 deletions.
diff --git a/WegliKit/Sources/DescriptionFeature/DescriptionCore.swift b/WegliKit/Sources/DescriptionFeature/DescriptionCore.swift
@@ -24,7 +24,8 @@ public struct DescriptionDomain: Reducer {
       vehicleEmpty: Bool = false,
       hazardLights: Bool = false,
       expiredTuv: Bool = false,
-      expiredEco: Bool = false
+      expiredEco: Bool = false,
+      over28Tons: Bool = false
     ) {
       self.licensePlateNumber = licensePlateNumber
       self.selectedColor = selectedColor
@@ -36,6 +37,7 @@ public struct DescriptionDomain: Reducer {
       self.hazardLights = hazardLights
       self.expiredTuv = expiredTuv
       self.expiredEco = expiredEco
+      self.over28Tons = over28Tons
     }
 
     public var carBrandSelection: CarBrandSelection.State
@@ -49,6 +51,7 @@ public struct DescriptionDomain: Reducer {
     @BindingState public var hazardLights = false
     @BindingState public var expiredTuv = false
     @BindingState public var expiredEco = false
+    @BindingState public var over28Tons = false
     @BindingState public var note = ""
 
     @BindingState public var presentChargeSelection = false
@@ -200,7 +203,8 @@ public extension DescriptionDomain.State {
       vehicleEmpty: model.vehicleEmpty ?? true,
       hazardLights: model.hazardLights ?? false,
       expiredTuv: model.expiredTuv ?? false,
-      expiredEco: model.expiredEco ?? false
+      expiredEco: model.expiredEco ?? false,
+      over28Tons: model.over28Tons ?? false
     )
   }
 }
diff --git a/WegliKit/Sources/DescriptionFeature/EditDescriptionView.swift b/WegliKit/Sources/DescriptionFeature/EditDescriptionView.swift
@@ -49,6 +49,8 @@ public struct EditDescriptionView: View {
         expiredTuvView
 
         expiredEcoView
+
+        overTwentyEightTonsView
       } header: {
         SectionHeader(text: L10n.Description.Section.Violation.copy)
       }
@@ -68,7 +70,7 @@ public struct EditDescriptionView: View {
       L10n.Description.Row.licenseplateNumber,
       text: viewStore.binding(\.$licensePlateNumber)
     )
-    .textFieldStyle(.roundedBorder)
+    .textFieldStyle(.plain)
     .disableAutocorrection(true)
     .textInputAutocapitalization(.characters)
   }
@@ -200,6 +202,13 @@ public struct EditDescriptionView: View {
       isOn: viewStore.binding(\.$expiredEco)
     )
   }
+
+  var overTwentyEightTonsView: some View {
+    ToggleButton(
+      label: "Fahrzeug über 2,8 t zulässige Gesamtmasse",
+      isOn: viewStore.binding(\.$over28Tons)
+    )
+  }
 }
 
 struct Description_Previews: PreviewProvider {

diff --git a/WegliKit/Sources/NoticeListFeature/EditNoticeView.swift b/WegliKit/Sources/NoticeListFeature/EditNoticeView.swift
@@ -91,19 +91,32 @@ struct EditNoticeView: View {
           VStack(spacing: .grid(2)) {
             licensePlateView
               .padding(.bottom)
+
             carBrandView
               .padding(.bottom)
+
             carColorView
               .padding(.bottom)
+
             chargeTypeView
               .padding(.bottom)
+
             chargeDurationView
               .padding(.bottom)
-            blockedOthersView
-            vehicleEmptyView
-            hazardLightsView
-            expiredTuvView
-            expiredEcoView
+
+            VStack {
+              blockedOthersView
+
+              vehicleEmptyView
+
+              hazardLightsView
+
+              expiredTuvView
+
+              expiredEcoView
+
+              overTwentyEightTonsView
+            }
           }
           .foregroundColor(Color(uiColor: .label))
         }
@@ -305,6 +318,13 @@ struct EditNoticeView: View {
       isOn: viewStore.binding(\.description.$expiredEco)
     )
   }
+
+  var overTwentyEightTonsView: some View {
+    ToggleButton(
+      label: "Fahrzeug über 2,8 t zulässige Gesamtmasse",
+      isOn: viewStore.binding(\.description.$over28Tons)
+    )
+  }
 }
 
 struct SwiftUIView_Previews: PreviewProvider {

diff --git a/WegliKit/Sources/NoticeListFeature/NoticeListDomain.swift b/WegliKit/Sources/NoticeListFeature/NoticeListDomain.swift
@@ -401,6 +401,7 @@ extension Notice {
       hazardLights: editState.description.hazardLights,
       expiredTuv: editState.description.expiredTuv,
       expiredEco: editState.description.expiredEco,
+      over28Tons: editState.description.over28Tons,
       photos: editState.notice.photos ?? []
     )
   }

diff --git a/WegliKit/Sources/ReportFeature/DescriptionView.swift b/WegliKit/Sources/ReportFeature/DescriptionView.swift
@@ -50,30 +50,37 @@ public struct DescriptionView: View {
 
         row(title: L10n.Description.Row.length, content: viewStore.description.time)
 
-        toggleRow(
-          label: L10n.Description.Row.didBlockOthers,
-          value: viewStore.description.blockedOthers
-        )
-
-        toggleRow(
-          label: "Das Fahrzeug war verlassen",
-          value: viewStore.description.vehicleEmpty
-        )
-
-        toggleRow(
-          label: "Das Fahrzeug hatte die Warnblinkanlage aktiviert",
-          value: viewStore.description.hazardLights
-        )
-
-        toggleRow(
-          label: "Die TÜV-Plakette war abgelaufen",
-          value: viewStore.description.expiredTuv
-        )
-
-        toggleRow(
-          label: "Die Umwelt-Plakette fehlte oder war ungültig",
-          value: viewStore.description.expiredEco
-        )
+        VStack(alignment: .leading, spacing: .grid(3)) {
+          toggleRow(
+            label: L10n.Description.Row.didBlockOthers,
+            value: viewStore.description.blockedOthers
+          )
+
+          toggleRow(
+            label: "Das Fahrzeug war verlassen",
+            value: viewStore.description.vehicleEmpty
+          )
+
+          toggleRow(
+            label: "Das Fahrzeug hatte die Warnblinkanlage aktiviert",
+            value: viewStore.description.hazardLights
+          )
+
+          toggleRow(
+            label: "Die TÜV-Plakette war abgelaufen",
+            value: viewStore.description.expiredTuv
+          )
+
+          toggleRow(
+            label: "Die Umwelt-Plakette fehlte oder war ungültig",
+            value: viewStore.description.expiredEco
+          )
+
+          toggleRow(
+            label: "Fahrzeug über 2,8 t zulässige Gesamtmasse",
+            value: viewStore.description.over28Tons
+          )
+        }
       }
       .accessibilitySortPriority(1)
       .accessibilityElement(children: .combine)

diff --git a/WegliKit/Sources/ReportFeature/ReportDomain.swift b/WegliKit/Sources/ReportFeature/ReportDomain.swift
@@ -642,6 +642,7 @@ public extension SharedModels.NoticeInput {
       hazardLights: reportState.description.hazardLights,
       expiredTuv: reportState.description.expiredTuv,
       expiredEco: reportState.description.expiredEco,
+      over28Tons: reportState.description.over28Tons,
       photos: []
     )
   }

diff --git a/WegliKit/Sources/SharedModels/Notice/NoticeInput.swift b/WegliKit/Sources/SharedModels/Notice/NoticeInput.swift
@@ -25,6 +25,7 @@ public struct NoticeInput: Codable, Equatable, Identifiable, Sendable {
   public var hazardLights = false
   public var expiredTuv = false
   public var expiredEco = false
+  public var over28Tons = false
   public var photos: [String]
 
   public init(
@@ -50,6 +51,7 @@ public struct NoticeInput: Codable, Equatable, Identifiable, Sendable {
     hazardLights: Bool = false,
     expiredTuv: Bool = false,
     expiredEco: Bool = false,
+    over28Tons: Bool = false,
     photos: [String]
   ) {
     self.token = token
@@ -74,6 +76,7 @@ public struct NoticeInput: Codable, Equatable, Identifiable, Sendable {
     self.hazardLights = hazardLights
     self.expiredTuv = expiredTuv
     self.expiredEco = expiredEco
+    self.over28Tons = over28Tons
     self.photos = photos
   }
 }