From 096e7714a76221b1edcca6d59640b4f00643d73d Mon Sep 17 00:00:00 2001 From: Tom Longhurst Date: Tue, 20 Aug 2019 09:43:34 +0100 Subject: [PATCH] Targeting latest SDK Version Upgraded Kotlin to 1.3.41 Migrated from support library to AndroidX Upgraded Gradle to 5.1.1 --- app/build.gradle | 2 +- .../flashbardemo/JavaSampleActivity.java | 9 ++-- .../flashbardemo/KotlinSampleActivity.kt | 4 +- build.gradle | 9 ++-- flashbar/build.gradle | 8 +-- .../java/com/andrognito/flashbar/Flashbar.kt | 4 +- .../flashbar/FlashbarContainerView.kt | 2 +- .../com/andrognito/flashbar/FlashbarView.kt | 7 ++- .../flashbar/SwipeDismissTouchListener.kt | 15 +++--- .../flashbar/anim/BaseFlashAnimBuilder.kt | 4 +- .../flashbar/anim/FlashAnimBarBuilder.kt | 8 +-- .../flashbar/anim/FlashAnimIconBuilder.kt | 2 +- .../andrognito/flashbar/util/CommonUtils.kt | 7 +-- .../andrognito/flashbar/view/FbProgress.kt | 52 ++++++++++--------- .../andrognito/flashbar/view/ShadowView.kt | 4 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- 17 files changed, 76 insertions(+), 67 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc340fa..64aecf5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,6 @@ android { dependencies { implementation project(':flashbar') - implementation "com.android.support:appcompat-v7:$versions.supportVersion" + implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" } diff --git a/app/src/main/java/com/andrognito/flashbardemo/JavaSampleActivity.java b/app/src/main/java/com/andrognito/flashbardemo/JavaSampleActivity.java index cfebb97..0b302cf 100644 --- a/app/src/main/java/com/andrognito/flashbardemo/JavaSampleActivity.java +++ b/app/src/main/java/com/andrognito/flashbardemo/JavaSampleActivity.java @@ -2,14 +2,15 @@ import android.graphics.Typeface; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.ImageView.ScaleType; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; + import com.andrognito.flashbar.Flashbar; import com.andrognito.flashbar.anim.FlashAnim; @@ -267,7 +268,7 @@ private Flashbar progressAdvanced() { return new Flashbar.Builder(this) .gravity(Flashbar.Gravity.BOTTOM) .message( - "You can customize the look-and-fell of the progress bar.") + "You can customize the look-and-feel of the progress bar.") .backgroundColorRes(R.color.slate_black) .showIcon() .showProgress(Flashbar.ProgressPosition.RIGHT) diff --git a/app/src/main/java/com/andrognito/flashbardemo/KotlinSampleActivity.kt b/app/src/main/java/com/andrognito/flashbardemo/KotlinSampleActivity.kt index 39cd0e6..a50c4ef 100644 --- a/app/src/main/java/com/andrognito/flashbardemo/KotlinSampleActivity.kt +++ b/app/src/main/java/com/andrognito/flashbardemo/KotlinSampleActivity.kt @@ -2,9 +2,9 @@ package com.andrognito.flashbardemo import android.graphics.Typeface import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.app.AppCompatActivity import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat import com.andrognito.flashbar.Flashbar import com.andrognito.flashbar.anim.FlashAnim import kotlinx.android.synthetic.main.activity_main.* diff --git a/build.gradle b/build.gradle index 3aa8d3b..368010e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,16 @@ buildscript { ext.versions = [ sdkMin : 14, - sdkTarget : 27, - kotlin : '1.2.50', - supportVersion: '27.1.1' + sdkTarget : 29, + kotlin : '1.3.41' ] - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.3.41' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' diff --git a/flashbar/build.gradle b/flashbar/build.gradle index 60ae23b..01a1fee 100644 --- a/flashbar/build.gradle +++ b/flashbar/build.gradle @@ -15,7 +15,7 @@ ext { siteUrl = 'https://github.com/aritraroy/Flashbar' gitUrl = 'https://github.com/aritraroy/Flashbar.git' - libraryVersion = '1.0.2' + libraryVersion = '1.0.4' developerId = 'aritraroy' developerName = 'Aritra Roy' @@ -32,15 +32,15 @@ android { defaultConfig { minSdkVersion versions.sdkMin targetSdkVersion versions.sdkTarget - versionCode 3 - versionName "1.0.2" + versionCode 5 + versionName "1.0.4" consumerProguardFiles 'proguard-rules.pro' } } dependencies { - implementation "com.android.support:appcompat-v7:$versions.supportVersion" + implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" } diff --git a/flashbar/src/main/java/com/andrognito/flashbar/Flashbar.kt b/flashbar/src/main/java/com/andrognito/flashbar/Flashbar.kt index d81f4f2..ce0d9fc 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/Flashbar.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/Flashbar.kt @@ -5,11 +5,11 @@ import android.graphics.Bitmap import android.graphics.PorterDuff import android.graphics.Typeface import android.graphics.drawable.Drawable -import android.support.annotation.* -import android.support.v4.content.ContextCompat import android.text.Spanned import android.widget.ImageView.ScaleType import android.widget.ImageView.ScaleType.CENTER_CROP +import androidx.annotation.* +import androidx.core.content.ContextCompat import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM import com.andrognito.flashbar.Flashbar.Gravity.TOP import com.andrognito.flashbar.anim.FlashAnim diff --git a/flashbar/src/main/java/com/andrognito/flashbar/FlashbarContainerView.kt b/flashbar/src/main/java/com/andrognito/flashbar/FlashbarContainerView.kt index a6ea1e7..d4d23eb 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/FlashbarContainerView.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/FlashbarContainerView.kt @@ -121,7 +121,7 @@ internal class FlashbarContainerView(context: Context) } internal fun adjustOrientation(activity: Activity) { - val flashbarContainerViewLp = RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT) + val flashbarContainerViewLp = LayoutParams(MATCH_PARENT, MATCH_PARENT) val navigationBarPosition = activity.getNavigationBarPosition() val navigationBarSize = activity.getNavigationBarSizeInPx() diff --git a/flashbar/src/main/java/com/andrognito/flashbar/FlashbarView.kt b/flashbar/src/main/java/com/andrognito/flashbar/FlashbarView.kt index 46d7108..5e34064 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/FlashbarView.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/FlashbarView.kt @@ -9,11 +9,9 @@ import android.graphics.drawable.Drawable import android.os.Build import android.os.Build.VERSION.SDK_INT import android.os.Build.VERSION_CODES.M -import android.support.annotation.ColorInt import android.text.Spanned import android.text.TextUtils import android.util.TypedValue -import android.view.ViewGroup import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.widget.ImageView @@ -21,6 +19,7 @@ import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM import android.widget.RelativeLayout.ALIGN_PARENT_TOP +import androidx.annotation.ColorInt import com.andrognito.flashbar.Flashbar.Gravity import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM import com.andrognito.flashbar.Flashbar.Gravity.TOP @@ -57,7 +56,7 @@ internal class FlashbarView(context: Context) : LinearLayout(context) { if (!isMarginCompensationApplied) { isMarginCompensationApplied = true - val params = layoutParams as ViewGroup.MarginLayoutParams + val params = layoutParams as MarginLayoutParams when (gravity) { TOP -> params.topMargin = -TOP_COMPENSATION_MARGIN BOTTOM -> params.bottomMargin = -BOTTOM_COMPENSATION_MARGIN @@ -93,7 +92,7 @@ internal class FlashbarView(context: Context) : LinearLayout(context) { val flashbarViewLp = RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT) val statusBarHeight = activity.getStatusBarHeightInPx() - val flashbarViewContentLp = fbContent.layoutParams as LinearLayout.LayoutParams + val flashbarViewContentLp = fbContent.layoutParams as LayoutParams when (gravity) { TOP -> { diff --git a/flashbar/src/main/java/com/andrognito/flashbar/SwipeDismissTouchListener.kt b/flashbar/src/main/java/com/andrognito/flashbar/SwipeDismissTouchListener.kt index aadec14..c05bf6a 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/SwipeDismissTouchListener.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/SwipeDismissTouchListener.kt @@ -4,11 +4,14 @@ import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.ValueAnimator import android.os.Build -import android.support.annotation.RequiresApi import android.view.MotionEvent import android.view.VelocityTracker import android.view.View import android.view.ViewConfiguration +import androidx.annotation.RequiresApi +import kotlin.math.abs +import kotlin.math.max +import kotlin.math.min internal class SwipeDismissTouchListener( private val view: View, @@ -56,11 +59,11 @@ internal class SwipeDismissTouchListener( velocityTracker!!.addMovement(motionEvent) velocityTracker!!.computeCurrentVelocity(1000) val velocityX = velocityTracker!!.xVelocity - val absVelocityX = Math.abs(velocityX) - val absVelocityY = Math.abs(velocityTracker!!.yVelocity) + val absVelocityX = abs(velocityX) + val absVelocityY = abs(velocityTracker!!.yVelocity) var dismiss = false var dismissRight = false - if (Math.abs(deltaX) > viewWidth / 2 && swiping) { + if (abs(deltaX) > viewWidth / 2 && swiping) { dismiss = true dismissRight = deltaX > 0 } else if (minFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && swiping) { @@ -116,7 +119,7 @@ internal class SwipeDismissTouchListener( velocityTracker!!.addMovement(motionEvent) val deltaX = motionEvent.rawX - downX val deltaY = motionEvent.rawY - downY - if (Math.abs(deltaX) > slop && Math.abs(deltaY) < Math.abs(deltaX) / 2) { + if (abs(deltaX) > slop && abs(deltaY) < abs(deltaX) / 2) { swiping = true callbacks.onSwipe(true) swipingSlop = if (deltaX > 0) slop else -slop @@ -131,7 +134,7 @@ internal class SwipeDismissTouchListener( if (swiping) { translationX = deltaX this.view.translationX = deltaX - swipingSlop - this.view.alpha = Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / viewWidth)) + this.view.alpha = max(0f, min(1f, 1f - 2f * abs(deltaX) / viewWidth)) return true } } diff --git a/flashbar/src/main/java/com/andrognito/flashbar/anim/BaseFlashAnimBuilder.kt b/flashbar/src/main/java/com/andrognito/flashbar/anim/BaseFlashAnimBuilder.kt index 2f3fda8..b1b35c5 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/anim/BaseFlashAnimBuilder.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/anim/BaseFlashAnimBuilder.kt @@ -1,10 +1,10 @@ package com.andrognito.flashbar.anim import android.content.Context -import android.support.annotation.CallSuper -import android.support.annotation.InterpolatorRes import android.view.View import android.view.animation.* +import androidx.annotation.CallSuper +import androidx.annotation.InterpolatorRes import com.andrognito.flashbar.R abstract class BaseFlashAnimBuilder(private val context: Context) { diff --git a/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimBarBuilder.kt b/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimBarBuilder.kt index 0a76f51..da2df69 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimBarBuilder.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimBarBuilder.kt @@ -4,11 +4,11 @@ import android.animation.Animator import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.content.Context -import android.support.annotation.InterpolatorRes import android.view.View import android.view.animation.AnticipateInterpolator import android.view.animation.Interpolator import android.view.animation.OvershootInterpolator +import androidx.annotation.InterpolatorRes import com.andrognito.flashbar.Flashbar import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM import com.andrognito.flashbar.Flashbar.Gravity.TOP @@ -114,7 +114,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) { // Slide from left/right animation is not specified, default top/bottom // animation is applied if (direction == null) { - translationAnim.propertyName = "translationY" + translationAnim.setPropertyName("translationY") when (type!!) { ENTER -> when (gravity!!) { @@ -127,7 +127,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) { } } } else { - translationAnim.propertyName = "translationX" + translationAnim.setPropertyName("translationX") when (type!!) { ENTER -> when (direction!!) { @@ -146,7 +146,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) { if (alpha) { val alphaAnim = ObjectAnimator() - alphaAnim.propertyName = "alpha" + alphaAnim.setPropertyName("alpha") alphaAnim.target = view when (type!!) { diff --git a/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimIconBuilder.kt b/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimIconBuilder.kt index fd75b84..f2c78ba 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimIconBuilder.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/anim/FlashAnimIconBuilder.kt @@ -7,9 +7,9 @@ import android.animation.PropertyValuesHolder import android.animation.ValueAnimator.INFINITE import android.animation.ValueAnimator.REVERSE import android.content.Context -import android.support.annotation.InterpolatorRes import android.view.View import android.view.animation.Interpolator +import androidx.annotation.InterpolatorRes class FlashAnimIconBuilder(context: Context) : BaseFlashAnimBuilder(context) { diff --git a/flashbar/src/main/java/com/andrognito/flashbar/util/CommonUtils.kt b/flashbar/src/main/java/com/andrognito/flashbar/util/CommonUtils.kt index bd21f65..016e00d 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/util/CommonUtils.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/util/CommonUtils.kt @@ -10,6 +10,7 @@ import android.view.* import android.view.Surface.* import com.andrognito.flashbar.util.NavigationBarPosition.* import java.lang.reflect.InvocationTargetException +import kotlin.math.roundToInt internal fun Activity.getStatusBarHeightInPx(): Int { val rectangle = Rect() @@ -47,18 +48,18 @@ internal fun Activity.getNavigationBarSizeInPx(): Int { } internal fun Activity?.getRootView(): ViewGroup? { - if (this == null || window == null || window.decorView == null) { + if (this == null || window?.decorView == null) { return null } return window.decorView as ViewGroup } internal fun Context.convertDpToPx(dp: Int): Int { - return Math.round(dp * (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)) + return (dp * (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)).roundToInt() } internal fun Context.convertPxToDp(px: Int): Int { - return Math.round(px / (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)) + return (px / (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)).roundToInt() } private fun Activity.getRealScreenSize(): Point { diff --git a/flashbar/src/main/java/com/andrognito/flashbar/view/FbProgress.kt b/flashbar/src/main/java/com/andrognito/flashbar/view/FbProgress.kt index aa0a6ef..768082e 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/view/FbProgress.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/view/FbProgress.kt @@ -15,6 +15,10 @@ import android.util.AttributeSet import android.util.TypedValue import android.view.View import com.andrognito.flashbar.R +import kotlin.math.cos +import kotlin.math.min +import kotlin.math.pow +import kotlin.math.roundToLong /** * Forked from Todd Davies' Progress Wheel https://github.com/Todd-Davies/ProgressWheel @@ -69,26 +73,26 @@ class FbProgress : View { val viewWidth = circleRadius + this.paddingLeft + this.paddingRight val viewHeight = circleRadius + this.paddingTop + this.paddingBottom - val widthMode = View.MeasureSpec.getMode(widthMeasureSpec) - val widthSize = View.MeasureSpec.getSize(widthMeasureSpec) - val heightMode = View.MeasureSpec.getMode(heightMeasureSpec) - val heightSize = View.MeasureSpec.getSize(heightMeasureSpec) + val widthMode = MeasureSpec.getMode(widthMeasureSpec) + val widthSize = MeasureSpec.getSize(widthMeasureSpec) + val heightMode = MeasureSpec.getMode(heightMeasureSpec) + val heightSize = MeasureSpec.getSize(heightMeasureSpec) val width: Int val height: Int - if (widthMode == View.MeasureSpec.EXACTLY) { + if (widthMode == MeasureSpec.EXACTLY) { width = widthSize - } else if (widthMode == View.MeasureSpec.AT_MOST) { - width = Math.min(viewWidth, widthSize) + } else if (widthMode == MeasureSpec.AT_MOST) { + width = min(viewWidth, widthSize) } else { width = viewWidth } - if (heightMode == View.MeasureSpec.EXACTLY || widthMode == View.MeasureSpec.EXACTLY) { + if (heightMode == MeasureSpec.EXACTLY || widthMode == MeasureSpec.EXACTLY) { height = heightSize - } else if (heightMode == View.MeasureSpec.AT_MOST) { - height = Math.min(viewHeight, heightSize) + } else if (heightMode == MeasureSpec.AT_MOST) { + height = min(viewHeight, heightSize) } else { height = viewHeight } @@ -148,7 +152,7 @@ class FbProgress : View { val deltaTime = (SystemClock.uptimeMillis() - lastTimeAnimated).toFloat() / 1000 val deltaNormalized = deltaTime * spinSpeed - progress = Math.min(progress + deltaNormalized, targetProgress) + progress = min(progress + deltaNormalized, targetProgress) lastTimeAnimated = SystemClock.uptimeMillis() } @@ -160,8 +164,8 @@ class FbProgress : View { var progress = this.progress if (!linearProgress) { val factor = 2.0f - offset = (1.0f - Math.pow((1.0f - this.progress / 360.0f).toDouble(), (2.0f * factor).toDouble())).toFloat() * 360.0f - progress = (1.0f - Math.pow((1.0f - this.progress / 360.0f).toDouble(), factor.toDouble())).toFloat() * 360.0f + offset = (1.0f - (1.0f - this.progress / 360.0f).toDouble().pow((2.0f * factor).toDouble())).toFloat() * 360.0f + progress = (1.0f - (1.0f - this.progress / 360.0f).toDouble().pow(factor.toDouble())).toFloat() * 360.0f } if (isInEditMode) { @@ -179,13 +183,13 @@ class FbProgress : View { override fun onVisibilityChanged(changedView: View, visibility: Int) { super.onVisibilityChanged(changedView, visibility) - if (visibility == View.VISIBLE) { + if (visibility == VISIBLE) { lastTimeAnimated = SystemClock.uptimeMillis() } } public override fun onSaveInstanceState(): Parcelable? { - val superState = super.onSaveInstanceState() + val superState = super.onSaveInstanceState() ?: return null val ss = WheelSavedState(superState) @@ -263,7 +267,7 @@ class FbProgress : View { return } - targetProgress = Math.min(progressUpdate * 360.0f, 360.0f) + targetProgress = min(progressUpdate * 360.0f, 360.0f) progress = targetProgress lastTimeAnimated = SystemClock.uptimeMillis() invalidate() @@ -296,7 +300,7 @@ class FbProgress : View { lastTimeAnimated = SystemClock.uptimeMillis() } - targetProgress = Math.min(progress * 360.0f, 360.0f) + targetProgress = min(progress * 360.0f, 360.0f) invalidate() } @@ -373,7 +377,7 @@ class FbProgress : View { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) private fun setAnimationEnabled() { - val currentApiVersion = android.os.Build.VERSION.SDK_INT + val currentApiVersion = Build.VERSION.SDK_INT val animationValue: Float animationValue = if (currentApiVersion >= Build.VERSION_CODES.JELLY_BEAN_MR1) { @@ -394,10 +398,9 @@ class FbProgress : View { val paddingRight = paddingRight if (!fillRadius) { - val minValue = Math.min(layoutWidth - paddingLeft - paddingRight, - layoutHeight - paddingBottom - paddingTop) + val minValue = min(layoutWidth - paddingLeft - paddingRight, layoutHeight - paddingBottom - paddingTop) - val circleDiameter = Math.min(minValue, circleRadius * 2 - barWidth * 2) + val circleDiameter = min(minValue, circleRadius * 2 - barWidth * 2) val xOffset = (layoutWidth - paddingLeft - paddingRight - circleDiameter) / 2 + paddingLeft val yOffset = (layoutHeight - paddingTop - paddingBottom - circleDiameter) / 2 + paddingTop @@ -468,7 +471,7 @@ class FbProgress : View { barGrowingFromFront = !barGrowingFromFront } - val distance = Math.cos((timeStartGrowing / barSpinCycleTime + 1) * Math.PI).toFloat() / 2 + 0.5f + val distance = cos((timeStartGrowing / barSpinCycleTime + 1) * Math.PI).toFloat() / 2 + 0.5f val destLength = (barMaxLength - barLength).toFloat() if (barGrowingFromFront) { @@ -491,7 +494,7 @@ class FbProgress : View { private fun runCallback() { if (callback != null) { - val normalizedProgress = Math.round(progress * 100 / 360.0f).toFloat() / 100 + val normalizedProgress = (progress * 100 / 360.0f).roundToLong().toFloat() / 100 callback!!.onProgressUpdate(normalizedProgress) } } @@ -500,7 +503,7 @@ class FbProgress : View { fun onProgressUpdate(progress: Float) } - internal class WheelSavedState : View.BaseSavedState { + internal class WheelSavedState : BaseSavedState { var mProgress: Float = 0.toFloat() var mTargetProgress: Float = 0.toFloat() var isSpinning: Boolean = false @@ -545,6 +548,7 @@ class FbProgress : View { } companion object { + @JvmField val CREATOR: Parcelable.Creator = object : Parcelable.Creator { override fun createFromParcel(`in`: Parcel): WheelSavedState { return WheelSavedState(`in`) diff --git a/flashbar/src/main/java/com/andrognito/flashbar/view/ShadowView.kt b/flashbar/src/main/java/com/andrognito/flashbar/view/ShadowView.kt index c7a17ca..3582cbb 100644 --- a/flashbar/src/main/java/com/andrognito/flashbar/view/ShadowView.kt +++ b/flashbar/src/main/java/com/andrognito/flashbar/view/ShadowView.kt @@ -3,10 +3,10 @@ package com.andrognito.flashbar.view import android.content.Context import android.os.Build.VERSION.SDK_INT import android.os.Build.VERSION_CODES.JELLY_BEAN -import android.support.annotation.DrawableRes -import android.support.v4.content.ContextCompat import android.util.AttributeSet import android.view.View +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat import com.andrognito.flashbar.R import com.andrognito.flashbar.view.ShadowView.ShadowType.BOTTOM import com.andrognito.flashbar.view.ShadowView.ShadowType.TOP diff --git a/gradle.properties b/gradle.properties index 743d692..8de5058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0dfe88..5374044 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 27 23:30:11 IST 2018 +#Tue Aug 20 09:18:49 BST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip