Skip to content

Commit

Permalink
Merge pull request #88 from APP-iOS5th/Feat/SeongKook
Browse files Browse the repository at this point in the history
Feat/seong kook
  • Loading branch information
SeongKookKIM authored Sep 9, 2024
2 parents d131ad6 + f5dd91b commit ecd5dd7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions RideThis/View/MyPage/Setting/AccountQuitView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ class AccountQuitView: RideThisViewController {
quitButton.addAction(UIAction { [weak self] _ in
guard let self = self else { return }
showAlert(alertTitle: "확인", msg: "정말 탈퇴하시겠습니까?", confirm: "") {
// 탈퇴 시 유저디폴트에 DEVICE정보를 삭제
let defaults = UserDefaults.standard
defaults.removeObject(forKey: "unkownedDevices")

self.firebaseService.deleteUser(userId: UserService.shared.combineUser!.user_id)
}
}, for: .touchUpInside)
Expand Down
9 changes: 2 additions & 7 deletions RideThis/View/Record/Record/RecordView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,7 @@ class RecordView: RideThisViewController {
self.viewModel.resetRecording()
self.enableTabBar()
} cancelAction: {
if self.stopButtonTabbed == false {
self.viewModel.resumeRecording()
}
self.stopButtonTabbed = true
}
}, for: .touchUpInside)

Expand Down Expand Up @@ -290,10 +288,7 @@ class RecordView: RideThisViewController {
self.viewModel.finishRecording()
self.enableTabBar()
} cancelAction: {
// MARK: 현재 기록중이었을 때만 종료버튼 후 alert에서 취소를 누르면 계속 기록이 진행되게 하기위해서
if self.stopButtonTabbed == false {
self.viewModel.resumeRecording()
}
self.stopButtonTabbed = true
}
}, for: .touchUpInside)
}
Expand Down

0 comments on commit ecd5dd7

Please sign in to comment.