blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1430 - Moves magic numbers to constants

master
Jeff Boek 2019-04-05 13:59:27 -07:00
parent 2ce72139e3
commit 26fd32abed
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
View File

@ -9,13 +9,11 @@ import android.view.View
import android.view.ViewGroup
import com.google.android.material.snackbar.BaseTransientBottomBar
import android.view.LayoutInflater
import android.widget.TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM
import androidx.core.widget.TextViewCompat
import kotlinx.android.synthetic.main.fenix_snackbar.view.*
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.increaseTapArea
class FenixSnackbar private constructor(
parent: ViewGroup,
content: View,
@ -24,9 +22,15 @@ class FenixSnackbar private constructor(
init {
view.background = null
content.snackbar_btn.increaseTapArea(16)
content.snackbar_btn.increaseTapArea(increaseTouchableAreaBy)
TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(content.snackbar_text, 12, 18, 1, TypedValue.COMPLEX_UNIT_SP)
TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
content.snackbar_text,
minTextSize,
maxTextSize,
stepGranularity,
TypedValue.COMPLEX_UNIT_SP
)
}
fun setText(text: String) = this.apply {
@ -45,6 +49,11 @@ class FenixSnackbar private constructor(
}
companion object {
private const val minTextSize = 12
private const val maxTextSize = 18
private const val increaseTouchableAreaBy = 16
private const val stepGranularity = 1
fun make(parent: ViewGroup, duration: Int): FenixSnackbar {
val inflater = LayoutInflater.from(parent.context)
val content = inflater.inflate(R.layout.fenix_snackbar, parent, false)
@ -60,25 +69,30 @@ class FenixSnackbar private constructor(
}
}
private class FenixSnackbarCallback (
private class FenixSnackbarCallback(
private val content: View
) : com.google.android.material.snackbar.ContentViewCallback {
) : com.google.android.material.snackbar.ContentViewCallback {
override fun animateContentIn(delay: Int, duration: Int) {
content.scaleY = 0f
content.scaleY = minScaleY
content.animate().apply {
scaleY(1f)
scaleY(maxScaleY)
setDuration(duration.toLong())
startDelay = delay.toLong()
}
}
override fun animateContentOut(delay: Int, duration: Int) {
content.scaleY = 1f
content.scaleY = maxScaleY
content.animate().apply {
scaleY(0f)
scaleY(minScaleY)
setDuration(duration.toLong())
startDelay = delay.toLong()
}
}
companion object {
private const val minScaleY = 0f
private const val maxScaleY = 1f
}
}

2
app/src/main/java/org/mozilla/fenix/utils/ItsNotBrokenSnack.kt
View File

@ -7,9 +7,7 @@ package org.mozilla.fenix.utils
import android.content.Context
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import com.google.android.material.snackbar.Snackbar
import org.mozilla.fenix.R
import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.ext.asActivity
import org.mozilla.fenix.ext.components