Skip to content

Commit 3f5f3c8

Browse files
Rename enum Action cases to be consistent (#1240)
* Rename enum Action cases to be consistent - dissmiss(something)Alert -> (something)AlertDismissed - rename enum for cancellable id * Update Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift * Update Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift * Update Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift * Re-alphabetize alertDismissed case Co-authored-by: Stephen Celis <[email protected]>
1 parent 39bc802 commit 3f5f3c8

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ struct AnimationsState: Equatable {
4646
}
4747

4848
enum AnimationsAction: Equatable {
49+
case alertDismissed
4950
case circleScaleToggleChanged(Bool)
50-
case dismissAlert
5151
case rainbowButtonTapped
5252
case resetButtonTapped
5353
case resetConfirmationButtonTapped
@@ -64,12 +64,12 @@ let animationsReducer = Reducer<AnimationsState, AnimationsAction, AnimationsEnv
6464
enum CancelID {}
6565

6666
switch action {
67-
case let .circleScaleToggleChanged(isScaled):
68-
state.isCircleScaled = isScaled
67+
case .alertDismissed:
68+
state.alert = nil
6969
return .none
7070

71-
case .dismissAlert:
72-
state.alert = nil
71+
case let .circleScaleToggleChanged(isScaled):
72+
state.isCircleScaled = isScaled
7373
return .none
7474

7575
case .rainbowButtonTapped:
@@ -150,7 +150,7 @@ struct AnimationsView: View {
150150
Button("Reset") { viewStore.send(.resetButtonTapped) }
151151
.padding([.horizontal, .bottom])
152152
}
153-
.alert(self.store.scope(state: \.alert), dismiss: .dismissAlert)
153+
.alert(self.store.scope(state: \.alert), dismiss: .alertDismissed)
154154
.navigationBarTitleDisplayMode(.inline)
155155
}
156156
}

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ enum DownloadComponentAction: Equatable {
3636

3737
enum AlertAction: Equatable {
3838
case deleteButtonTapped
39-
case dismiss
39+
case dismissed
4040
case nevermindButtonTapped
4141
case stopButtonTapped
4242
}
@@ -63,7 +63,7 @@ extension Reducer {
6363
return .none
6464

6565
case .alert(.nevermindButtonTapped),
66-
.alert(.dismiss):
66+
.alert(.dismissed):
6767
state.alert = nil
6868
return .none
6969

@@ -162,7 +162,7 @@ struct DownloadComponent<ID: Equatable>: View {
162162
.foregroundStyle(.primary)
163163
.alert(
164164
self.store.scope(state: \.alert, action: DownloadComponentAction.alert),
165-
dismiss: .dismiss
165+
dismiss: .dismissed
166166
)
167167
}
168168
}

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct AppState: Equatable {
1616
}
1717

1818
enum AppAction: Equatable {
19-
case dismissAuthorizationStateAlert
19+
case authorizationStateAlertDismissed
2020
case recordButtonTapped
2121
case speech(Result<String, SpeechClient.Error>)
2222
case speechRecognizerAuthorizationStatusResponse(SFSpeechRecognizerAuthorizationStatus)
@@ -29,7 +29,7 @@ struct AppEnvironment {
2929

3030
let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, environment in
3131
switch action {
32-
case .dismissAuthorizationStateAlert:
32+
case .authorizationStateAlertDismissed:
3333
state.alert = nil
3434
return .none
3535

@@ -138,7 +138,7 @@ struct SpeechRecognitionView: View {
138138
}
139139
}
140140
.padding()
141-
.alert(self.store.scope(state: \.alert), dismiss: .dismissAuthorizationStateAlert)
141+
.alert(self.store.scope(state: \.alert), dismiss: .authorizationStateAlertDismissed)
142142
}
143143
}
144144
}

0 commit comments

Comments
 (0)