From 91a0438d2877ddc7cd8649375d0c7fa1b8b12983 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Thu, 23 Apr 2020 01:12:47 +0400
Subject: [PATCH] navbar hide fixes

---
 app/app.iml                                   | 10 +++---
 .../com/vanced/manager/ui/MainActivity.kt     | 13 +++++---
 app/src/main/res/anim/fragment_enter_left.xml |  9 ++++++
 .../main/res/anim/fragment_enter_right.xml    |  9 ++++++
 app/src/main/res/anim/fragment_exit_left.xml  |  9 ++++++
 app/src/main/res/anim/fragment_exit_right.xml |  9 ++++++
 app/src/main/res/anim/navbar_enter.xml        |  4 +--
 app/src/main/res/anim/navbar_exit.xml         |  4 +--
 app/src/main/res/anim/view_enter.xml          |  4 +--
 app/src/main/res/anim/view_exit.xml           |  4 +--
 .../main/res/animator/fragment_enter_left.xml | 11 -------
 .../res/animator/fragment_enter_right.xml     | 11 -------
 .../main/res/animator/fragment_exit_left.xml  | 11 -------
 .../main/res/animator/fragment_exit_right.xml | 11 -------
 app/src/main/res/animator/navbar_slide_in.xml | 11 -------
 .../main/res/animator/navbar_slide_out.xml    | 11 -------
 .../main/res/animator/network_slide_in.xml    | 11 -------
 .../main/res/animator/network_slide_out.xml   | 11 -------
 .../main/res/navigation/mobile_navigation.xml | 32 +++++++++----------
 19 files changed, 74 insertions(+), 121 deletions(-)
 create mode 100644 app/src/main/res/anim/fragment_enter_left.xml
 create mode 100644 app/src/main/res/anim/fragment_enter_right.xml
 create mode 100644 app/src/main/res/anim/fragment_exit_left.xml
 create mode 100644 app/src/main/res/anim/fragment_exit_right.xml
 delete mode 100644 app/src/main/res/animator/fragment_enter_left.xml
 delete mode 100644 app/src/main/res/animator/fragment_enter_right.xml
 delete mode 100644 app/src/main/res/animator/fragment_exit_left.xml
 delete mode 100644 app/src/main/res/animator/fragment_exit_right.xml
 delete mode 100644 app/src/main/res/animator/navbar_slide_in.xml
 delete mode 100644 app/src/main/res/animator/navbar_slide_out.xml
 delete mode 100644 app/src/main/res/animator/network_slide_in.xml
 delete mode 100644 app/src/main/res/animator/network_slide_out.xml

