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

Feat/seong kook #88

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Feat/seong kook #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b879244
Fix.라이딩 리셋,종룔 버튼 클릭 후 취소 누르면 중지되게 변경
SeongKookKIM Sep 9, 2024
53684f1
Comment.주석삭제
SeongKookKIM Sep 9, 2024
f5dd91b
Fix.탈퇴시 유저디폴트Device삭제
SeongKookKIM Sep 9, 2024
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
4 changes: 4 additions & 0 deletions RideThis/View/MyPage/Setting/AccountQuitView.swift
View file
Open in desktop
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
View file
Open in desktop
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