Commit 0f0e0b26 authored by Mygod's avatar Mygod

Update dependencies

parent 1c785834
......@@ -26,7 +26,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0-beta03'
classpath 'com.android.tools.build:gradle:3.5.0-beta04'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
......
......@@ -45,17 +45,20 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private lateinit var txRateText: TextView
private lateinit var rxRateText: TextView
private val tester = ViewModelProviders.of(context as FragmentActivity).get<HttpsTest>()
private val behavior = object : Behavior() {
private lateinit var behavior: Behavior
override fun getBehavior(): Behavior {
if (!this::behavior.isInitialized) behavior = object : Behavior() {
val threshold = context.resources.getDimensionPixelSize(R.dimen.stats_bar_scroll_threshold)
override fun onNestedScroll(coordinatorLayout: CoordinatorLayout, child: BottomAppBar, target: View,
dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int, type: Int,
consumed: IntArray) {
dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int,
type: Int, consumed: IntArray) {
val dy = dyConsumed + dyUnconsumed
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, if (Math.abs(dy) >= threshold) dy else 0,
dxUnconsumed, 0, type, consumed)
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed,
if (Math.abs(dy) >= threshold) dy else 0, dxUnconsumed, 0, type, consumed)
}
}
override fun getBehavior() = behavior
return behavior
}
override fun setOnClickListener(l: OnClickListener?) {
statusText = findViewById(R.id.status)
......
......@@ -54,7 +54,7 @@ mavenPublish {
dependencies {
api 'androidx.core:core-ktx:1.1.0-rc01'
api 'com.google.android.material:material:1.1.0-alpha06'
api 'com.google.android.material:material:1.1.0-alpha07'
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test:runner:$androidTestVersion"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment