Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-08 20:12:39 +01:00
Code Issues Releases Activity

Merge pull request #1623 from AllanWang/nav-header-click-no-animations

Browse Source 
Nav header no anim fix
This commit is contained in:
Allan Wang 2020-01-19 22:31:23 -08:00 committed by GitHub
commit 5803459e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
View File

@ -29,6 +29,7 @@ import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup
import android.webkit.ValueCallback import android.webkit.ValueCallback
import android.webkit.WebChromeClient import android.webkit.WebChromeClient
import android.webkit.WebView import android.webkit.WebView
@ -63,6 +64,7 @@ import ca.allanwang.kau.utils.string
import ca.allanwang.kau.utils.tint import ca.allanwang.kau.utils.tint
import ca.allanwang.kau.utils.toDrawable import ca.allanwang.kau.utils.toDrawable
import ca.allanwang.kau.utils.toast import ca.allanwang.kau.utils.toast
import ca.allanwang.kau.utils.unboundedHeight
import ca.allanwang.kau.utils.visible import ca.allanwang.kau.utils.visible
import ca.allanwang.kau.utils.withAlpha import ca.allanwang.kau.utils.withAlpha
import ca.allanwang.kau.utils.withMinAlpha import ca.allanwang.kau.utils.withMinAlpha
@ -127,10 +129,10 @@ import com.pitchedapps.frost.views.BadgedIcon
import com.pitchedapps.frost.views.FrostVideoViewer import com.pitchedapps.frost.views.FrostVideoViewer
import com.pitchedapps.frost.views.FrostViewPager import com.pitchedapps.frost.views.FrostViewPager
import com.pitchedapps.frost.widgets.NotificationWidget import com.pitchedapps.frost.widgets.NotificationWidget
import kotlin.math.abs
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.koin.android.ext.android.inject import org.koin.android.ext.android.inject
import kotlin.math.abs
/** /**
* Created by Allan Wang on 20/12/17. * Created by Allan Wang on 20/12/17.
@ -402,14 +404,14 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
with(binding) { with(binding) {
optionsContainer.setBackgroundColor(optionsBackground) optionsContainer.setBackgroundColor(optionsBackground)
var showOptions = false var showOptions = false
val animator: ProgressAnimator = ProgressAnimator.ofFloat { } val animator: ProgressAnimator = ProgressAnimator.ofFloat()
background.setOnClickListener { background.setOnClickListener {
animator.reset() animator.reset()
if (showOptions) { if (showOptions) {
animator.apply { animator.apply {
withAnimator(optionsContainer.height.toFloat(), 0f) { withAnimator(optionsContainer.height, 0) {
optionsContainer.updateLayoutParams { optionsContainer.updateLayoutParams {
height = it.toInt() height = it
} }
} }
withAnimator(arrow.rotation, 0f) { withAnimator(arrow.rotation, 0f) {
@ -420,25 +422,27 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
} }
} }
} else { } else {
optionsContainer.visible()
animator.apply { animator.apply {
optionsContainer.measure(
View.MeasureSpec.UNSPECIFIED,
View.MeasureSpec.UNSPECIFIED
)
withAnimator( withAnimator(
optionsContainer.height.toFloat(), optionsContainer.height,
optionsContainer.measuredHeight.toFloat() optionsContainer.unboundedHeight
) { ) {
optionsContainer.updateLayoutParams { optionsContainer.updateLayoutParams {
height = it.toInt() height = it
}
}
withEndAction {
// Sometimes, height remains the same as measured during collapse
// if the animations are disabled.
// We will resolve this by always falling back to wrap content afterwards
optionsContainer.updateLayoutParams {
height = ViewGroup.LayoutParams.WRAP_CONTENT
} }
} }
withAnimator(arrow.rotation, 180f) { withAnimator(arrow.rotation, 180f) {
arrow.rotation = it arrow.rotation = it
} }
withStartAction {
optionsContainer.visible()
}
} }
} }
showOptions = !showOptions showOptions = !showOptions

2
gradle.properties
View File

@ -16,7 +16,7 @@ org.gradle.daemon = true
APP_ID=Frost APP_ID=Frost
APP_GROUP=com.pitchedapps APP_GROUP=com.pitchedapps
KAU=3aab8b2 KAU=4919fb3
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true