Merge pull request #22 from JDevZone/dev

#21 bug fixed (nullable listeners)

Author: JDevZone

app/build.gradle

@@ -26,12 +26,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(path: ':fillprogresslayout')
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

app/src/main/java/com/devzone/fpl_sample/MainActivity.kt

@@ -5,7 +5,6 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.view.View
-import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
 import android.view.animation.OvershootInterpolator
 import android.widget.Button
@@ -100,8 +99,4 @@ class MainActivity : AppCompatActivity() {
         fishCardFPL?.setProgress(currentProgress, isAnimated)
     }
 
-
-
-
-
 }

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong

fillprogresslayout/build.gradle

@@ -32,13 +32,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.core:core-ktx:1.3.2"
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 repositories {
     mavenCentral()

fillprogresslayout/src/main/java/com/devzone/fillprogresslayout/FillProgressLayout.kt

@@ -17,7 +17,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
 
 
-@Suppress("unused")
+@Suppress("unused", "MemberVisibilityCanBePrivate")
 class FillProgressLayout : LinearLayout {
 
     companion object {
@@ -346,7 +346,6 @@ class FillProgressLayout : LinearLayout {
     /**
      * This method is used to set multiple colors for gradient effect
      * @param resIds array of color resource ids
-     * @param extractResColor flag for color extraction
      * @see ContextCompat.getColor
      */
     fun setProgressColors(@ColorRes resIds: IntArray) {
@@ -443,7 +442,7 @@ class FillProgressLayout : LinearLayout {
      * when progress animation ends
      * @param listener a lambda function to invoke after progress animation ends
      */
-    fun setDoOnProgressEnd(listener: ((v: View) -> Unit)) {
+    fun setDoOnProgressEnd(listener: ((v: View) -> Unit)?) {
         doOnProgressEnd = listener
     }
 
@@ -453,7 +452,7 @@ class FillProgressLayout : LinearLayout {
      * @param listener a lambda function to invoke when progress changes
      * in both animated and non-animated case
      */
-    fun setProgressUpdateListener(listener: ((progress: Int) -> Unit)) {
+    fun setProgressUpdateListener(listener: ((progress: Int) -> Unit)?) {
         progressUpdateListener = listener
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip