Add question/time limit quiz modes #3
Conversation
TCA 1.0.0 -> 1.3.0
| enum QuizMode: Equatable, Identifiable, Codable, CaseIterable { | ||
| case infinite | ||
| case questionLimit | ||
| case timeLimit |
There was a problem hiding this comment.
This QuizMode is separate from the top level QuizMode so that we can persist both questionLimit and timeLimit independently of the last chosen quizMode. There's a conversion function in the ListeningQuizFeature file.
| var showProgress: Bool | ||
| var showBiki: Bool | ||
| var showConfetti: Bool | ||
| var playHaptics: Bool |
There was a problem hiding this comment.
I'll add full support for these in another PR.
| var questionLimit: Int | ||
| var timeLimit: Int // seconds |
There was a problem hiding this comment.
I decided to save these values as raw Ints but only allow the user to choose from a few different values. In theory this could lead to validation issues down the road if the saved value is removed from the UI.
| import DependenciesAdditions | ||
| import Foundation | ||
|
|
||
| struct SessionSettingsClient { |
There was a problem hiding this comment.
Note: This file was technically renamed from the unused TopicSettingsClient for convenience.
| @@ -13,45 +13,114 @@ struct BikiAnimation: Equatable { | |||
| let kind: Kind | |||
| } | |||
|
|
|||
| extension ListeningQuizFeature.State { | |||
There was a problem hiding this comment.
I moved some of the derived view values of the state into their own extension for organization purposes.
| @@ -204,7 +222,7 @@ struct SessionSummaryView: View { | |||
| } | |||
| // TODO: Button: retry session with same settings (if timed session was completed) | |||
There was a problem hiding this comment.
I considered adding a "Try Quiz Again" button, but I think it's better to add in a separate PR.
| @PresentationState var quiz: ListeningQuizNavigationFeature.State? | ||
| @PresentationState var about: AboutFeature.State? | ||
| @PresentationState var destination: Destination.State? |
There was a problem hiding this comment.
The PreSettingsView should always be visible as a detents sheet. However, SwiftUI breaks if you try to present another sheet/fullScreenCover while another sheet is presented. Therefore, in the reducer below, we have to jump through some hoops to ensure that the PreSettingsView is dismissed properly before AboutView or QuizView is presented, and then present it again once TopicView reappears.
| state.about = .init() | ||
| state.destination = nil | ||
| return .run { send in | ||
| await send(.setDestination(.about(.init()))) |
There was a problem hiding this comment.
Doing this requires Destination.State and all its downstream types to be @Sendable. Way downstream the TCA built in AlertState type was not @Sendable in TCA v1.0.0, but it is in v1.3.0, so I updated TCA.
| @@ -0,0 +1,39 @@ | |||
| import SwiftUI | |||
|
|
|||
| struct DeterminateProgressView: View { | |||
There was a problem hiding this comment.
I implemented this view similarly to the earlier IndeterminateProgressView. Both could be implemented as ProgressViewStyle conforming types, but at this point I think they're more straightforward to read as simple Views.
| @@ -433,22 +532,45 @@ struct ListeningQuizView: View { | |||
|
|
|||
| @ViewBuilder func progressBar(viewStore: ViewStoreOf<ListeningQuizFeature>) -> some View { | |||
| HStack(spacing: 0) { | |||
| IndeterminateProgressView( | |||
| animationCount: viewStore.challengeCount, | |||
| color1: Color(.tintColor), | |||
There was a problem hiding this comment.
This tintColor is way too prominent for the determinate variant, and I think it actually looks better as subtle gray anyway.
| .sheet( | ||
| store: store.scope(state: \.$destination, action: { .destination($0) }), | ||
| state: /TopicsFeature.Destination.State.preSettings, | ||
| action: TopicsFeature.Destination.Action.preSettings | ||
| ) { store in | ||
| PreSettingsView(store: store) | ||
| .presentationDragIndicator(.visible) | ||
| .presentationDetents([.fraction(0.1), .medium, .large]) | ||
| .presentationBackgroundInteraction(.enabled) | ||
| .interactiveDismissDisabled(true) | ||
| } |
There was a problem hiding this comment.
I noticed a bug (documented on Mastondon) where SwiftUI presents this sheet as a fullScreenCover with no way to close it, but can't reproduce it.
At the time I saw the bug, the presentation modifiers were outside the ViewStore scope. I moved them inside (which I think is the correct placement) so hopefully that fixes it. There's not really much I can do to workaround it besides randomly placing delays, introspecting UIKit, or completely rewriting to not use sheet at all.
QuizModes: infinite, timeLimit, questionLimit.PreSettingsViewas a half-modal that appears within theTopicViewcontext.SessionSettingsClientto persist user quiz mode settingsScreenshots
Question Limit
count-question-limit.mov
Time Limit
count-time-limit.mov