Skip to content

Commit 929d9dd

Browse files
authored
[Merge] feature/storage-detail-anim-unification -> develop
[MOD] 상세페이지 / 보관함으로 뒤로가기 및 코스 삭제 시 애니메이션 통일
2 parents 1cf1a81 + 6e0735c commit 929d9dd

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

app/src/main/java/com/runnect/runnect/presentation/mydrawdetail/MyDrawDetailActivity.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.runnect.runnect.presentation.mydrawdetail
33
import android.content.ContentValues
44
import android.content.Intent
55
import android.os.Bundle
6+
import androidx.activity.OnBackPressedCallback
67
import androidx.activity.viewModels
78
import androidx.core.net.toUri
89
import com.bumptech.glide.Glide
@@ -13,6 +14,7 @@ import com.runnect.runnect.data.dto.response.ResponseGetMyDrawDetailDTO
1314
import com.runnect.runnect.databinding.ActivityMyDrawDetailBinding
1415
import com.runnect.runnect.presentation.MainActivity
1516
import com.runnect.runnect.presentation.countdown.CountDownActivity
17+
import com.runnect.runnect.util.extension.navigateToPreviousScreenWithAnimation
1618
import com.runnect.runnect.util.extension.setActivityDialog
1719
import dagger.hilt.android.AndroidEntryPoint
1820
import kotlinx.android.synthetic.main.custom_dialog_delete.view.btn_delete_no
@@ -57,6 +59,7 @@ class MyDrawDetailActivity :
5759
putExtra(EXTRA_FRAGMENT_REPLACEMENT_DIRECTION, "fromDeleteMyDrawDetail")
5860
}
5961
startActivity(intent)
62+
navigateToPreviousScreenWithAnimation()
6063
}
6164
this.btn_delete_no.setOnClickListener {
6265
dialog.dismiss()
@@ -73,17 +76,11 @@ class MyDrawDetailActivity :
7376

7477
private fun backButton() { //png가 imgBtn으로 하면 잘리길래 어차피 임시로 해놓는 거니까 imgView로 component를 추가해줬음
7578
binding.imgBtnBack.setOnClickListener {
76-
finish()
77-
overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
79+
navigateToPreviousScreenWithAnimation()
7880
}
7981
}
8082

81-
override fun onBackPressed() {
82-
finish()
83-
overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
84-
}
85-
86-
fun getMyDrawDetail() {
83+
private fun getMyDrawDetail() {
8784
val courseId = intent.getIntExtra(EXTRA_COURSE_ID, 0)
8885
Timber.tag(ContentValues.TAG).d("courseId from Storage : $courseId")
8986

@@ -101,6 +98,16 @@ class MyDrawDetailActivity :
10198

10299
fun addObserver() {
103100
observeGetResult()
101+
registerBackPressedCallback()
102+
}
103+
104+
private fun registerBackPressedCallback() { // 이 함수를 addObserver에서 호출
105+
val callback = object : OnBackPressedCallback(true) {
106+
override fun handleOnBackPressed() {
107+
navigateToPreviousScreenWithAnimation()
108+
}
109+
}
110+
onBackPressedDispatcher.addCallback(this, callback)
104111
}
105112

106113
private fun setImage(src: ResponseGetMyDrawDetailDTO) {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.runnect.runnect.util.extension
2+
3+
import android.app.Activity
4+
import com.runnect.runnect.R
5+
6+
fun Activity.navigateToPreviousScreenWithAnimation() {
7+
finish()
8+
overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right)
9+
}

0 commit comments

Comments
 (0)