💄 (GEK): Update choices sizes and spacing to fit

leka · Nov 9, 2023 · 4c732fe · 4c732fe
1 parent 83ed836
commit 4c732fe
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+1_OneChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+1_OneChoice.swift
@@ -12,7 +12,7 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kAnswerSize: CGFloat = 300
+        private let kAnswerSize: CGFloat = 180
 
         var body: some View {
             let choice = viewModel.choices[0]

diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+2_TwoChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+2_TwoChoice.swift
@@ -12,8 +12,8 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kHorizontalSpacing: CGFloat = 150
-        private let kAnswerSize: CGFloat = 300
+        private let kHorizontalSpacing: CGFloat = 60
+        private let kAnswerSize: CGFloat = 180
 
         var body: some View {
             HStack(spacing: kHorizontalSpacing) {

diff --git a/...NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+3_ThreeChoice.swift b/...NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+3_ThreeChoice.swift
@@ -12,17 +12,25 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kHorizontalSpacing: CGFloat = 30
-        private let kAnswerSize: CGFloat = 280
+        private let kHorizontalSpacing: CGFloat = 60
+        private let kVerticalSpacing: CGFloat = 40
+        private let kAnswerSize: CGFloat = 180
 
         var body: some View {
-            HStack(spacing: kHorizontalSpacing) {
-                ForEach(viewModel.choices[0...2]) { choice in
-                    SelectionChoiceView(choice: choice, size: kAnswerSize, isTappable: isTappable)
-                        .onTapGesture {
-                            viewModel.onChoiceTapped(choice: choice)
-                        }
+            VStack(spacing: kVerticalSpacing) {
+                HStack(spacing: kHorizontalSpacing) {
+                    ForEach(viewModel.choices[0...1]) { choice in
+                        SelectionChoiceView(choice: choice, size: kAnswerSize, isTappable: isTappable)
+                            .onTapGesture {
+                                viewModel.onChoiceTapped(choice: choice)
+                            }
+                    }
                 }
+
+                SelectionChoiceView(choice: viewModel.choices[2], size: kAnswerSize, isTappable: isTappable)
+                    .onTapGesture {
+                        viewModel.onChoiceTapped(choice: viewModel.choices[2])
+                    }
             }
         }
 

diff --git a/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+4_FourChoice.swift b/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+4_FourChoice.swift
@@ -12,9 +12,9 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kHorizontalSpacing: CGFloat = 200
+        private let kHorizontalSpacing: CGFloat = 60
         private let kVerticalSpacing: CGFloat = 40
-        private let kAnswerSize: CGFloat = 240
+        private let kAnswerSize: CGFloat = 180
 
         var body: some View {
             VStack(spacing: kVerticalSpacing) {

diff --git a/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+5_FiveChoice.swift b/..._NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+5_FiveChoice.swift
@@ -12,9 +12,9 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kHorizontalSpacing: CGFloat = 60
+        private let kHorizontalSpacing: CGFloat = 40
         private let kVerticalSpacing: CGFloat = 40
-        private let kAnswerSize: CGFloat = 240
+        private let kAnswerSize: CGFloat = 140
 
         var body: some View {
             VStack(spacing: kVerticalSpacing) {

diff --git a/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+6_SixChoice.swift b/.../_NewSystem/Views/ObserveThenTouchToSelect/ObserveThenTouchToSelectView+6_SixChoice.swift
@@ -12,9 +12,9 @@ extension ObserveThenTouchToSelectView {
         @ObservedObject var viewModel: SelectionViewViewModel
         let isTappable: Bool
 
-        private let kHorizontalSpacing: CGFloat = 60
+        private let kHorizontalSpacing: CGFloat = 40
         private let kVerticalSpacing: CGFloat = 40
-        private let kAnswerSize: CGFloat = 240
+        private let kAnswerSize: CGFloat = 140
 
         var body: some View {
             VStack(spacing: kVerticalSpacing) {