Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build warning for AccountSettingReducer #357

Merged
merged 5 commits into from
Jan 27, 2024
Merged

Fix build warning for AccountSettingReducer #357

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a6c826
Fix build warning for AccountSettingReducer
Nov 17, 2023
cbed3dd
address comments
remlostime Nov 30, 2023
27f3b34
remove extra line
remlostime Nov 30, 2023
7f72d12
remove extra line
remlostime Nov 30, 2023
4fae615
fix more stuff
remlostime Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions EhPanda/View/Setting/AccountSetting/AccountSettingReducer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ struct AccountSettingReducer: ReducerProtocol {
case setNavigation(Route?)
case onLogoutConfirmButtonTapped
case clearSubStates

case loadCookies
case copyCookies(GalleryHost)

case login(LoginReducer.Action)
case ehSetting(EhSettingReducer.Action)
}
Expand All @@ -51,7 +49,7 @@ struct AccountSettingReducer: ReducerProtocol {
Reduce { state, action in
switch action {
case .binding(\.$route):
return state.route == nil ? .init(value: .clearSubStates) : .none
return state.route == nil ? .send(.clearSubStates) : .none

case .binding(\.$ehCookiesState):
return cookieClient.setCookies(state: state.ehCookiesState).fireAndForget()
Expand All @@ -64,17 +62,17 @@ struct AccountSettingReducer: ReducerProtocol {

case .setNavigation(let route):
state.route = route
return route == nil ? .init(value: .clearSubStates) : .none
return route == nil ? .send(.clearSubStates) : .none

case .onLogoutConfirmButtonTapped:
return .init(value: .loadCookies)
return .send(.loadCookies)

case .clearSubStates:
state.loginState = .init()
state.ehSettingState = .init()
return .merge(
.init(value: .login(.teardown)),
.init(value: .ehSetting(.teardown))
.send(.login(.teardown)),
.send(.ehSetting(.teardown))
)

case .loadCookies:
Expand All @@ -85,13 +83,13 @@ struct AccountSettingReducer: ReducerProtocol {
case .copyCookies(let host):
let cookiesDescription = cookieClient.getCookiesDescription(host: host)
return .merge(
.init(value: .setNavigation(.hud)),
.send(.setNavigation(.hud)),
clipboardClient.saveText(cookiesDescription).fireAndForget(),
.fireAndForget({ hapticsClient.generateNotificationFeedback(.success) })
)

case .login(.loginDone):
return cookieClient.didLogin ? .init(value: .setNavigation(nil)) : .none
return cookieClient.didLogin ? .send(.setNavigation(nil)) : .none

case .login:
return .none
Expand Down