[MOD] #285 액티비티 kotlin ext -> viewBinding 변경

Author: sxunea

app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt

@@ -41,6 +41,7 @@ import com.runnect.runnect.data.dto.SearchResultEntity
 import com.runnect.runnect.data.dto.UploadLatLng
 import com.runnect.runnect.databinding.ActivityDrawBinding
 import com.runnect.runnect.databinding.BottomsheetRequireCourseNameBinding
+import com.runnect.runnect.databinding.CustomDialogMakeCourseBinding
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.countdown.CountDownActivity
 import com.runnect.runnect.presentation.state.UiState
@@ -54,8 +55,6 @@ import com.runnect.runnect.util.extension.setActivityDialog
 import com.runnect.runnect.util.extension.showToast
 import com.runnect.runnect.util.multipart.ContentUriRequestBody
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.android.synthetic.main.custom_dialog_make_course.view.btn_run
-import kotlinx.android.synthetic.main.custom_dialog_make_course.view.btn_storage
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -502,15 +501,14 @@ class DrawActivity : BindingActivity<ActivityDrawBinding>(R.layout.activity_draw
      * 코스 완성 시 뜨는 팝업 (보관함 가기 / 바로 달리기)
      */
     private fun notifyCreateFinish() { //todo dialogFragment로 리팩토링
+        val binding = CustomDialogMakeCourseBinding.inflate(layoutInflater)
         val (dialog, dialogLayout) = setActivityDialog(
             layoutInflater = layoutInflater,
-            view = binding.root,
-            resId = R.layout.custom_dialog_make_course,
+            binding = binding,
             cancel = false
         )
-
-        with(dialogLayout) {
-            this.btn_run.setOnClickListener {
+        with(binding) {
+            btnRun.setOnClickListener {
                 Analytics.logClickedItemEvent(EventName.EVENT_CLICK_RUN_AFTER_COURSE_COMPLETE)
                 if (isCustomLocationMode) departureLatLng = customDepartureLatLng
 
@@ -539,7 +537,7 @@ class DrawActivity : BindingActivity<ActivityDrawBinding>(R.layout.activity_draw
                 dialog.dismiss()
             }
 
-            this.btn_storage.setOnClickListener {
+            btnStorage.setOnClickListener {
                 Analytics.logClickedItemEvent(EventName.EVENT_CLICK_STORED_AFTER_COURSE_COMPLETE)
                 val intent = Intent(this@DrawActivity, MainActivity::class.java).apply {
                     putExtra(EXTRA_FRAGMENT_REPLACEMENT_DIRECTION, "fromDrawCourse")

app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt

@@ -4,6 +4,7 @@ import android.app.AlertDialog
 import android.content.ContentValues
 import android.content.Intent
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
@@ -13,6 +14,7 @@ import com.runnect.runnect.R
 import com.runnect.runnect.binding.BindingActivity
 import com.runnect.runnect.data.dto.HistoryInfoDTO
 import com.runnect.runnect.databinding.ActivityMyHistoryBinding
+import com.runnect.runnect.databinding.CustomDialogDeleteBinding
 import com.runnect.runnect.presentation.mypage.history.adapter.MyHistoryAdapter
 import com.runnect.runnect.presentation.mypage.history.detail.MyHistoryDetailActivity
 import com.runnect.runnect.presentation.search.SearchActivity
@@ -25,7 +27,6 @@ import com.runnect.runnect.util.extension.navigateToPreviousScreenWithAnimation
 import com.runnect.runnect.util.extension.setCustomDialog
 import com.runnect.runnect.util.extension.setDialogButtonClickListener
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.android.synthetic.main.custom_dialog_delete.btn_delete_yes
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -65,18 +66,18 @@ class MyHistoryActivity : BindingActivity<ActivityMyHistoryBinding>(R.layout.act
     }
 
     private fun initDialog() {
+        val binding = CustomDialogDeleteBinding.inflate(layoutInflater)
         dialog = setCustomDialog(
-            layoutInflater = layoutInflater,
-            view = binding.root,
+            binding = binding,
             description = DIALOG_DESC,
             yesBtnText = DELETE_BTN
         )
     }
 
-    private fun setDialogClickEvent() {
-        dialog.setDialogButtonClickListener { which ->
+    private fun setDialogClickEvent(binding: CustomDialogDeleteBinding) {
+        dialog.setDialogButtonClickListener(binding) { which ->
             when (which) {
-                dialog.btn_delete_yes -> viewModel.deleteHistory()
+                binding.btnDeleteYes -> viewModel.deleteHistory()
             }
         }
     }
@@ -111,7 +112,8 @@ class MyHistoryActivity : BindingActivity<ActivityMyHistoryBinding>(R.layout.act
 
     private fun handleDeleteButtonClicked(it: View) {
         if (it.isEnabled) {
-            setDialogClickEvent()
+            val binding = CustomDialogDeleteBinding.inflate(LayoutInflater.from(it.context))
+            setDialogClickEvent(binding)
             dialog.show()
         }
     }

app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.runnect.runnect.R
 import com.runnect.runnect.binding.BindingActivity
 import com.runnect.runnect.databinding.ActivityMyUploadBinding
+import com.runnect.runnect.databinding.CustomDialogDeleteBinding
 import com.runnect.runnect.presentation.detail.CourseDetailActivity
 import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.discover.DiscoverFragment
@@ -31,8 +32,6 @@ import com.runnect.runnect.util.extension.setCustomDialog
 import com.runnect.runnect.util.extension.setDialogButtonClickListener
 import com.runnect.runnect.util.extension.showSnackbar
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.android.synthetic.main.custom_dialog_delete.btn_delete_no
-import kotlinx.android.synthetic.main.custom_dialog_delete.btn_delete_yes
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -41,6 +40,7 @@ class MyUploadActivity : BindingActivity<ActivityMyUploadBinding>(R.layout.activ
     private val viewModel: MyUploadViewModel by viewModels()
     private lateinit var uploadAdapter: MyUploadAdapter
     private lateinit var dialog: AlertDialog
+    private lateinit var dialogBinding: CustomDialogDeleteBinding
 
     private val resultLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -135,23 +135,25 @@ class MyUploadActivity : BindingActivity<ActivityMyUploadBinding>(R.layout.activ
         }
     }
 
+
     private fun initDialog() {
+        dialogBinding = CustomDialogDeleteBinding.inflate(layoutInflater)
         dialog = setCustomDialog(
-            layoutInflater, binding.root,
-            DESCRIPTION_DIALOG,
-            DELETE_BTN
+            binding = dialogBinding,
+            description = DESCRIPTION_DIALOG,
+            yesBtnText = DELETE_BTN
         )
     }
 
     private fun setDialogClickEvent() {
-        dialog.setDialogButtonClickListener { which ->
+        dialog.setDialogButtonClickListener(dialogBinding) { which ->
             when (which) {
-                dialog.btn_delete_yes -> {
+                dialogBinding.btnDeleteYes -> {
                     viewModel.deleteUploadCourse()
                     dialog.dismiss()
                 }
 
-                dialog.btn_delete_no -> {
+                dialogBinding.btnDeleteNo -> {
                     dialog.dismiss()
                 }
             }