diff --git a/app/app.iml b/app/app.iml
index ca568222..f8b4aecc 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -72,15 +72,15 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
index 8289956f..801ef3d2 100644
--- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
@@ -62,13 +62,18 @@ class MainActivity : ThemeActivity() {
             when (currfrag.id) {
 
                 R.id.home_fragment, R.id.settings_fragment -> {
-                    navBar.visibility = View.VISIBLE
-                    navBar.startAnimation(navBarShow)
+
+                    if (navBar.visibility != View.VISIBLE) {
+                        navBar.visibility = View.VISIBLE
+                        navBar.startAnimation(navBarShow)
+                    }
 
                 }
                 else -> {
-                    navBar.startAnimation(navBarHide)
-                    navBar.visibility = View.INVISIBLE
+                    if (navBar.visibility != View.INVISIBLE) {
+                        navBar.startAnimation(navBarHide)
+                        navBar.visibility = View.INVISIBLE
+                    }
                 }
 
             }
diff --git a/app/src/main/res/anim/fragment_enter_left.xml b/app/src/main/res/anim/fragment_enter_left.xml
new file mode 100644
index 00000000..c8341f98
--- /dev/null
+++ b/app/src/main/res/anim/fragment_enter_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="500"
+        android:fromXDelta="100%p"
+        android:toXDelta="0"/>
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fragment_enter_right.xml b/app/src/main/res/anim/fragment_enter_right.xml
new file mode 100644
index 00000000..39322b2f
--- /dev/null
+++ b/app/src/main/res/anim/fragment_enter_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="500"
+        android:fromXDelta="-100%p"
+        android:toXDelta="0"/>
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fragment_exit_left.xml b/app/src/main/res/anim/fragment_exit_left.xml
new file mode 100644
index 00000000..3709e053
--- /dev/null
+++ b/app/src/main/res/anim/fragment_exit_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="500"
+        android:fromXDelta="0"
+        android:toXDelta="100%p" />
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/fragment_exit_right.xml b/app/src/main/res/anim/fragment_exit_right.xml
new file mode 100644
index 00000000..cfce32dd
--- /dev/null
+++ b/app/src/main/res/anim/fragment_exit_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <translate
+        android:duration="500"
+        android:fromXDelta="0"
+        android:toXDelta="-100%p"/>
+
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/navbar_enter.xml b/app/src/main/res/anim/navbar_enter.xml
index 009a0d83..7ae0bf3c 100644
--- a/app/src/main/res/anim/navbar_enter.xml
+++ b/app/src/main/res/anim/navbar_enter.xml
@@ -2,8 +2,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="500"
-        android:fromYDelta="-100%p"
+        android:duration="1000"
+        android:fromYDelta="100%p"
         android:toYDelta="0" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/navbar_exit.xml b/app/src/main/res/anim/navbar_exit.xml
index b107298b..64da12cd 100644
--- a/app/src/main/res/anim/navbar_exit.xml
+++ b/app/src/main/res/anim/navbar_exit.xml
@@ -2,8 +2,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="500"
+        android:duration="1000"
         android:fromYDelta="0"
-        android:toYDelta="-100%p" />
+        android:toYDelta="100%p" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/view_enter.xml b/app/src/main/res/anim/view_enter.xml
index c5f2bf6c..8afae77e 100644
--- a/app/src/main/res/anim/view_enter.xml
+++ b/app/src/main/res/anim/view_enter.xml
@@ -2,8 +2,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="500"
-        android:fromYDelta="100%p"
+        android:duration="800"
+        android:fromYDelta="-100%p"
         android:toYDelta="0" />
 
 </set>
diff --git a/app/src/main/res/anim/view_exit.xml b/app/src/main/res/anim/view_exit.xml
index 5ce4d0ee..d7a43d71 100644
--- a/app/src/main/res/anim/view_exit.xml
+++ b/app/src/main/res/anim/view_exit.xml
@@ -2,8 +2,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <translate
-        android:duration="500"
+        android:duration="800"
         android:fromYDelta="0"
-        android:toYDelta="100%p" />
+        android:toYDelta="-100%p" />
 
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/fragment_enter_left.xml b/app/src/main/res/animator/fragment_enter_left.xml
deleted file mode 100644
index 2157e27c..00000000
--- a/app/src/main/res/animator/fragment_enter_left.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="x"
-        android:valueFrom="-1200"
-        android:valueTo="0"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/fragment_enter_right.xml b/app/src/main/res/animator/fragment_enter_right.xml
deleted file mode 100644
index 0a2b2f41..00000000
--- a/app/src/main/res/animator/fragment_enter_right.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="x"
-        android:valueFrom="1200"
-        android:valueTo="0"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/fragment_exit_left.xml b/app/src/main/res/animator/fragment_exit_left.xml
deleted file mode 100644
index b4b73f57..00000000
--- a/app/src/main/res/animator/fragment_exit_left.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="x"
-        android:valueFrom="0"
-        android:valueTo="-1200"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/fragment_exit_right.xml b/app/src/main/res/animator/fragment_exit_right.xml
deleted file mode 100644
index a203892b..00000000
--- a/app/src/main/res/animator/fragment_exit_right.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="x"
-        android:valueFrom="0"
-        android:valueTo="1200"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/navbar_slide_in.xml b/app/src/main/res/animator/navbar_slide_in.xml
deleted file mode 100644
index 443dc98b..00000000
--- a/app/src/main/res/animator/navbar_slide_in.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="y"
-        android:valueFrom="-1000"
-        android:valueTo="0"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/navbar_slide_out.xml b/app/src/main/res/animator/navbar_slide_out.xml
deleted file mode 100644
index c39ca438..00000000
--- a/app/src/main/res/animator/navbar_slide_out.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="y"
-        android:valueFrom="0"
-        android:valueTo="-1000"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/network_slide_in.xml b/app/src/main/res/animator/network_slide_in.xml
deleted file mode 100644
index a215c764..00000000
--- a/app/src/main/res/animator/network_slide_in.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="y"
-        android:valueFrom="1000"
-        android:valueTo="0"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/animator/network_slide_out.xml b/app/src/main/res/animator/network_slide_out.xml
deleted file mode 100644
index 146141e8..00000000
--- a/app/src/main/res/animator/network_slide_out.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:duration="500"
-        android:propertyName="y"
-        android:valueFrom="0"
-        android:valueTo="1000"
-        android:valueType="floatType" />
-
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index f5b3738b..01186f29 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -23,10 +23,10 @@
         <action
             android:id="@+id/toInstallThemeFragment"
             app:destination="@id/install_theme_fragment"
-            app:enterAnim="@animator/fragment_enter_right"
-            app:exitAnim="@animator/fragment_exit_left"
-            app:popEnterAnim="@animator/fragment_enter_left"
-            app:popExitAnim="@animator/fragment_exit_right" />
+            app:enterAnim="@anim/fragment_enter_right"
+            app:exitAnim="@anim/fragment_exit_left"
+            app:popEnterAnim="@anim/fragment_enter_left"
+            app:popExitAnim="@anim/fragment_exit_right" />
 
     </fragment>
 
@@ -60,10 +60,10 @@
         <action
             android:id="@+id/toInstallVariantFragment"
             app:destination="@id/install_variant_fragment"
-            app:enterAnim="@animator/fragment_enter_right"
-            app:exitAnim="@animator/fragment_exit_left"
-            app:popEnterAnim="@animator/fragment_enter_left"
-            app:popExitAnim="@animator/fragment_exit_right" />
+            app:enterAnim="@anim/fragment_enter_right"
+            app:exitAnim="@anim/fragment_exit_left"
+            app:popEnterAnim="@anim/fragment_enter_left"
+            app:popExitAnim="@anim/fragment_exit_right" />
 
     </fragment>
 
@@ -76,10 +76,10 @@
         <action
             android:id="@+id/toInstallLanguageFragment"
             app:destination="@id/install_language_fragment"
-            app:enterAnim="@animator/fragment_enter_right"
-            app:exitAnim="@animator/fragment_exit_left"
-            app:popEnterAnim="@animator/fragment_enter_left"
-            app:popExitAnim="@animator/fragment_exit_right" />
+            app:enterAnim="@anim/fragment_enter_right"
+            app:exitAnim="@anim/fragment_exit_left"
+            app:popEnterAnim="@anim/fragment_enter_left"
+            app:popExitAnim="@anim/fragment_exit_right" />
 
     </fragment>
 
@@ -92,10 +92,10 @@
         <action
             android:id="@+id/action_installTo_homeFragment"
             app:destination="@id/home_fragment"
-            app:enterAnim="@animator/fragment_enter_left"
-            app:exitAnim="@animator/fragment_exit_right"
-            app:popEnterAnim="@animator/fragment_enter_right"
-            app:popExitAnim="@animator/fragment_exit_left"
+            app:enterAnim="@anim/fragment_enter_left"
+            app:exitAnim="@anim/fragment_exit_right"
+            app:popEnterAnim="@anim/fragment_enter_right"
+            app:popExitAnim="@anim/fragment_exit_left"
             app:popUpTo="@id/home_fragment"
             app:popUpToInclusive="true"/>