Intent activity animation

kichan05 · kichan05 · commit 7e5df72aef49 · 2022-02-16T01:15:03.000+09:00
diff --git a/app/src/main/java/com/edcan/howtosunrin/base/BaseActivity.kt b/app/src/main/java/com/edcan/howtosunrin/base/BaseActivity.kt
@@ -40,6 +40,10 @@ abstract class BaseActivity<D : ViewDataBinding>(
         return true
     }
 
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(R.anim.anim_hold, R.anim.anim_slide_to_right)
+    }
 
     protected val gotoWebEDCAN = {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://edcan.kr"))
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/main/MainActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/main/MainActivity.kt
@@ -34,16 +34,19 @@ class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
     private val gotoActivityQnA = { _: View ->
         val intent = Intent(this, QnASliderActivity::class.java)
         startActivity(intent)
+        overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
     }
 
     private val gotoActivityChat = { _: View ->
         val intent = Intent(this, ChatActivity::class.java)
         intent.putExtra("userData", currentUserData)
         startActivity(intent)
+        overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
     }
 
     private val gotoActivitySaveQnA = { _ : View ->
         val intent = Intent(this, SaveQuestionActivity::class.java)
         startActivity(intent)
+        overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
     }
 }
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/onboard/OnBoardActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/onboard/OnBoardActivity.kt
@@ -37,6 +37,7 @@ class OnBoardActivity : BaseActivity<ActivityOnBoardBinding>(R.layout.activity_o
         startActivity(intent)
 
         super.finish()
+        overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
     }
 
     fun getFragments() : List<Fragment> = listOf(
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/qnaSlider/QnASliderActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/qnaSlider/QnASliderActivity.kt
@@ -44,13 +44,8 @@ class QnASliderActivity : BaseActivity<ActivityQnaSliderBinding>(R.layout.activi
 
             btnQnaRemoveQuestion.setOnClickListener { removeQuestion(getCurrentQuestion()!!) }
         }
-
-//        viewModel.isCurrentQnASave.observe(this){
-//            Log.d("isCurrentQnASave", it.toString())
-//        }
     }
 
