Skip to content

Commit 3b5bfcd

Browse files
Jager-yoostephencelis
authored andcommitted
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 9736444 commit 3b5bfcd

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
@@ -45,8 +45,8 @@ struct AnimationsState: Equatable {
4545
}
4646

4747
enum AnimationsAction: Equatable {
48+
case alertDismissed
4849
case circleScaleToggleChanged(Bool)
49-
case dismissAlert
5050
case rainbowButtonTapped
5151
case resetButtonTapped
5252
case resetConfirmationButtonTapped
@@ -63,12 +63,12 @@ let animationsReducer = Reducer<AnimationsState, AnimationsAction, AnimationsEnv
6363
enum CancelID {}
6464

6565
switch action {
66-
case let .circleScaleToggleChanged(isScaled):
67-
state.isCircleScaled = isScaled
66+
case .alertDismissed:
67+
state.alert = nil
6868
return .none
6969

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

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

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

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

3838
enum AlertAction: Equatable {
3939
case deleteButtonTapped
40-
case dismiss
40+
case dismissed
4141
case nevermindButtonTapped
4242
case stopButtonTapped
4343
}
@@ -64,7 +64,7 @@ extension Reducer {
6464
return .none
6565

6666
case .alert(.nevermindButtonTapped),
67-
.alert(.dismiss):
67+
.alert(.dismissed):
6868
state.alert = nil
6969
return .none
7070

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

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)