From b63d5c0992cd180acd71fbea74f866df8984e295 Mon Sep 17 00:00:00 2001 From: Chumva Date: Thu, 2 Aug 2018 15:41:16 +0300 Subject: [PATCH] remove cornerAnimator --- .../telegram/ui/MyLocationTabFragment.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt index f1ddd453cb..8332057d09 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt @@ -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()