Merge pull request #73 from ImaginativeShohag/dev

Version 2.0.6 released
ImaginativeShohag · Jan 10, 2022 · 45427d7 · 45427d7
2 parents 7566ed2 + 9c86d79
commit 45427d7
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
 Change Log
 ==========
 
-## Version 2.0.5 *(2021-09-30)* 🚀
+## Version 2.0.6 *(2022-01-11)* 🚀
+
+* 🐞 Fixed [#72](https://github.com/ImaginativeShohag/Why-Not-Image-Carousel/issues/72): Indicator
+  will now indicate first item after data replace.
+* ⬆ Updated deprecated lifecycle code.
+* ⬆ Kotlin and other libs upgraded to the latest version.
+
+## Version 2.0.5 *(2021-09-30)*
 
 * 🐞 Fixed [#50](https://github.com/ImaginativeShohag/Why-Not-Image-Carousel/issues/50): Fixed a
   crash when dataset changed.

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ dependencies {
     // Circle Indicator (To fix the xml preview "Missing classes" error)
     implementation 'me.relex:circleindicator:2.1.6'
 
-    implementation 'org.imaginativeworld.whynotimagecarousel:whynotimagecarousel:2.0.5'
+    implementation 'org.imaginativeworld.whynotimagecarousel:whynotimagecarousel:2.0.6'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ kotlin.code.style=official
 # ----------------
 GROUP=org.imaginativeworld.whynotimagecarousel
 POM_ARTIFACT_ID=whynotimagecarousel
-VERSION_NAME=2.0.5
+VERSION_NAME=2.0.6
 # ----------------
 POM_NAME=Why Not! Image Carousel!
 POM_DESCRIPTION=An easy, super simple and customizable image carousel view for Android.

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -46,9 +46,9 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
     // Why Not! Image Carousel! Library
     implementation project(':whynotimagecarousel')
@@ -66,7 +66,7 @@ dependencies {
     kapt 'com.github.bumptech.glide:compiler:4.12.0'
 
     // Fragment
-    implementation "androidx.fragment:fragment-ktx:1.3.6"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
 
     // debugImplementation because LeakCanary should only run in debug builds.
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

diff --git a/sample/src/main/java/org/imaginativeworld/whynotimagecarousel/sample/TestActivity.kt b/sample/src/main/java/org/imaginativeworld/whynotimagecarousel/sample/TestActivity.kt
@@ -42,7 +42,7 @@ class TestActivity : AppCompatActivity() {
             )
         }
 
-        binding.carousel2.setData(listOne)
+        binding.carousel2.setData(listTwo)
 
         // --------------------------------
 
@@ -69,15 +69,15 @@ class TestActivity : AppCompatActivity() {
         }
 
         binding.btnMultiAppend.setOnClickListener {
-            binding.carousel1.addData(listOne)
-            binding.carousel2.addData(listOne)
+            binding.carousel1.addData(listOne.take(3))
+            binding.carousel2.addData(listTwo.take(3))
         }
 
         // --------------------------------
 
         binding.btnLoadData.setOnClickListener {
             binding.carousel1.setData(listOne)
-            binding.carousel2.setData(listOne)
+            binding.carousel2.setData(listTwo)
         }
 
         binding.btnClearData.setOnClickListener {

diff --git a/whynotimagecarousel/build.gradle b/whynotimagecarousel/build.gradle
@@ -47,11 +47,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
 
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     // Glide

diff --git a/whynotimagecarousel/src/main/java/org/imaginativeworld/whynotimagecarousel/ImageCarousel.kt b/whynotimagecarousel/src/main/java/org/imaginativeworld/whynotimagecarousel/ImageCarousel.kt
@@ -20,11 +20,14 @@ import androidx.annotation.IdRes
 import androidx.annotation.LayoutRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.recyclerview.widget.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSnapHelper
+import androidx.recyclerview.widget.PagerSnapHelper
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SnapHelper
 import me.relex.circleindicator.CircleIndicator2
 import org.imaginativeworld.whynotimagecarousel.adapter.FiniteCarouselAdapter
 import org.imaginativeworld.whynotimagecarousel.adapter.InfiniteCarouselAdapter
@@ -33,14 +36,18 @@ import org.imaginativeworld.whynotimagecarousel.listener.CarouselOnScrollListene
 import org.imaginativeworld.whynotimagecarousel.model.CarouselGravity
 import org.imaginativeworld.whynotimagecarousel.model.CarouselItem
 import org.imaginativeworld.whynotimagecarousel.model.CarouselType
-import org.imaginativeworld.whynotimagecarousel.utils.*
+import org.imaginativeworld.whynotimagecarousel.utils.CarouselLinearLayoutManager
+import org.imaginativeworld.whynotimagecarousel.utils.LinearStartSnapHelper
+import org.imaginativeworld.whynotimagecarousel.utils.dpToPx
+import org.imaginativeworld.whynotimagecarousel.utils.getSnapPosition
+import org.imaginativeworld.whynotimagecarousel.utils.spToPx
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.annotations.Nullable
 
 class ImageCarousel(
     @NotNull context: Context,
     @Nullable private var attributeSet: AttributeSet?
-) : ConstraintLayout(context, attributeSet), LifecycleObserver {
+) : ConstraintLayout(context, attributeSet), DefaultLifecycleObserver {
 
     companion object {
         const val TAG = "ImageCarousel"
@@ -533,27 +540,18 @@ class ImageCarousel(
         return super.dispatchTouchEvent(event)
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     private fun pauseAutoPlay() {
         if (autoPlay) {
             autoPlayHandler.removeCallbacksAndMessages(null)
         }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     private fun resumeAutoPlay() {
         if (autoPlay) {
             initAutoPlay()
         }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    private fun onResumeCheckForStartPositionForInfiniteCarousel() {
-        if (infiniteCarousel && !isCarouselCentered && dataSize != 0) {
-            initStartPositionForInfiniteCarousel()
-        }
-    }
-
     private fun initViews() {
         carouselView = LayoutInflater.from(context).inflate(R.layout.image_carousel, this)
 
@@ -632,17 +630,17 @@ class ImageCarousel(
                 ).toInt()
 
                 carouselType = carouselTypeArray[
-                        getInteger(
-                            R.styleable.ImageCarousel_carouselType,
-                            CarouselType.BLOCK.ordinal
-                        )
+                    getInteger(
+                        R.styleable.ImageCarousel_carouselType,
+                        CarouselType.BLOCK.ordinal
+                    )
                 ]
 
                 carouselGravity = carouselGravityArray[
-                        getInteger(
-                            R.styleable.ImageCarousel_carouselGravity,
-                            CarouselGravity.CENTER.ordinal
-                        )
+                    getInteger(
+                        R.styleable.ImageCarousel_carouselGravity,
+                        CarouselGravity.CENTER.ordinal
+                    )
                 ]
 
                 showIndicator = getBoolean(
@@ -656,10 +654,10 @@ class ImageCarousel(
                 ).toInt()
 
                 imageScaleType = scaleTypeArray[
-                        getInteger(
-                            R.styleable.ImageCarousel_imageScaleType,
-                            ImageView.ScaleType.CENTER_CROP.ordinal
-                        )
+                    getInteger(
+                        R.styleable.ImageCarousel_imageScaleType,
+                        ImageView.ScaleType.CENTER_CROP.ordinal
+                    )
                 ]
 
                 carouselBackground = getDrawable(
@@ -976,7 +974,7 @@ class ImageCarousel(
 
     private fun createIndicator() {
         indicator?.apply {
-            createIndicators(dataSize, currentVirtualPosition)
+            createIndicators(dataSize, 0)
         }
     }
 
@@ -1213,4 +1211,21 @@ class ImageCarousel(
     fun stop() {
         autoPlay = false
     }
+
+    // ----------------------------------------------------------------
+    // Lifecycle events
+    // ----------------------------------------------------------------
+
+    override fun onPause(owner: LifecycleOwner) {
+        pauseAutoPlay()
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        resumeAutoPlay()
+
+        // Check for start position for InfiniteCarousel
+        if (infiniteCarousel && !isCarouselCentered && dataSize != 0) {
+            initStartPositionForInfiniteCarousel()
+        }
+    }
 }