mirror of
https://github.com/YTVanced/VancedManager
synced 2024-11-22 11:15:10 +00:00
navbar hide fixes
This commit is contained in:
parent
d45230df05
commit
91a0438d28
19 changed files with 74 additions and 121 deletions
10
app/app.iml
10
app/app.iml
|
@ -72,15 +72,15 @@
|
||||||
<content url="file://$MODULE_DIR$">
|
<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/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/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/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/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/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/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/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/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
|
||||||
|
|
|
@ -62,13 +62,18 @@ class MainActivity : ThemeActivity() {
|
||||||
when (currfrag.id) {
|
when (currfrag.id) {
|
||||||
|
|
||||||
R.id.home_fragment, R.id.settings_fragment -> {
|
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 -> {
|
else -> {
|
||||||
navBar.startAnimation(navBarHide)
|
if (navBar.visibility != View.INVISIBLE) {
|
||||||
navBar.visibility = View.INVISIBLE
|
navBar.startAnimation(navBarHide)
|
||||||
|
navBar.visibility = View.INVISIBLE
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
9
app/src/main/res/anim/fragment_enter_left.xml
Normal file
9
app/src/main/res/anim/fragment_enter_left.xml
Normal file
|
@ -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>
|
9
app/src/main/res/anim/fragment_enter_right.xml
Normal file
9
app/src/main/res/anim/fragment_enter_right.xml
Normal file
|
@ -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>
|
9
app/src/main/res/anim/fragment_exit_left.xml
Normal file
9
app/src/main/res/anim/fragment_exit_left.xml
Normal file
|
@ -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>
|
9
app/src/main/res/anim/fragment_exit_right.xml
Normal file
9
app/src/main/res/anim/fragment_exit_right.xml
Normal file
|
@ -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>
|
|
@ -2,8 +2,8 @@
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<translate
|
<translate
|
||||||
android:duration="500"
|
android:duration="1000"
|
||||||
android:fromYDelta="-100%p"
|
android:fromYDelta="100%p"
|
||||||
android:toYDelta="0" />
|
android:toYDelta="0" />
|
||||||
|
|
||||||
</set>
|
</set>
|
|
@ -2,8 +2,8 @@
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<translate
|
<translate
|
||||||
android:duration="500"
|
android:duration="1000"
|
||||||
android:fromYDelta="0"
|
android:fromYDelta="0"
|
||||||
android:toYDelta="-100%p" />
|
android:toYDelta="100%p" />
|
||||||
|
|
||||||
</set>
|
</set>
|
|
@ -2,8 +2,8 @@
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<translate
|
<translate
|
||||||
android:duration="500"
|
android:duration="800"
|
||||||
android:fromYDelta="100%p"
|
android:fromYDelta="-100%p"
|
||||||
android:toYDelta="0" />
|
android:toYDelta="0" />
|
||||||
|
|
||||||
</set>
|
</set>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
<translate
|
<translate
|
||||||
android:duration="500"
|
android:duration="800"
|
||||||
android:fromYDelta="0"
|
android:fromYDelta="0"
|
||||||
android:toYDelta="100%p" />
|
android:toYDelta="-100%p" />
|
||||||
|
|
||||||
</set>
|
</set>
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -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>
|
|
|
@ -23,10 +23,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/toInstallThemeFragment"
|
android:id="@+id/toInstallThemeFragment"
|
||||||
app:destination="@id/install_theme_fragment"
|
app:destination="@id/install_theme_fragment"
|
||||||
app:enterAnim="@animator/fragment_enter_right"
|
app:enterAnim="@anim/fragment_enter_right"
|
||||||
app:exitAnim="@animator/fragment_exit_left"
|
app:exitAnim="@anim/fragment_exit_left"
|
||||||
app:popEnterAnim="@animator/fragment_enter_left"
|
app:popEnterAnim="@anim/fragment_enter_left"
|
||||||
app:popExitAnim="@animator/fragment_exit_right" />
|
app:popExitAnim="@anim/fragment_exit_right" />
|
||||||
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
|
@ -60,10 +60,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/toInstallVariantFragment"
|
android:id="@+id/toInstallVariantFragment"
|
||||||
app:destination="@id/install_variant_fragment"
|
app:destination="@id/install_variant_fragment"
|
||||||
app:enterAnim="@animator/fragment_enter_right"
|
app:enterAnim="@anim/fragment_enter_right"
|
||||||
app:exitAnim="@animator/fragment_exit_left"
|
app:exitAnim="@anim/fragment_exit_left"
|
||||||
app:popEnterAnim="@animator/fragment_enter_left"
|
app:popEnterAnim="@anim/fragment_enter_left"
|
||||||
app:popExitAnim="@animator/fragment_exit_right" />
|
app:popExitAnim="@anim/fragment_exit_right" />
|
||||||
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
|
@ -76,10 +76,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/toInstallLanguageFragment"
|
android:id="@+id/toInstallLanguageFragment"
|
||||||
app:destination="@id/install_language_fragment"
|
app:destination="@id/install_language_fragment"
|
||||||
app:enterAnim="@animator/fragment_enter_right"
|
app:enterAnim="@anim/fragment_enter_right"
|
||||||
app:exitAnim="@animator/fragment_exit_left"
|
app:exitAnim="@anim/fragment_exit_left"
|
||||||
app:popEnterAnim="@animator/fragment_enter_left"
|
app:popEnterAnim="@anim/fragment_enter_left"
|
||||||
app:popExitAnim="@animator/fragment_exit_right" />
|
app:popExitAnim="@anim/fragment_exit_right" />
|
||||||
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
|
@ -92,10 +92,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_installTo_homeFragment"
|
android:id="@+id/action_installTo_homeFragment"
|
||||||
app:destination="@id/home_fragment"
|
app:destination="@id/home_fragment"
|
||||||
app:enterAnim="@animator/fragment_enter_left"
|
app:enterAnim="@anim/fragment_enter_left"
|
||||||
app:exitAnim="@animator/fragment_exit_right"
|
app:exitAnim="@anim/fragment_exit_right"
|
||||||
app:popEnterAnim="@animator/fragment_enter_right"
|
app:popEnterAnim="@anim/fragment_enter_right"
|
||||||
app:popExitAnim="@animator/fragment_exit_left"
|
app:popExitAnim="@anim/fragment_exit_left"
|
||||||
app:popUpTo="@id/home_fragment"
|
app:popUpTo="@id/home_fragment"
|
||||||
app:popUpToInclusive="true"/>
|
app:popUpToInclusive="true"/>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue