From ff89afb8c18a39d5c8d2bb09da49b269fbf646c8 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 17 Jun 2023 23:40:10 +0800
Subject: [PATCH] Fix fragment predictive back

---
 .../androidx/navigation/ui/NavigationUI.kt    | 10 +++--
 app/src/main/res/anim/accelerate_quart.xml    | 18 ---------
 app/src/main/res/anim/decelerate_quart.xml    | 18 ---------
 app/src/main/res/anim/decelerate_quint.xml    | 18 ---------
 app/src/main/res/anim/decelerate_terz.xml     | 18 ---------
 app/src/main/res/anim/scene_close_enter.xml   | 28 -------------
 app/src/main/res/anim/scene_close_exit.xml    | 39 -------------------
 app/src/main/res/anim/scene_open_enter.xml    | 38 ------------------
 app/src/main/res/anim/scene_open_exit.xml     | 28 -------------
 9 files changed, 6 insertions(+), 209 deletions(-)
 delete mode 100644 app/src/main/res/anim/accelerate_quart.xml
 delete mode 100644 app/src/main/res/anim/decelerate_quart.xml
 delete mode 100644 app/src/main/res/anim/decelerate_quint.xml
 delete mode 100644 app/src/main/res/anim/decelerate_terz.xml
 delete mode 100644 app/src/main/res/anim/scene_close_enter.xml
 delete mode 100644 app/src/main/res/anim/scene_close_exit.xml
 delete mode 100644 app/src/main/res/anim/scene_open_enter.xml
 delete mode 100644 app/src/main/res/anim/scene_open_exit.xml

diff --git a/app/src/main/java/androidx/navigation/ui/NavigationUI.kt b/app/src/main/java/androidx/navigation/ui/NavigationUI.kt
index 8ff28ed9d..f51c9aabb 100644
--- a/app/src/main/java/androidx/navigation/ui/NavigationUI.kt
+++ b/app/src/main/java/androidx/navigation/ui/NavigationUI.kt
@@ -1,5 +1,6 @@
 package androidx.navigation.ui
 
+import android.annotation.SuppressLint
 import android.view.MenuItem
 import androidx.annotation.IdRes
 import androidx.navigation.ActivityNavigator
@@ -8,6 +9,7 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavOptions
 
+@SuppressLint("PrivateResource")
 fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boolean {
     if (navController.currentDestination?.matchDestination(item.itemId) == true) return true
     val builder = NavOptions.Builder().setLaunchSingleTop(true)
@@ -20,10 +22,10 @@ fun onNavDestinationSelected2(item: MenuItem, navController: NavController): Boo
             .setPopEnterAnim(R.anim.nav_default_pop_enter_anim)
             .setPopExitAnim(R.anim.nav_default_pop_exit_anim)
     } else {
-        builder.setEnterAnim(com.hippo.ehviewer.R.anim.scene_open_enter)
-            .setExitAnim(com.hippo.ehviewer.R.anim.scene_open_exit)
-            .setPopEnterAnim(com.hippo.ehviewer.R.anim.scene_close_enter)
-            .setPopExitAnim(com.hippo.ehviewer.R.anim.scene_close_exit)
+        builder.setEnterAnim(androidx.fragment.R.animator.fragment_open_enter)
+            .setExitAnim(androidx.fragment.R.animator.fragment_open_exit)
+            .setPopEnterAnim(androidx.fragment.R.animator.fragment_close_enter)
+            .setPopExitAnim(androidx.fragment.R.animator.fragment_close_exit)
     }
     val options = builder.build()
     return try {
diff --git a/app/src/main/res/anim/accelerate_quart.xml b/app/src/main/res/anim/accelerate_quart.xml
deleted file mode 100644
index 1ebfe2d31..000000000
--- a/app/src/main/res/anim/accelerate_quart.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:factor="2.0" />
diff --git a/app/src/main/res/anim/decelerate_quart.xml b/app/src/main/res/anim/decelerate_quart.xml
deleted file mode 100644
index 30d0c8081..000000000
--- a/app/src/main/res/anim/decelerate_quart.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:factor="2.0" />
diff --git a/app/src/main/res/anim/decelerate_quint.xml b/app/src/main/res/anim/decelerate_quint.xml
deleted file mode 100644
index bb6e5a55c..000000000
--- a/app/src/main/res/anim/decelerate_quint.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:factor="2.5" />
diff --git a/app/src/main/res/anim/decelerate_terz.xml b/app/src/main/res/anim/decelerate_terz.xml
deleted file mode 100644
index 42eb92099..000000000
--- a/app/src/main/res/anim/decelerate_terz.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:factor="1.5" />
diff --git a/app/src/main/res/anim/scene_close_enter.xml b/app/src/main/res/anim/scene_close_enter.xml
deleted file mode 100644
index a640293f0..000000000
--- a/app/src/main/res/anim/scene_close_enter.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <alpha
-        android:duration="250"
-        android:fillAfter="true"
-        android:fillBefore="true"
-        android:fillEnabled="true"
-        android:fromAlpha="0.7"
-        android:interpolator="@anim/decelerate_terz"
-        android:toAlpha="1.0" />
-
-</set>
diff --git a/app/src/main/res/anim/scene_close_exit.xml b/app/src/main/res/anim/scene_close_exit.xml
deleted file mode 100644
index 23c036195..000000000
--- a/app/src/main/res/anim/scene_close_exit.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-
-    <alpha
-        android:duration="150"
-        android:fillAfter="true"
-        android:fillBefore="false"
-        android:fillEnabled="true"
-        android:fromAlpha="1.0"
-        android:interpolator="@android:interpolator/linear"
-        android:startOffset="100"
-        android:toAlpha="0.0" />
-
-    <translate
-        android:duration="250"
-        android:fillAfter="true"
-        android:fillBefore="true"
-        android:fillEnabled="true"
-        android:fromYDelta="0%"
-        android:interpolator="@anim/accelerate_quart"
-        android:toYDelta="8%" />
-
-</set>
diff --git a/app/src/main/res/anim/scene_open_enter.xml b/app/src/main/res/anim/scene_open_enter.xml
deleted file mode 100644
index 5b11c3e1e..000000000
--- a/app/src/main/res/anim/scene_open_enter.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-
-    <alpha
-        android:duration="200"
-        android:fillAfter="true"
-        android:fillBefore="false"
-        android:fillEnabled="true"
-        android:fromAlpha="0.0"
-        android:interpolator="@anim/decelerate_quart"
-        android:toAlpha="1.0" />
-
-    <translate
-        android:duration="350"
-        android:fillAfter="true"
-        android:fillBefore="true"
-        android:fillEnabled="true"
-        android:fromYDelta="8%"
-        android:interpolator="@anim/decelerate_quint"
-        android:toYDelta="0" />
-
-</set>
diff --git a/app/src/main/res/anim/scene_open_exit.xml b/app/src/main/res/anim/scene_open_exit.xml
deleted file mode 100644
index c637be392..000000000
--- a/app/src/main/res/anim/scene_open_exit.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <alpha
-        android:duration="217"
-        android:fillAfter="true"
-        android:fillBefore="false"
-        android:fillEnabled="true"
-        android:fromAlpha="1.0"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:toAlpha="0.7" />
-
-</set>