Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove cornerAnimator

Browse source
This commit is contained in:
Chumva 2018-08-02 15:41:16 +03:00
parent f58498dee9
commit b63d5c0992
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
View file

@ -280,17 +280,17 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
}
private fun adjustSearchBox() {
val cornerRadiusFrom = if (appBarCollapsed) searchBoxHeight / 2 else 0
val cornerRadiusTo = if (appBarCollapsed) 0 else searchBoxHeight / 2
val marginFrom = if (appBarCollapsed) searchBoxSidesMargin else 0
val marginTo = if (appBarCollapsed) 0 else searchBoxSidesMargin
// val cornerRadiusFrom = if (appBarCollapsed) searchBoxHeight / 2 else 0
// val cornerRadiusTo = if (appBarCollapsed) 0 else searchBoxHeight / 2
// val marginFrom = if (appBarCollapsed) searchBoxSidesMargin else 0
// val marginTo = if (appBarCollapsed) 0 else searchBoxSidesMargin
val cornerAnimator = ObjectAnimator.ofFloat(
searchBoxBg,
"cornerRadius",
cornerRadiusFrom.toFloat(),
cornerRadiusTo.toFloat()
)
// val cornerAnimator = ObjectAnimator.ofFloat(
// searchBoxBg,
// "cornerRadius",
// cornerRadiusFrom.toFloat(),
// cornerRadiusTo.toFloat()
// )
// val marginAnimator = ValueAnimator.ofInt(marginFrom, marginTo)
// marginAnimator.addUpdateListener {
@ -302,7 +302,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
AnimatorSet().apply {
duration = 200
play(cornerAnimator)
// playTogether(cornerAnimator, marginAnimator)
addListener(object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator?) {
updateTitleTextColor()