From e784e5b0f59b61a8cd9bf0918be6bb4e3fe744bb Mon Sep 17 00:00:00 2001 From: hwangJi-dev Date: Thu, 27 Oct 2022 03:36:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=85=C2=A0Chore:=20=EC=BB=A4=EB=AE=A4?= =?UTF-8?q?=EB=8B=88=ED=8B=B0=20=ED=95=99=EA=B3=BC=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=9B=84=20=EB=8B=A4=EB=A5=B8=20=ED=83=AD?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=ED=9B=84=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20=EB=8F=8C=EC=95=84=EC=99=80=EB=8F=84=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9=EB=90=98?= =?UTF-8?q?=EC=96=B4=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#625)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift index 395e9653..473cc643 100644 --- a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift +++ b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift @@ -71,7 +71,7 @@ final class CommunityMainVC: BaseVC, View { } override func viewWillAppear(_ animated: Bool) { - reactor?.action.onNext(.requestNewCommunityList(type: PostFilterType(rawValue: communitySegmentedControl.selectedSegmentIndex) ?? .community)) + reactor?.action.onNext(.requestNewCommunityList(majorID: reactor?.currentState.filterMajorID, type: PostFilterType(rawValue: communitySegmentedControl.selectedSegmentIndex) ?? .community, sort: "recent", search: "")) } func bind(reactor: CommunityMainReactor) { From 2aac6278b64fc56906aa28f39155f10bca89f751 Mon Sep 17 00:00:00 2001 From: hwangJi-dev Date: Thu, 27 Oct 2022 03:40:06 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=85=C2=A0Chore:=20=08=ED=95=99?= =?UTF-8?q?=EA=B3=BC=20=ED=95=84=ED=84=B0=20=EB=B0=94=ED=85=80=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=EB=A1=9C=20=ED=95=99=EA=B3=BC=20=ED=95=84=ED=84=B0=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=EC=8B=9C=20contentOffset.y=EB=A5=BC=200?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95=20(#625)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Screen/Community/Reactor/CommunityMainReactor.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift index 105c6f77..2dcdcefe 100644 --- a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift +++ b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift @@ -65,6 +65,7 @@ extension CommunityMainReactor { Observable.just(.setLoading(loading: true)), Observable.just(.setFilterBtnState(selected: fill)), Observable.just(.setFilterMajorID(majorID: majorID)), + Observable.just(.setTapSegmentState(state: true)), self.requestCommunityList(majorID: majorID, type: type, sort: "recent", search: "") ]) case .requestNewCommunityList(let majorID, let type, let sort, let search): From 41dba3a204c6b906bf1583c2dc2dcecafb009616 Mon Sep 17 00:00:00 2001 From: hwangJi-dev Date: Thu, 27 Oct 2022 03:41:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=85=C2=A0Chore:=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=A7=81=EA=B4=80=EC=A0=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#625)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Community/Reactor/CommunityMainReactor.swift | 14 +++++++------- .../Screen/Community/VC/CommunityMainVC.swift | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift index 2dcdcefe..36ecdba9 100644 --- a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift +++ b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/Reactor/CommunityMainReactor.swift @@ -30,7 +30,7 @@ final class CommunityMainReactor: Reactor { case setFilterBtnState(selected: Bool) case setFilterMajorID(majorID: Int) case setRefreshLoading(loading: Bool) - case setTapSegmentState(state: Bool) + case setAnimateToTopState(state: Bool) case setAlertState(showState: Bool, message: String = AlertType.networkError.alertMessage) case updateAccessToken(state: Bool, action: Action) } @@ -43,7 +43,7 @@ final class CommunityMainReactor: Reactor { var majorList: [MajorInfoModel] = [] var filterBtnSelected: Bool = false var filterMajorID: Int = MajorIDConstants.allMajorID - var toSetContentOffsetZero: Bool = true + var animateToTopState: Bool = true var showAlert: Bool = false var alertMessage: String = "" var isUpdateAccessToken: Bool = false @@ -65,7 +65,7 @@ extension CommunityMainReactor { Observable.just(.setLoading(loading: true)), Observable.just(.setFilterBtnState(selected: fill)), Observable.just(.setFilterMajorID(majorID: majorID)), - Observable.just(.setTapSegmentState(state: true)), + Observable.just(.setAnimateToTopState(state: true)), self.requestCommunityList(majorID: majorID, type: type, sort: "recent", search: "") ]) case .requestNewCommunityList(let majorID, let type, let sort, let search): @@ -83,7 +83,7 @@ extension CommunityMainReactor { case .tapSegmentedControl(let majorID, let type, let sort, let search): return Observable.concat([ Observable.just(.setLoading(loading: true)), - Observable.just(.setTapSegmentState(state: true)), + Observable.just(.setAnimateToTopState(state: true)), self.requestCommunityList(majorID: majorID, type: type, sort: sort, search: search) ]) } @@ -106,8 +106,8 @@ extension CommunityMainReactor { newState.refreshLoading = loading case .setFilterMajorID(let majorID): newState.filterMajorID = majorID - case .setTapSegmentState(let state): - newState.toSetContentOffsetZero = state + case .setAnimateToTopState(let state): + newState.animateToTopState = state case .setAlertState(let showState, let message): newState.showAlert = showState newState.alertMessage = message @@ -132,7 +132,7 @@ extension CommunityMainReactor { observer.onNext(Mutation.requestCommunityList(communityList: data)) observer.onNext(Mutation.setRefreshLoading(loading: false)) observer.onNext(Mutation.setLoading(loading: false)) - observer.onNext(Mutation.setTapSegmentState(state: false)) + observer.onNext(Mutation.setAnimateToTopState(state: false)) observer.onCompleted() } case .requestErr(let res): diff --git a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift index 473cc643..b532ae1b 100644 --- a/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift +++ b/NadoSunbae-iOS/NadoSunbae-iOS/Screen/Community/VC/CommunityMainVC.swift @@ -178,7 +178,7 @@ extension CommunityMainVC { self?.setEmptyLabelIsHidden(isHidden: true) } else { self?.activityIndicator.stopAnimating() - if reactor.currentState.toSetContentOffsetZero { + if reactor.currentState.animateToTopState { self?.communitySV.contentOffset.y = 0 } self?.setEmptyLabelIsHidden(isHidden: reactor.currentState.communityList.isEmpty ? false : true)