Merge pull request #35 from preritjn/anim

Added Activity Transition Animations
Philotes-exceptus · Jun 11, 2022 · 1989ad1 · 1989ad1
2 parents 68a7ba8 + 61fa35b
commit 1989ad1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 32 deletions.
diff --git a/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt b/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
@@ -1,16 +1,11 @@
 package com.example.whooby
 
-import CustomAdapter
 import android.os.Bundle
 import android.speech.tts.TextToSpeech
 import android.util.Log
 import android.view.View
-import android.view.animation.AlphaAnimation
-import android.view.animation.Animation
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import java.util.*
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
@@ -159,6 +154,10 @@ class MainActivity : AppCompatActivity(), TextToSpeech.OnInitListener,AdapterVie
     override fun onNothingSelected(p0: AdapterView<*>?) {
         TODO("Not yet implemented")
     }
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
+    }
 
 
 }
diff --git a/Whooby/app/src/main/java/com/example/whooby/opening.kt b/Whooby/app/src/main/java/com/example/whooby/opening.kt
@@ -115,7 +115,7 @@ class Opening : AppCompatActivity() {
             val whooby = findViewById<Button>(R.id.whooby_button)
             whooby.startAnimation(animation)
             startActivity(intent3)
-            overridePendingTransition(R.anim.right_left1, R.anim.right_left2)
+            overridePendingTransition(R.anim.zoom_in, R.anim.empty)
 //            val handler = Handler()
 //            handler.postDelayed(Runnable {
 //
@@ -135,14 +135,7 @@ class Opening : AppCompatActivity() {
             val whooby = findViewById<Button>(R.id.whooby_reads)
             whooby.startAnimation(animation);
             startActivity(intent4);
-            overridePendingTransition(R.anim.zoom_in, R.anim.empty)
+            overridePendingTransition(R.anim.zoom_in,R.anim.empty)
         }
     }
-
-    override fun onBackPressed() {
-
-        overridePendingTransition(R.anim.top_bottom1, R.anim.top_bottom2)
-        finish()
-
-    }
 }
diff --git a/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt b/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt
@@ -27,9 +27,11 @@ class splashscreen : AppCompatActivity() {
         )
 
         Handler().postDelayed({
-            val intent = Intent(this, Opening::class.java)
-            startActivity(intent)
-            finish()
-        }, 3000)
-    }
+            Intent(this, Opening::class.java).also {
+                startActivity(it)
+                finish()
+                overridePendingTransition(R.anim.right_left1, R.anim.right_left2)
+            }
+        }, 2500)
+        }
 }
diff --git a/Whooby/app/src/main/java/com/example/whooby/whooby.kt b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
@@ -33,7 +33,7 @@ class whooby : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.whooby)
 
-         backgroundSceneView = findViewById(R.id.backgroundSceneView);
+         backgroundSceneView = findViewById(R.id.backgroundSceneView)
 
 
         loadModels();
@@ -64,7 +64,7 @@ class whooby : AppCompatActivity() {
         val data = ArrayList<ItemsViewModel>()
 
         for (i in 1..20) {
-            data.add(ItemsViewModel("Item " + i))
+            data.add(ItemsViewModel("Item $i"))
         }
 
 
@@ -146,8 +146,9 @@ class whooby : AppCompatActivity() {
                 }
                 null
             }
-
-
-
+    }
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
     }
 }
diff --git a/Whooby/app/src/main/res/anim/top_bottom1.xml → Whooby/app/src/main/res/anim/left_right1.xml b/Whooby/app/src/main/res/anim/top_bottom1.xml → Whooby/app/src/main/res/anim/left_right1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200">
-    <translate
-        android:fromYDelta="-100"
-        android:toYDelta="0"/>
+    android:duration="400">
 
+    <translate
+        android:fromXDelta="-100%"
+        android:toXDelta="0%"/>
 </set>
diff --git a/Whooby/app/src/main/res/anim/top_bottom2.xml → Whooby/app/src/main/res/anim/left_right2.xml b/Whooby/app/src/main/res/anim/top_bottom2.xml → Whooby/app/src/main/res/anim/left_right2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200">
+    android:duration="400">
 
     <translate
-        android:fromYDelta="0"
-        android:toYDelta="100"/>
+        android:fromXDelta="0%"
+        android:toXDelta="100%"/>
 
 </set>
diff --git a/Whooby/app/src/main/res/anim/right_left1.xml b/Whooby/app/src/main/res/anim/right_left1.xml
@@ -5,5 +5,4 @@
     <translate
         android:fromXDelta="100%"
         android:toXDelta="0%"/>
-
 </set>