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.

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/#89] 화면 전환 애니메이션 디테일 수정 #90

Merged
merged 2 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class GroupListActivity : BindingActivity<ActivityGroupListBinding>(R.layout.act
private fun initEvent() {
binding.ivClose.setOnClickListener {
finish()
closeActivitySlideAnimation()
}
}

Expand Down Expand Up @@ -105,6 +104,11 @@ class GroupListActivity : BindingActivity<ActivityGroupListBinding>(R.layout.act
})
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}

companion object {
fun getIntent(context: Context, title: String, type: Int) =
Intent(context, GroupListActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class GroupDetailActivity :
viewModel.getGroup(meetingId)
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}

companion object {
fun getIntent(context: Context, meetingId: Long) =
Intent(context, GroupDetailActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class JoinFriendListActivity :
useRippleEffect = false,
clickEvent = {
finish()
closeActivitySlideAnimation()
}
)
)
Expand Down Expand Up @@ -75,6 +74,11 @@ class JoinFriendListActivity :
}.attach()
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}

companion object {
fun getIntent(context: Context, friendListJson: String) =
Intent(context, JoinFriendListActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class GroupMeetCheckActivity :
useRippleEffect = false,
clickEvent = {
finish()
closeActivitySlideAnimation()
}
)
)
Expand Down Expand Up @@ -80,6 +79,11 @@ class GroupMeetCheckActivity :
}.launchIn(lifecycleScope)
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}

companion object {
fun getIntent(context: Context, meetingId: Long) =
Intent(context, GroupMeetCheckActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class GroupMeetCompleteActivity :
useRippleEffect = false,
clickEvent = {
finish()
closeActivitySlideAnimation()
}
)
)
Expand Down Expand Up @@ -91,6 +90,11 @@ class GroupMeetCompleteActivity :
openActivitySlideAnimation()
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}

companion object {
fun getIntent(context: Context, meetingId: Long) =
Intent(context, GroupMeetCompleteActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ class SearchActivity : BindingActivity<ActivitySearchBinding>(R.layout.activity_

binding.ivBack.setOnClickListener {
finish()
closeActivitySlideAnimation()
}
}

Expand Down Expand Up @@ -129,4 +128,9 @@ class SearchActivity : BindingActivity<ActivitySearchBinding>(R.layout.activity_
}
})
}

override fun finish() {
super.finish()
closeActivitySlideAnimation()
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.teumteum.teumteum.presentation.moim

import android.app.Activity
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
Expand Down Expand Up @@ -70,7 +71,7 @@ fun MoimConfirm(viewModel: MoimViewModel, activity: Activity, isJoinView: Boolea
onClick = {
activity.finish()
(activity as? BindingActivity<*>)?.closeActivitySlideAnimation()
}
},
) {
val scrollState = rememberScrollState()
Column(
Expand Down Expand Up @@ -110,6 +111,11 @@ fun MoimConfirm(viewModel: MoimViewModel, activity: Activity, isJoinView: Boolea
}
}
}
BackHandler {
// Handle the back button press
activity.finish()
(activity as? BindingActivity<*>)?.closeActivitySlideAnimation()
}
}

@OptIn(ExperimentalPagerApi::class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.teumteum.teumteum.presentation.mypage

import android.app.Activity
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -118,6 +119,11 @@ fun RecommendDetailScreen(

}
}
BackHandler {
// Handle the back button press
activity.finish()
(activity as? BindingActivity<*>)?.closeActivitySlideAnimation()
}
}

@Composable
Expand Down
Loading