Skip to content

Commit d138754

Browse files
Mudei as animações de transição do settings para o editor de historico, e as animações de hide/show do fab!
1 parent 6526060 commit d138754

File tree

7 files changed

+54
-22
lines changed

7 files changed

+54
-22
lines changed

app/src/main/java/br/com/samuelnunes/valorantpassbattle/ui/view/viewsCustom/FabBottomNavigationView.kt

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class FabBottomNavigationView @JvmOverloads constructor(
2222
private var fabSize = 0F
2323
private var fabCradleMargin = 0F
2424
private var fabCradleRoundedCornerRadius = 0F
25-
var cradleVerticalOffset = 0F
25+
private var cradleVerticalOffset = 0F
2626

2727
init {
2828
val ta =
@@ -53,26 +53,22 @@ class FabBottomNavigationView @JvmOverloads constructor(
5353
}
5454

5555
fun transform(fab: FloatingActionButton, status: Boolean) {
56-
if (!status) {
57-
fab.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
58-
override fun onHidden(fab: FloatingActionButton?) {
59-
super.onHidden(fab)
60-
ValueAnimator.ofFloat(materialShapeDrawable.interpolation, 0F).apply {
61-
addUpdateListener {
62-
materialShapeDrawable.interpolation = it.animatedValue as Float
63-
}
64-
start()
65-
}
56+
if (status) {
57+
ValueAnimator.ofFloat(materialShapeDrawable.interpolation, 1F).apply {
58+
doOnEnd {
59+
fab.show()
60+
slideUp()
6661
}
67-
})
68-
slideDown()
62+
start()
63+
}
6964
} else {
70-
ValueAnimator.ofFloat(materialShapeDrawable.interpolation, 1F).apply {
71-
addUpdateListener { materialShapeDrawable.interpolation = it.animatedValue as Float }
72-
doOnEnd { fab.show() }
65+
ValueAnimator.ofFloat(materialShapeDrawable.interpolation, 0F).apply {
66+
doOnEnd {
67+
fab.hide()
68+
slideDown()
69+
}
7370
start()
7471
}
75-
slideUp()
7672
}
7773
}
7874
}

app/src/main/java/br/com/samuelnunes/valorantpassbattle/ui/view/viewsCustom/HideBottomNavigation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ open class HideBottomNavigation @JvmOverloads constructor(
6161
}
6262

6363
companion object {
64-
protected const val ENTER_ANIMATION_DURATION = 250
64+
protected const val ENTER_ANIMATION_DURATION = 400
6565
protected const val EXIT_ANIMATION_DURATION = 400
6666
private const val STATE_DOWN = 1
6767
private const val STATE_UP = 2
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<translate
5+
android:duration="1000"
6+
android:fromXDelta="-100%"
7+
android:toXDelta="0%" />
8+
9+
</set>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<translate
5+
android:duration="1000"
6+
android:fromXDelta="100%"
7+
android:toXDelta="0%" />
8+
9+
</set>

app/src/main/res/anim/to_left.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<translate
5+
android:duration="1000"
6+
android:fromXDelta="0%"
7+
android:toXDelta="-100%" />
8+
9+
</set>

app/src/main/res/anim/to_right.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<translate
5+
android:duration="1000"
6+
android:fromXDelta="0%"
7+
android:toXDelta="100%" />
8+
9+
</set>

app/src/main/res/navigation/nav_graph.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
<action
3636
android:id="@+id/action_settingsFragment_to_historicInputFragment"
3737
app:destination="@id/historicInputFragment"
38-
app:enterAnim="@android:anim/slide_in_left"
39-
app:exitAnim="@android:anim/slide_out_right"
40-
app:popEnterAnim="@android:anim/slide_in_left"
41-
app:popExitAnim="@android:anim/slide_out_right" />
38+
app:enterAnim="@anim/from_right"
39+
app:exitAnim="@anim/to_left"
40+
app:popEnterAnim="@anim/from_left"
41+
app:popExitAnim="@anim/to_right" />
4242
<action
4343
android:id="@+id/action_settingsFragment_to_dialogChooseThemes"
4444
app:destination="@id/dialogChooseThemes"

0 commit comments

Comments
 (0)