-
     fun saveQuestion(questionData : Question) {
         viewModel.saveQuestion(questionData)
         Toast.makeText(this, "질문을 추가했습니다.", Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/savequestion/SaveQuestionActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/savequestion/SaveQuestionActivity.kt
@@ -25,6 +25,7 @@ class SaveQuestionActivity : BaseActivity<ActivitySaveQuestionBinding>(R.layout.
         binding.btnSaveQnAGotoQnA.setOnClickListener {
             val intent = Intent(this, QnASliderActivity::class.java)
             startActivity(intent)
+            overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
         }
 
         viewModel.getSaveQuestions()
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/splash/SplashActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/splash/SplashActivity.kt
@@ -4,18 +4,13 @@ import android.app.Activity
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AppCompatDelegate
 import com.edcan.howtosunrin.R
 import com.edcan.howtosunrin.utill.SharedUtil
 import com.edcan.howtosunrin.utill.chat.ChatDB
 import com.edcan.howtosunrin.utill.qna.DB
 import com.edcan.howtosunrin.utill.user.UserDB
 import com.edcan.howtosunrin.ui.main.MainActivity
 import com.edcan.howtosunrin.ui.onboard.OnBoardActivity
-import com.edcan.howtosunrin.ui.onboard.OnBoardFragment
-import com.edcan.howtosunrin.ui.userData.UserDataActivity
-import com.edcan.howtosunrin.utill.qna.Question
 import com.edcan.howtosunrin.utill.qna.QuestionDatabase
 import kotlinx.coroutines.*
 
@@ -40,7 +35,6 @@ class SplashActivity : AppCompatActivity() {
         SharedUtil.editor = SharedUtil.pref.edit()
 
 
-
         CoroutineScope(Dispatchers.Main).launch {
             val userId = SharedUtil.pref.getString(SharedUtil.keyUserId, "none")
 
@@ -50,15 +44,19 @@ class SplashActivity : AppCompatActivity() {
 
                 val intent = Intent(this@SplashActivity, OnBoardActivity::class.java)
                 startActivity(intent)
+                overridePendingTransition(R.anim.anim_slide_up_before, R.anim.anim_slide_up)
+
                 finish()
             }   else{ //두번째 이상 실행인 경우
+                delay(700)
+
                 val intent = Intent(this@SplashActivity, MainActivity::class.java)
 
                 val userData = userDB.getUserDataById(userId!!)
                 intent.putExtra("userData", userData)
-
-
                 startActivity(intent)
+                overridePendingTransition(R.anim.anim_slide_up_before, R.anim.anim_slide_up)
+
                 finish()
             }
 
diff --git a/app/src/main/java/com/edcan/howtosunrin/ui/userData/UserDataActivity.kt b/app/src/main/java/com/edcan/howtosunrin/ui/userData/UserDataActivity.kt
@@ -53,6 +53,7 @@ class UserDataActivity : BaseActivity<ActivityUserDataBinding>(R.layout.activity
                 intent.putExtra("userData", viewModel.userData)
                 startActivity(intent)
                 finish()
+                overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)
             }
         }
     }
diff --git a/app/src/main/res/anim/anim_hold.xml b/app/src/main/res/anim/anim_hold.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:fromXDelta="0" android:toXDelta="0"
+    android:duration="@android:integer/config_longAnimTime"
+    />
+</set>
diff --git a/app/src/main/res/anim/anim_slide_from_right.xml b/app/src/main/res/anim/anim_slide_from_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:duration="250"
+    android:interpolator="@android:anim/anticipate_interpolator"
+
+    android:fromXDelta="100%"
+    android:toXDelta="0"
+    />
+</set>
diff --git a/app/src/main/res/anim/anim_slide_to_right.xml b/app/src/main/res/anim/anim_slide_to_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:duration="250"
+    android:interpolator="@android:anim/anticipate_interpolator"
+
+    android:fromXDelta="0"
+    android:toXDelta="100%"
+    />
+</set>
diff --git a/app/src/main/res/anim/anim_slide_up.xml b/app/src/main/res/anim/anim_slide_up.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:duration="1000"
+    android:interpolator="@android:anim/anticipate_interpolator"
+
+    android:fromYDelta="0"
+    android:toYDelta="-100%"
+    />
+</set>
diff --git a/app/src/main/res/anim/anim_slide_up_before.xml b/app/src/main/res/anim/anim_slide_up_before.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+<translate
+    android:duration="700"
+    android:interpolator="@android:anim/anticipate_interpolator"
+
+    android:fromYDelta="100%"
+    android:toYDelta="0"
+    />
+</set>
diff --git a/app/src/main/res/drawable/line.xml b/app/src/main/res/drawable/line.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid
-        android:color="@color/gray1"
+        android:color="@color/gray3"
         />
 </shape>

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ abstract class BaseActivity<D : ViewDataBinding>(`
`40`	`40`	`return true`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ override fun finish() {`
	`44`	`+ super.finish()`
	`45`	`+ overridePendingTransition(R.anim.anim_hold, R.anim.anim_slide_to_right)`
	`46`	`+ }`
`43`	`47`
`44`	`48`	`protected val gotoWebEDCAN = {`
`45`	`49`	`val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://edcan.kr"))`
Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,19 @@ class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {`
`34`	`34`	`private val gotoActivityQnA = { _: View ->`
`35`	`35`	`val intent = Intent(this, QnASliderActivity::class.java)`
`36`	`36`	`startActivity(intent)`
	`37`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`private val gotoActivityChat = { _: View ->`
`40`	`41`	`val intent = Intent(this, ChatActivity::class.java)`
`41`	`42`	`intent.putExtra("userData", currentUserData)`
`42`	`43`	`startActivity(intent)`
	`44`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`private val gotoActivitySaveQnA = { _ : View ->`
`46`	`48`	`val intent = Intent(this, SaveQuestionActivity::class.java)`
`47`	`49`	`startActivity(intent)`
	`50`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`48`	`51`	`}`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ class OnBoardActivity : BaseActivity<ActivityOnBoardBinding>(R.layout.activity_o`
`37`	`37`	`startActivity(intent)`
`38`	`38`
`39`	`39`	`super.finish()`
	`40`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`fun getFragments() : List<Fragment> = listOf(`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,8 @@ class QnASliderActivity : BaseActivity<ActivityQnaSliderBinding>(R.layout.activi`
`44`	`44`
`45`	`45`	`btnQnaRemoveQuestion.setOnClickListener { removeQuestion(getCurrentQuestion()!!) }`
`46`	`46`	`}`
`47`		`-`
`48`		`-// viewModel.isCurrentQnASave.observe(this){`
`49`		`-// Log.d("isCurrentQnASave", it.toString())`
`50`		`-// }`
`51`	`47`	`}`
`52`	`48`
`53`		`-`
`54`	`49`	`fun saveQuestion(questionData : Question) {`
`55`	`50`	`viewModel.saveQuestion(questionData)`
`56`	`51`	`Toast.makeText(this, "질문을 추가했습니다.", Toast.LENGTH_LONG).show()`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ class SaveQuestionActivity : BaseActivity<ActivitySaveQuestionBinding>(R.layout.`
`25`	`25`	`binding.btnSaveQnAGotoQnA.setOnClickListener {`
`26`	`26`	`val intent = Intent(this, QnASliderActivity::class.java)`
`27`	`27`	`startActivity(intent)`
	`28`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`viewModel.getSaveQuestions()`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ class UserDataActivity : BaseActivity<ActivityUserDataBinding>(R.layout.activity`
`53`	`53`	`intent.putExtra("userData", viewModel.userData)`
`54`	`54`	`startActivity(intent)`
`55`	`55`	`finish()`
	`56`	`+ overridePendingTransition(R.anim.anim_slide_from_right, R.anim.anim_hold)`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`	`}`