Classroom, Exercise, Lesson, Grade init

p-larson · Sep 8, 2023 · d9e22f1 · d9e22f1
1 parent d10384e
commit d9e22f1
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 51 deletions.
diff --git a/Bible.xcodeproj/xcuserdata/plarson.xcuserdatad/xcschemes/xcschememanagement.plist b/Bible.xcodeproj/xcuserdata/plarson.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Bible.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

diff --git a/BibleCore/Package.swift b/BibleCore/Package.swift
@@ -121,6 +121,7 @@ let package = Package(
             dependencies: [
                 "BibleCore",
                 "BibleClient",
+                "DirectoryCore",
                 "UserDefaultsClient",
                 .product(name: "WrappingHStack", package: "WrappingHStack"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture")

diff --git a/BibleCore/Sources/Classroom/Classroom.swift b/BibleCore/Sources/Classroom/Classroom.swift
@@ -1,30 +1,34 @@
 import ComposableArchitecture
+import DirectoryCore
 import Foundation
 import UserDefaultsClient
 
 struct Classroom: Reducer {
-
     struct State: Equatable, Codable {
         var lessons: IdentifiedArrayOf<Lesson.State> = []
         var selected: Lesson.State.ID? = nil
+        var directory: Directory.State? = nil
     }
 
     enum Action: Equatable {
         case task
         case lesson(Lesson.Action)
         case select(id: UUID)
+        case openDirectory
     }
 
     @Dependency(\.defaults) var defaults: UserDefaultsClient
 
-
     var body: some ReducerOf<Self> {
         Reduce { state, action in
             switch action {
-            case .task
-                return .run {
-                    defaults.get
-                }
+            case .task:
+                return .none
+            case .openDirectory:
+
+
+
+                return .none
             case .select(id: let id):
                 state.selected = id
                 return .none

diff --git a/BibleCore/Sources/Classroom/ClassroomView.swift b/BibleCore/Sources/Classroom/ClassroomView.swift
@@ -5,7 +5,9 @@ struct ClassroomView: View {
     let store: StoreOf<Classroom>
 
     var body: some View {
-        EmptyView()
+        WithViewStore(store, observe: { $0 }) { viewStore in
+
+        }
     }
 }
 

diff --git a/...lassroom/Lesson/FITB/FillInTheBlank.swift → ...cercise/BuildByLetter/BuildByLetter.swift b/...lassroom/Lesson/FITB/FillInTheBlank.swift → ...cercise/BuildByLetter/BuildByLetter.swift
@@ -2,18 +2,7 @@ import ComposableArchitecture
 import BibleCore
 import BibleClient
 
-/*
- Types of learning modes
-
- FITB, fill in the blank
- - In the beginning
-
-
-
-
- */
-
-struct FillInTheBlank: Reducer {
+struct BuildByLetter: Reducer {
     enum Difficulty: Equatable, Codable {
         case easy, medium, hard
     }
@@ -43,7 +32,6 @@ struct FillInTheBlank: Reducer {
         Reduce { state, action in
             switch action {
             case .task:
-
                 state.wordBank = withRandomNumberGenerator {
                     state.correctAnswer.shuffled(using: &$0)
                 }

diff --git a/...lassroom/Lesson/Piecemeal/Piecemeal.swift → ...n/Excercise/BuildByWord/BuildByWord.swift b/...lassroom/Lesson/Piecemeal/Piecemeal.swift → ...n/Excercise/BuildByWord/BuildByWord.swift
@@ -2,7 +2,7 @@ import ComposableArchitecture
 import BibleCore
 import BibleClient
 
-public struct Piecemeal: Reducer {
+public struct BuildByWord: Reducer {
     public init() {}
 
     public struct State: Equatable, Codable {

diff --git a/...room/Lesson/Piecemeal/PiecemealView.swift → ...cercise/BuildByWord/BuildByWordView.swift b/...room/Lesson/Piecemeal/PiecemealView.swift → ...cercise/BuildByWord/BuildByWordView.swift
@@ -3,10 +3,10 @@ import SwiftUI
 
 import WrappingHStack
 
-public struct PiecemealView: View {
-    public let store: StoreOf<Piecemeal>
+public struct BuildByWordView: View {
+    public let store: StoreOf<BuildByWord>
 
-    public init(store: StoreOf<Piecemeal>) {
+    public init(store: StoreOf<BuildByWord>) {
         self.store = store
     }
 
@@ -70,13 +70,13 @@ public struct PiecemealView: View {
     }
 }
 
-struct PiecemealView_Previews: PreviewProvider {
+struct BuildByWordView_Previews: PreviewProvider {
     static var previews: some View {
-        PiecemealView(
+        BuildByWordView(
             store: Store(
-                initialState: Piecemeal.State(),
+                initialState: BuildByWord.State(),
                 reducer: {
-                    Piecemeal()
+                    BuildByWord()
                         .dependency(\.bible, .testValue)
                 }
             )

diff --git a/BibleCore/Sources/Classroom/Lesson/Excercise/Exercise.swift b/BibleCore/Sources/Classroom/Lesson/Excercise/Exercise.swift
@@ -0,0 +1,23 @@
+import BibleCore
+import ComposableArchitecture
+
+struct Exercise: Reducer {
+    enum State: Equatable, Codable {
+        case buildByWord(BuildByWord.State)
+        case buildByLetter(BuildByLetter.State)
+    }
+
+    enum Action: Equatable {
+        case buildByWord(BuildByWord.Action)
+        case buildByLetter(BuildByLetter.Action)
+    }
+
+    var body: some ReducerOf<Self> {
+        Scope(state: /State.buildByWord, action: /Action.buildByWord) {
+            BuildByWord()
+        }
+        Scope(state: /State.buildByLetter, action: /Action.buildByLetter) {
+            BuildByLetter()
+        }
+    }
+}
diff --git a/BibleCore/Sources/Classroom/Lesson/Exercise.swift b/BibleCore/Sources/Classroom/Lesson/Exercise.swift
diff --git a/BibleCore/Sources/Classroom/Lesson/Grade.swift b/BibleCore/Sources/Classroom/Lesson/Grade.swift
@@ -0,0 +1,24 @@
+import ComposableArchitecture
+
+struct Grade: Reducer {
+    enum State: Equatable, Codable {
+        case disabled
+        case ready
+        case failed(String)
+        case partial(String)
+        case correct
+    }
+
+    enum Action: Equatable {
+        case submit
+    }
+
+    var body: some ReducerOf<Self> {
+        Reduce { state, action in
+            switch action {
+            case .submit:
+                return .none
+            }
+        }
+    }
+}
diff --git a/BibleCore/Sources/Classroom/Lesson/Lesson.swift b/BibleCore/Sources/Classroom/Lesson/Lesson.swift
@@ -5,15 +5,33 @@ import Foundation
 struct Lesson: Reducer {
     struct State: Identifiable, Equatable, Codable {
         var verses: [Verse]
-        var exercise: Exercise.State?
+        var exercise: Exercise.State? = nil
+        var grade: Grade.State = .disabled
         var id: UUID
+
+        public init(
+            verses: [Verse],
+            exercise: Exercise.State? = nil,
+            grade: Grade.State,
+            id: UUID
+        ) {
+            self.verses = verses
+            self.exercise = exercise
+            self.grade = grade
+            self.id = id
+        }
     }
 
     enum Action: Equatable {
+        case prepare
         case excercise(Exercise.Action)
+        case grade(Grade.Action)
     }
 
     var body: some ReducerOf<Self> {
+        Scope(state: \.grade, action: /Action.grade) {
+            Grade()
+        }
         Reduce { state, action in
             switch action {
             default: