-
Notifications
You must be signed in to change notification settings - Fork 0
#122 [fix] 데일리 루틴 삭제 후 초기화 시키기 #124
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.
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
66b6d7c
#122 [fix] 편집으로 가면 엠티박스 없어지게 하기
minemi00 69308ac
#122 [fix] 편집 라디오버튼 초기화 시키기
minemi00 162a4ef
Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…
minemi00 3cb8ad6
#122 [fix] 스낵바 n개 삭제 수정
minemi00 8fa092d
#122 [fix] ci 오류 수정
minemi00 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -166,6 +166,7 @@ class DailyRoutineFragment : | |
if (isDeleteView) { | ||
binding.tvDailyRoutineEdit.setSingleOnClickListener { | ||
viewModel.setDeleteView(false) | ||
resetRadioButtons() | ||
} | ||
clickEditRadioBtn() | ||
} | ||
|
@@ -200,7 +201,8 @@ class DailyRoutineFragment : | |
} | ||
|
||
private fun changeBtnSelectState(button: View, itemId: Int) { | ||
button.setSingleOnClickListener { | ||
button.setOnClickListener { | ||
|
||
it.isSelected = !it.isSelected | ||
viewModel.setEditRoutineIdArray(itemId) | ||
setDeleteRoutineBtnContent() | ||
|
@@ -221,6 +223,7 @@ class DailyRoutineFragment : | |
binding.btnDailyRoutineDelete.text = deleteBtnContent | ||
} | ||
|
||
|
||
private fun initSetRoutineDelete() { | ||
binding.btnDailyRoutineDelete.setSingleOnClickListener { | ||
BindingBottomSheet.Builder().build( | ||
|
@@ -236,20 +239,34 @@ class DailyRoutineFragment : | |
doBtnColor = R.drawable.shape_red_fill_12_rect, | ||
backBtnAction = {}, | ||
doBtnAction = { | ||
val arraySize = viewModel.editRoutineIdArray.size | ||
viewModel.deleteDailyRoutine() | ||
viewModel.isDailyRoutineDelete.observe(viewLifecycleOwner) { | ||
snackBar( | ||
binding.root.rootView, | ||
"데일리 루틴을 ${viewModel.editRoutineIdArray.size}개 삭제했어요" | ||
"데일리 루틴을 ${arraySize}개 삭제했어요" | ||
) | ||
viewModel.setDeleteView(false) | ||
viewModel.getDailyRoutine() | ||
|
||
resetRadioButtons() | ||
} | ||
} | ||
).show(parentFragmentManager, BOTTOM_SHEET_TAG) | ||
} | ||
} | ||
|
||
private fun resetRadioButtons() { | ||
with(binding) { | ||
btnDailyRoutineRadioFirst.isSelected = false | ||
btnDailyRoutineRadioSecond.isSelected = false | ||
btnDailyRoutineRadioThird.isSelected = false | ||
} | ||
viewModel.clearEditRoutineIdArray() | ||
setDeleteRoutineBtnContent() | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 여기도 한 줄 삭제해주세요! |
||
|
||
private fun startDailyRoutineCompleteActivity() { | ||
val intentToCompleteActivity = | ||
Intent(requireActivity(), DailyRoutineCompleteActivity::class.java) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
빈 줄 삭제해주세요!