Skip to content

Commit 018f449

Browse files
committed
[MOD] #285 프래그먼트 kotlin ext -> viewBinding 변경
1 parent 2d2b0b8 commit 018f449

2 files changed

Lines changed: 34 additions & 28 deletions

File tree

app/src/main/java/com/runnect/runnect/presentation/mypage/setting/accountinfo/MySettingAccountInfoFragment.kt

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.fragment.app.replace
1313
import androidx.fragment.app.viewModels
1414
import com.runnect.runnect.R
1515
import com.runnect.runnect.binding.BindingFragment
16+
import com.runnect.runnect.databinding.CustomDialogDeleteBinding
1617
import com.runnect.runnect.databinding.FragmentMySettingAccountInfoBinding
1718
import com.runnect.runnect.presentation.login.LoginActivity
1819
import com.runnect.runnect.presentation.mypage.setting.MySettingFragment
@@ -28,7 +29,6 @@ import com.runnect.runnect.util.extension.showToast
2829
import com.runnect.runnect.util.preference.AuthUtil.saveToken
2930
import com.runnect.runnect.util.preference.StatusType.LoginStatus
3031
import dagger.hilt.android.AndroidEntryPoint
31-
import kotlinx.android.synthetic.main.custom_dialog_delete.btn_delete_yes
3232
import timber.log.Timber
3333

3434
@AndroidEntryPoint
@@ -49,9 +49,7 @@ class MySettingAccountInfoFragment :
4949
addListener()
5050
addObserver()
5151
initLogoutDialog()
52-
setLogoutDialogClickEvent()
5352
initWithdrawalDialog()
54-
setWithdrawalDialogClickEvent()
5553
}
5654

5755
private fun initLayout() {
@@ -105,10 +103,14 @@ class MySettingAccountInfoFragment :
105103
}
106104

107105
private fun initLogoutDialog() {
106+
val binding = CustomDialogDeleteBinding.inflate(layoutInflater)
108107
logoutDialog = requireActivity().setCustomDialog(
109-
layoutInflater, binding.root, DESCRIPTION_LOGOUT,
110-
DESCRIPTION_LOGOUT_YES, DESCRIPTION_LOGOUT_NO
108+
binding = binding,
109+
description = DESCRIPTION_LOGOUT,
110+
yesBtnText = DESCRIPTION_LOGOUT_YES,
111+
noBtnText = DESCRIPTION_LOGOUT_NO
111112
)
113+
setLogoutDialogClickEvent(binding)
112114
}
113115

114116
private fun moveToLogin() {
@@ -123,10 +125,10 @@ class MySettingAccountInfoFragment :
123125
requireActivity().finish()
124126
}
125127

126-
private fun setLogoutDialogClickEvent() {
127-
logoutDialog.setDialogButtonClickListener { which ->
128+
private fun setLogoutDialogClickEvent(binding: CustomDialogDeleteBinding) {
129+
logoutDialog.setDialogButtonClickListener(binding) { which ->
128130
when (which) {
129-
logoutDialog.btn_delete_yes -> {
131+
binding.btnDeleteYes -> {
130132
Analytics.logClickedItemEvent(EVENT_VIEW_SUCCESS_LOGOUT)
131133
moveToLogin()
132134
}
@@ -135,16 +137,20 @@ class MySettingAccountInfoFragment :
135137
}
136138

137139
private fun initWithdrawalDialog() {
140+
val binding = CustomDialogDeleteBinding.inflate(layoutInflater)
138141
withdrawalDialog = requireActivity().setCustomDialog(
139-
layoutInflater, binding.root, DESCRIPTION_WITHDRAWAL,
140-
DESCRIPTION_WITHDRAWAL_YES, DESCRIPTION_WITHDRAWAL_NO
142+
binding = binding,
143+
description = DESCRIPTION_WITHDRAWAL,
144+
yesBtnText = DESCRIPTION_WITHDRAWAL_YES,
145+
noBtnText = DESCRIPTION_WITHDRAWAL_NO
141146
)
147+
setWithdrawalDialogClickEvent(binding)
142148
}
143149

144-
private fun setWithdrawalDialogClickEvent() {
145-
withdrawalDialog.setDialogButtonClickListener { which ->
150+
private fun setWithdrawalDialogClickEvent(binding: CustomDialogDeleteBinding) {
151+
withdrawalDialog.setDialogButtonClickListener(binding) { which ->
146152
when (which) {
147-
withdrawalDialog.btn_delete_yes -> {
153+
binding.btnDeleteYes -> {
148154
viewModel.deleteUser()
149155
}
150156
}

app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.os.Bundle
88
import android.view.View
99
import android.view.animation.Animation
1010
import android.view.animation.AnimationUtils
11+
import android.widget.Button
1112
import androidx.activity.result.contract.ActivityResultContracts
1213
import androidx.appcompat.widget.AppCompatButton
1314
import androidx.core.content.ContextCompat
@@ -31,8 +32,6 @@ import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
3132
import com.runnect.runnect.util.extension.applyScreenEnterAnimation
3233
import com.runnect.runnect.util.extension.setFragmentDialog
3334
import dagger.hilt.android.AndroidEntryPoint
34-
import kotlinx.android.synthetic.main.custom_dialog_delete.view.*
35-
import kotlinx.android.synthetic.main.fragment_storage_my_draw.*
3635
import timber.log.Timber
3736

3837
@AndroidEntryPoint
@@ -199,26 +198,27 @@ class StorageMyDrawFragment :
199198

200199
private fun showCourseDeleteConfirmDialog() {
201200
val (dialog, dialogLayout) = setFragmentDialog(
202-
layoutInflater = layoutInflater,
203201
resId = R.layout.custom_dialog_delete,
204202
cancel = true
205203
)
206-
with(dialogLayout) {
207-
this.btn_delete_yes.setOnClickListener {
208-
deleteCourse()
209-
dialog.dismiss()
210-
availableEdit = false
211-
isSelectAvailable = false
212-
hideDeleteCourseBtn()
213-
showBottomNav()
214-
}
215-
this.btn_delete_no.setOnClickListener {
216-
dialog.dismiss()
217-
}
204+
205+
dialogLayout.findViewById<Button>(R.id.btn_delete_yes)?.setOnClickListener {
206+
deleteCourse()
207+
dialog.dismiss()
208+
availableEdit = false
209+
isSelectAvailable = false
210+
hideDeleteCourseBtn()
211+
showBottomNav()
218212
}
213+
214+
dialogLayout.findViewById<Button>(R.id.btn_delete_no)?.setOnClickListener {
215+
dialog.dismiss()
216+
}
217+
219218
dialog.show()
220219
}
221220

221+
222222
private fun deleteCourse() {
223223
viewModel.deleteMyDrawCourse()
224224
binding.btnEditCourse.text = EDIT_MODE

0 commit comments

Comments
 (0)