Skip to content

Fix fire animation #1199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2021
Merged

Fix fire animation #1199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347c9ea
Fix fire animation
jamie23 Apr 21, 2021
638afa4
Animator duration scale lookup defaults to 0.0f
jamie23 Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import android.animation.Animator
import android.animation.ValueAnimator
import android.content.Context
import android.os.Bundle
import android.provider.Settings
import android.provider.Settings.Global.ANIMATOR_DURATION_SCALE
import androidx.core.content.ContextCompat
import androidx.core.view.doOnDetach
import androidx.core.view.isVisible
Expand Down Expand Up @@ -140,7 +142,12 @@ class FireDialog(
}
}

private fun animationEnabled() = settingsDataStore.fireAnimationEnabled
private fun animationEnabled() = settingsDataStore.fireAnimationEnabled && animatorDurationEnabled()

private fun animatorDurationEnabled(): Boolean {
val animatorScale = Settings.Global.getFloat(context.contentResolver, ANIMATOR_DURATION_SCALE, 0.0f)
return animatorScale != 0.0f
}

private fun playAnimation() {
window?.navigationBarColor = ContextCompat.getColor(context, R.color.black)
Expand Down