From a6470c039ee9b9c7c9d43ae12e1e229330359661 Mon Sep 17 00:00:00 2001
From: preritjn <preritbgr3010@gmail.com>
Date: Fri, 10 Jun 2022 16:33:39 +0530
Subject: [PATCH 1/4] Added Activity Transition Animations

---
 .../src/main/java/com/example/whooby/MainActivity.kt   |  4 ++++
 Whooby/app/src/main/java/com/example/whooby/opening.kt |  8 +++-----
 .../src/main/java/com/example/whooby/splashscreen.kt   | 10 ++++++----
 Whooby/app/src/main/java/com/example/whooby/whooby.kt  |  7 ++++---
 Whooby/app/src/main/res/anim/top_bottom1.xml           |  8 --------
 Whooby/app/src/main/res/anim/top_bottom2.xml           |  9 ---------
 6 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 Whooby/app/src/main/res/anim/top_bottom1.xml
 delete mode 100644 Whooby/app/src/main/res/anim/top_bottom2.xml

diff --git a/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt b/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
index df34c2b9..b0b6506f 100644
--- a/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
@@ -155,6 +155,10 @@ class MainActivity : AppCompatActivity(), TextToSpeech.OnInitListener,AdapterVie
     override fun onNothingSelected(p0: AdapterView<*>?) {
         TODO("Not yet implemented")
     }
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.right_left1,R.anim.right_left2)
+    }
 
 
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/java/com/example/whooby/opening.kt b/Whooby/app/src/main/java/com/example/whooby/opening.kt
index 9cc4d77b..baf81b53 100644
--- a/Whooby/app/src/main/java/com/example/whooby/opening.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/opening.kt
@@ -135,14 +135,12 @@ 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.right_left1,R.anim.right_left2)
         }
     }
 
     override fun onBackPressed() {
-
-        overridePendingTransition(R.anim.top_bottom1, R.anim.top_bottom2)
-        finish()
-
+        overridePendingTransition(R.anim.top_bottom1,R.anim.top_bottom2)
+        super.onBackPressed()
     }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt b/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt
index d7c65bac..5623c3f3 100644
--- 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()
+            Intent(this, Opening::class.java).also {
+                startActivity(it)
+                finish()
+                overridePendingTransition(R.anim.right_left1, R.anim.right_left2)
+            }
         }, 3000)
-    }
+        }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/java/com/example/whooby/whooby.kt b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
index 73630b75..f30d9e4f 100644
--- a/Whooby/app/src/main/java/com/example/whooby/whooby.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
@@ -146,8 +146,9 @@ class whooby : AppCompatActivity() {
                 }
                 null
             }
-
-
-
+    }
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
     }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/top_bottom1.xml b/Whooby/app/src/main/res/anim/top_bottom1.xml
deleted file mode 100644
index 1b4f8fce..00000000
--- a/Whooby/app/src/main/res/anim/top_bottom1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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"/>
-
-</set>
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/top_bottom2.xml b/Whooby/app/src/main/res/anim/top_bottom2.xml
deleted file mode 100644
index 39342d8b..00000000
--- a/Whooby/app/src/main/res/anim/top_bottom2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="200">
-
-    <translate
-        android:fromYDelta="0"
-        android:toYDelta="100"/>
-
-</set>
\ No newline at end of file

From 1739c629b8f2ff8a05d551a1cb760346a6740110 Mon Sep 17 00:00:00 2001
From: preritjn <preritbgr3010@gmail.com>
Date: Fri, 10 Jun 2022 17:24:39 +0530
Subject: [PATCH 2/4] Added top_bottom1.xml & top_bottom2.xml files

---
 Whooby/app/src/main/res/anim/top_bottom1.xml | 8 ++++++++
 Whooby/app/src/main/res/anim/top_bottom2.xml | 9 +++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 Whooby/app/src/main/res/anim/top_bottom1.xml
 create mode 100644 Whooby/app/src/main/res/anim/top_bottom2.xml

diff --git a/Whooby/app/src/main/res/anim/top_bottom1.xml b/Whooby/app/src/main/res/anim/top_bottom1.xml
new file mode 100644
index 00000000..1b4f8fce
--- /dev/null
+++ b/Whooby/app/src/main/res/anim/top_bottom1.xml
@@ -0,0 +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"/>
+
+</set>
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/top_bottom2.xml b/Whooby/app/src/main/res/anim/top_bottom2.xml
new file mode 100644
index 00000000..39342d8b
--- /dev/null
+++ b/Whooby/app/src/main/res/anim/top_bottom2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="200">
+
+    <translate
+        android:fromYDelta="0"
+        android:toYDelta="100"/>
+
+</set>
\ No newline at end of file

From c4f7c7312ad2cb5a2dbb655e69e19abba3bdf68c Mon Sep 17 00:00:00 2001
From: preritjn <preritbgr3010@gmail.com>
Date: Fri, 10 Jun 2022 22:35:30 +0530
Subject: [PATCH 3/4] Added zoom in activity transition

