feat: show verification record in CriteriaView (#7)

kwsong0113 · web-flow · commit 3162ac6d09d8 · 2023-08-08T04:12:39.000+09:00
* design: edit BottomSheet background

* design: bold text in CTAButton

* feat: show verification record in CriteriaView
diff --git a/Podfile b/Podfile
@@ -11,5 +11,6 @@ target 'TuringMachine' do
   pod 'InjectHotReload'
   pod 'Alamofire'
   pod 'BottomSheetSwiftUI'
+  pod 'WrappingHStack'
   
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -4,13 +4,15 @@ PODS:
   - InjectHotReload (1.2.2)
   - SwiftFormat/CLI (0.51.13)
   - SwiftLint (0.52.4)
+  - WrappingHStack (2.2.10)
 
 DEPENDENCIES:
   - Alamofire
   - BottomSheetSwiftUI
   - InjectHotReload
   - SwiftFormat/CLI (~> 0.49)
   - SwiftLint
+  - WrappingHStack
 
 SPEC REPOS:
   trunk:
@@ -19,14 +21,16 @@ SPEC REPOS:
     - InjectHotReload
     - SwiftFormat
     - SwiftLint
+    - WrappingHStack
 
 SPEC CHECKSUMS:
   Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
   BottomSheetSwiftUI: 08b5ada340a164b7ef49cf04b6733a0bd3f02957
   InjectHotReload: e524b7c46ec063d84e407e65df5fe251cde19b32
   SwiftFormat: f4c21fdf8aacdd2db6ffe110f939e0548c9a7de3
   SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3
+  WrappingHStack: f784737f5707f8fea91b687074530dbefd2dbf05
 
-PODFILE CHECKSUM: 1bf35b7564d090a5158e258670974a093d44d577
+PODFILE CHECKSUM: 2af91d01f9f1dd837544e47b464a3c7c9bb9ae54
 
 COCOAPODS: 1.12.1
diff --git a/TuringMachine.xcodeproj/project.pbxproj b/TuringMachine.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		CA3ED7E22A81732A0049FAD9 /* NumberBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA3ED7E12A81732A0049FAD9 /* NumberBadge.swift */; };
 		CA5396912A800A670047BCDB /* RemoteImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5396902A800A670047BCDB /* RemoteImage.swift */; };
 		CA5396932A800A890047BCDB /* ImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5396922A800A890047BCDB /* ImageCache.swift */; };
 		CA5396952A8017E90047BCDB /* Int+Alphabet.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5396942A8017E90047BCDB /* Int+Alphabet.swift */; };
@@ -53,6 +54,7 @@
 		04CB4784166E4B9C3DCC71E4 /* Pods-TuringMachine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TuringMachine.debug.xcconfig"; path = "Target Support Files/Pods-TuringMachine/Pods-TuringMachine.debug.xcconfig"; sourceTree = "<group>"; };
 		9FB265AE9BDD7CEC2CC2F7E8 /* Pods-TuringMachine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TuringMachine.release.xcconfig"; path = "Target Support Files/Pods-TuringMachine/Pods-TuringMachine.release.xcconfig"; sourceTree = "<group>"; };
 		AB96405E94F89CE41C438FFB /* Pods_TuringMachine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TuringMachine.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		CA3ED7E12A81732A0049FAD9 /* NumberBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberBadge.swift; sourceTree = "<group>"; };
 		CA5396902A800A670047BCDB /* RemoteImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImage.swift; sourceTree = "<group>"; };
 		CA5396922A800A890047BCDB /* ImageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCache.swift; sourceTree = "<group>"; };
 		CA5396942A8017E90047BCDB /* Int+Alphabet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Int+Alphabet.swift"; sourceTree = "<group>"; };
@@ -249,6 +251,7 @@
 				CAF59A732A7B8E4900813B9C /* CTAButton.swift */,
 				CAF59AA82A7EC13600813B9C /* ThreeDigitPicker.swift */,
 				CA5396902A800A670047BCDB /* RemoteImage.swift */,
+				CA3ED7E12A81732A0049FAD9 /* NumberBadge.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -436,6 +439,7 @@
 				CAF59AA32A7D4ECF00813B9C /* QuestionViewModel.swift in Sources */,
 				CAF59A792A7B9DE400813B9C /* RegisterView.swift in Sources */,
 				CAF59A8F2A7CD1D200813B9C /* GameViewModel.swift in Sources */,
+				CA3ED7E22A81732A0049FAD9 /* NumberBadge.swift in Sources */,
 				CAF59A8D2A7CD16900813B9C /* WebSocket.swift in Sources */,
 				CAF59A7D2A7C0F4600813B9C /* NetworkManager.swift in Sources */,
 				CAF59AA92A7EC13600813B9C /* ThreeDigitPicker.swift in Sources */,
