From e1a9e4aa33b36b666aecc2a0401eb6d19192b2b9 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finn@finnmglas.com>
Date: Wed, 17 Jun 2020 09:38:15 +0200
Subject: [PATCH] Fix animations

- Until now only the bottom up (swipe action) animation is implemented
---
 .../main/java/com/finnmglas/launcher/MainActivity.kt   | 10 ++++++++--
 .../java/com/finnmglas/launcher/extern/Functions.kt    |  6 ------
 app/src/main/res/anim/bottom_up.xml                    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index aa8f22c..3768a38 100644
--- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
@@ -80,7 +80,10 @@ class MainActivity : AppCompatActivity(),
         showSettingsIcon()
 
         // As older APIs somehow do not recognize the xml defined onClick
-        activity_main_settings_icon.setOnClickListener() { openSettings(this) }
+        activity_main_settings_icon.setOnClickListener() {
+            openSettings(this)
+            overridePendingTransition(R.anim.bottom_up, android.R.anim.fade_out)
+        }
 
         // Load apps list first - speed up settings that way
         AsyncTask.execute { viewAdapter =
@@ -166,7 +169,10 @@ class MainActivity : AppCompatActivity(),
 
         // Only open if the swipe was not from the phones top edge
         if (diffY < -height / 8 && abs(diffY) > strictness * abs(diffX) && e1.y > 100) launch(downApp, this)
-        else if (diffY > height / 8 && abs(diffY) > strictness * abs(diffX)) launch(upApp, this)
+        else if (diffY > height / 8 && abs(diffY) > strictness * abs(diffX)) {
+            launch(upApp, this)
+            overridePendingTransition(R.anim.bottom_up, android.R.anim.fade_out)
+        }
         else if (diffX > width / 4 && abs(diffX) > strictness * abs(diffY)) launch(leftApp, this)
         else if (diffX < -width / 4 && abs(diffX) > strictness * abs(diffY)) launch(rightApp, this)
 
diff --git a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
index f62c604..f079f5b 100644
--- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
@@ -153,10 +153,6 @@ fun launchApp(packageName: String, context: Context) {
 
     if (intent != null) {
         context.startActivity(intent)
-
-        if (context is Activity) {
-            context.overridePendingTransition(0, 0)
-        }
     } else {
         if (isInstalled(packageName, context)){
 
@@ -218,7 +214,6 @@ fun openAppSettings(pkg :String, context:Context){
 
 fun openSettings(activity: Activity){
     activity.startActivity(Intent(activity, SettingsActivity::class.java))
-    activity.overridePendingTransition(R.anim.bottom_up, android.R.anim.fade_out)
 }
 
 fun openAppsList(activity: Activity){
@@ -226,7 +221,6 @@ fun openAppsList(activity: Activity){
     intent.putExtra("action", "view")
     intendedSettingsPause = true
     activity.startActivity(intent)
-    activity.overridePendingTransition(R.anim.bottom_up, android.R.anim.fade_out)
 }
 
 fun loadSettings(sharedPref : SharedPreferences){
diff --git a/app/src/main/res/anim/bottom_up.xml b/app/src/main/res/anim/bottom_up.xml
index 7832abf..1a128eb 100644
--- a/app/src/main/res/anim/bottom_up.xml
+++ b/app/src/main/res/anim/bottom_up.xml
@@ -5,6 +5,6 @@
         android:fromYDelta="75%p"
         android:toYDelta="0%p"
         android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="150"/>
+        android:duration="100"/>
 
 </set>
\ No newline at end of file