---
 .../app/src/main/java/com/example/whooby/MainActivity.kt | 8 ++------
 Whooby/app/src/main/java/com/example/whooby/opening.kt   | 9 ++-------
 .../app/src/main/java/com/example/whooby/splashscreen.kt | 2 +-
 Whooby/app/src/main/java/com/example/whooby/whooby.kt    | 6 +++---
 .../main/res/anim/{top_bottom1.xml => left_right1.xml}   | 8 ++++----
 .../main/res/anim/{top_bottom2.xml => left_right2.xml}   | 6 +++---
 Whooby/app/src/main/res/anim/right_left1.xml             | 1 -
 7 files changed, 15 insertions(+), 25 deletions(-)
 rename Whooby/app/src/main/res/anim/{top_bottom1.xml => left_right1.xml} (56%)
 rename Whooby/app/src/main/res/anim/{top_bottom2.xml => left_right2.xml} (57%)

diff --git a/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt b/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
index b0b6506f..00f497b6 100644
--- 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
@@ -157,7 +152,8 @@ class MainActivity : AppCompatActivity(), TextToSpeech.OnInitListener,AdapterVie
     }
     override fun onBackPressed() {
         super.onBackPressed()
-        overridePendingTransition(R.anim.right_left1,R.anim.right_left2)
+        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
+        overridePendingTransition(R.anim.left_right1,R.anim.left_right2)
     }
 
 
diff --git a/Whooby/app/src/main/java/com/example/whooby/opening.kt b/Whooby/app/src/main/java/com/example/whooby/opening.kt
index baf81b53..002d5e85 100644
--- 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,12 +135,7 @@ class Opening : AppCompatActivity() {
             val whooby = findViewById<Button>(R.id.whooby_reads)
             whooby.startAnimation(animation);
             startActivity(intent4);
-            overridePendingTransition(R.anim.right_left1,R.anim.right_left2)
+            overridePendingTransition(R.anim.zoom_in,R.anim.empty)
         }
     }
-
-    override fun onBackPressed() {
-        overridePendingTransition(R.anim.top_bottom1,R.anim.top_bottom2)
-        super.onBackPressed()
-    }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt b/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt
index 5623c3f3..3d047181 100644
--- a/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/splashscreen.kt
@@ -32,6 +32,6 @@ class splashscreen : AppCompatActivity() {
                 finish()
                 overridePendingTransition(R.anim.right_left1, R.anim.right_left2)
             }
-        }, 3000)
+        }, 2500)
         }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/java/com/example/whooby/whooby.kt b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
index f30d9e4f..327133c2 100644
--- 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"))
         }
 
 
@@ -149,6 +149,6 @@ class whooby : AppCompatActivity() {
     }
     override fun onBackPressed() {
         super.onBackPressed()
-        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
+        overridePendingTransition(R.anim.left_right1,R.anim.left_right2)
     }
 }
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/top_bottom1.xml b/Whooby/app/src/main/res/anim/left_right1.xml
similarity index 56%
rename from Whooby/app/src/main/res/anim/top_bottom1.xml
rename to Whooby/app/src/main/res/anim/left_right1.xml
index 1b4f8fce..d48f21a4 100644
--- a/Whooby/app/src/main/res/anim/top_bottom1.xml
+++ b/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>
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/top_bottom2.xml b/Whooby/app/src/main/res/anim/left_right2.xml
similarity index 57%
rename from Whooby/app/src/main/res/anim/top_bottom2.xml
rename to Whooby/app/src/main/res/anim/left_right2.xml
index 39342d8b..6df59783 100644
--- a/Whooby/app/src/main/res/anim/top_bottom2.xml
+++ b/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>
\ No newline at end of file
diff --git a/Whooby/app/src/main/res/anim/right_left1.xml b/Whooby/app/src/main/res/anim/right_left1.xml
index 00007fa2..b75da313 100644
--- 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>
\ No newline at end of file

From 61fa35bf5895e6de97df9e413a33791654f15789 Mon Sep 17 00:00:00 2001
From: preritjn <preritbgr3010@gmail.com>
Date: Fri, 10 Jun 2022 23:44:51 +0530
Subject: [PATCH 4/4] added final animations

---
 Whooby/app/src/main/java/com/example/whooby/MainActivity.kt | 1 -
 Whooby/app/src/main/java/com/example/whooby/whooby.kt       | 2 +-
 2 files changed, 1 insertion(+), 2 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
index 00f497b6..14864c2a 100644
--- a/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/MainActivity.kt
@@ -153,7 +153,6 @@ class MainActivity : AppCompatActivity(), TextToSpeech.OnInitListener,AdapterVie
     override fun onBackPressed() {
         super.onBackPressed()
         overridePendingTransition(R.anim.empty,R.anim.zoom_out)
-        overridePendingTransition(R.anim.left_right1,R.anim.left_right2)
     }
 
 
diff --git a/Whooby/app/src/main/java/com/example/whooby/whooby.kt b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
index 327133c2..5fd81616 100644
--- a/Whooby/app/src/main/java/com/example/whooby/whooby.kt
+++ b/Whooby/app/src/main/java/com/example/whooby/whooby.kt
@@ -149,6 +149,6 @@ class whooby : AppCompatActivity() {
     }
     override fun onBackPressed() {
         super.onBackPressed()
-        overridePendingTransition(R.anim.left_right1,R.anim.left_right2)
+        overridePendingTransition(R.anim.empty,R.anim.zoom_out)
     }
 }
\ No newline at end of file