diff --git a/TuringMachine/Views/Screens/CriteriaView.swift b/TuringMachine/Views/Screens/CriteriaView.swift
@@ -1,33 +1,57 @@
 import InjectHotReload
 import SwiftUI
+import WrappingHStack
 
 struct CriteriaView: View {
     @ObservedObject private var inject = Inject.observer
     @EnvironmentObject var viewModel: GameViewModel
+    var recordForEachVerifier: [[Int]] {
+        var computedRecord = Array(repeating: [Int](), count: 6)
+        viewModel.verificationRecord.enumerated().forEach { stage, resultArray in
+            let num = viewModel.proposalRecord[stage]
+            resultArray.enumerated().forEach { verifierIndex, result in
+                if result == .skip { return }
+                computedRecord[verifierIndex].append(result == .correct ? num : -num)
+            }
+        }
+        return computedRecord
+    }
 
     var body: some View {
         List {
             if let problem = viewModel.problem {
                 ForEach(Array(zip(problem.verifiers.indices, problem.verifiers)), id: \.0) { index, item in
-                    HStack {
-                        Image(systemName: "\(index.toAlphabet().lowercased()).square.fill")
-                            .foregroundColor(.blue)
-                            .font(.title3)
+                    VStack {
+                        HStack {
+                            Image(systemName: "\(index.toAlphabet().lowercased()).square.fill")
+                                .foregroundColor(.blue)
+                                .font(.title3)
 
-                        Spacer(minLength: 20)
-                        RemoteImage(url: """
-                        https://turingmachine.info/images/criteriacards/\
-                        EN/TM_GameCards_EN-\(String(format: "%02d", item)).png
-                        """) {
-                            ProgressView()
+                            Spacer(minLength: 20)
+                            RemoteImage(url: """
+                            https://turingmachine.info/images/criteriacards/\
+                            EN/TM_GameCards_EN-\(String(format: "%02d", item)).png
+                            """) {
+                                ProgressView()
+                            }
+                        }
+                    }
+                    if recordForEachVerifier[index].count > 0 {
+                        WrappingHStack(recordForEachVerifier[index].indices, id: \.self) { recordIndex in
+                            NumberBadge(num: abs(recordForEachVerifier[index][recordIndex]),
+                                        isCorrect: recordForEachVerifier[index][recordIndex] > 0)
                         }
                     }
                 }
             } else {
                 ProgressView()
             }
+            Spacer()
+                .listRowSeparator(.hidden, edges: .bottom)
+                .listRowBackground(EmptyView())
         }
         .listStyle(.plain)
+        .background(Color(.systemBackground))
         .enableInjection()
     }
 }
diff --git a/TuringMachine/Views/Screens/VerificationView.swift b/TuringMachine/Views/Screens/VerificationView.swift
@@ -46,6 +46,9 @@ struct VerificationView: View {
                     }
                 }
             }
+            Spacer()
+                .listRowSeparator(.hidden, edges: .bottom)
+                .listRowBackground(EmptyView())
         }
         .listStyle(.plain)
         .enableInjection()
diff --git a/TuringMachine/Views/Shared/CTAButton.swift b/TuringMachine/Views/Shared/CTAButton.swift
@@ -16,7 +16,7 @@ struct CTAButton: View {
                     .frame(maxWidth: .infinity)
                     .controlSize(.regular)
             } else {
-                Text(title)
+                Text("**\(title)**")
                     .frame(maxWidth: .infinity)
             }
         }
diff --git a/TuringMachine/Views/Shared/NumberBadge.swift b/TuringMachine/Views/Shared/NumberBadge.swift
@@ -0,0 +1,22 @@
+import SwiftUI
+
+struct NumberBadge: View {
+    let num: Int
+    let isCorrect: Bool
+
+    var body: some View {
+        Text("\(num)")
+            .font(.subheadline)
+            .foregroundColor(.white)
+            .padding(4)
+            .background(RoundedRectangle(cornerRadius: 8).fill(isCorrect ? Color("Primary") : .red))
+            .padding(.vertical, 3)
+    }
+}
+
+struct NumberBadge_Previews: PreviewProvider {
+    static var previews: some View {
+        NumberBadge(num: 342, isCorrect: true)
+        NumberBadge(num: 342, isCorrect: false)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ struct VerificationView: View {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
	`49`	`+ Spacer()`
	`50`	`+ .listRowSeparator(.hidden, edges: .bottom)`
	`51`	`+ .listRowBackground(EmptyView())`
`49`	`52`	`}`
`50`	`53`	`.listStyle(.plain)`
`51`	`54`	`.enableInjection()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ struct CTAButton: View {`
`16`	`16`	`.frame(maxWidth: .infinity)`
`17`	`17`	`.controlSize(.regular)`
`18`	`18`	`} else {`
`19`		`- Text(title)`
	`19`	`+ Text("\(title)")`
`20`	`20`	`.frame(maxWidth: .infinity)`
`21`	`21`	`}`
`22`	`22`	`}`