From b54283cdebe6cdec122ce11dfc10ac2b366df623 Mon Sep 17 00:00:00 2001 From: chahine Date: Fri, 31 Aug 2018 16:43:04 -0400 Subject: [PATCH 1/4] fix error on restore state --- .../pageindicator/sample/MainActivity.kt | 2 +- dependencies.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../com/chahinem/pageindicator/DotManager.kt | 9 ++++----- .../chahinem/pageindicator/PageIndicator.kt | 11 ++++------- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt b/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt index 627d21d..7b07e9d 100644 --- a/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt +++ b/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt @@ -34,7 +34,7 @@ class MainActivity : AppCompatActivity() { pagerPageIndicator.attachTo(pager) // Manual - manualPageIndicator.count = 777 + manualPageIndicator.count = 0 leftBtn.setOnClickListener { manualPageIndicator.swipePrevious() } rightBtn.setOnClickListener { manualPageIndicator.swipeNext() } } diff --git a/dependencies.gradle b/dependencies.gradle index e6ba30b..49dfbf2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ ext { // Android Version minSdkVersion = 14 - compileSdkVersion = 27 - targetSdkVersion = 27 - gradleVersion = '3.1.1' - kotlinVersion = '1.2.40' + compileSdkVersion = 28 + targetSdkVersion = 28 + gradleVersion = '3.1.4' + kotlinVersion = '1.2.61' supportLibraryVersion = '27.1.1' @@ -20,7 +20,7 @@ ext { constraintLayout = groupId + '.constraint:constraint-layout:1.1.0' - picasso = 'com.squareup.picasso:picasso:2.6.0-SNAPSHOT' + picasso = 'com.squareup.picasso:picasso:2.71828' supportLibs = [appcompatV7, cardView, diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 01b8bf6b1f99cad9213fc495b33ad5bbab8efd20..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644 GIT binary patch delta 63 zcmdnFf_di(<_YF38otMVOtg+<`&jg`h>>A})W$9U4stOw1bDM^ytJG0dGek^{$Mqm P`48U{U;zt#yzBu0axWc6 delta 63 zcmdnFf_di(<_YF39&&6=6RjiJJ`{Z{Vq};gwQ 0, actual: $count") + + if (count > 0) { + dots[0] = 6 } - dots = ByteArray(count) - dots[0] = 6 if (count <= SIZE_THRESHOLD) { (1 until count).forEach { i -> dots[i] = 5 } } else { diff --git a/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt b/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt index 5500caa..be58abf 100644 --- a/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt +++ b/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt @@ -43,21 +43,19 @@ class PageIndicator @JvmOverloads constructor( private var scrollListener: RecyclerView.OnScrollListener? = null private var pageChangeListener: ViewPager.OnPageChangeListener? = null - private var _count = 0 - var count: Int + var count: Int = 0 set(value) { - _count = value dotManager = DotManager( - _count, + value, dotSize, dotSpacing, dotBound, dotSizeMap, this) - dotSizes = IntArray(_count) + dotSizes = IntArray(value) dotManager?.let { it.dots.forEachIndexed { index, dot -> dotSizes[index] = it.dotSizeFor(dot) } } - dotAnimators = Array(_count, { _ -> ValueAnimator() }) + dotAnimators = Array(value) { ValueAnimator() } initialPadding = when (count) { in 1..4 -> (dotBound + (4 - count) * (dotSize + dotSpacing) + dotSpacing) / 2 @@ -65,7 +63,6 @@ class PageIndicator @JvmOverloads constructor( } invalidate() } - get() = _count init { val ta = getContext().obtainStyledAttributes(attrs, R.styleable.PageIndicator) From c6b459a73c2170042780c3e98cfd756e633678e4 Mon Sep 17 00:00:00 2001 From: chahine Date: Fri, 31 Aug 2018 17:05:48 -0400 Subject: [PATCH 2/4] minor fixes + dependency updates --- .../java/com/chahinem/pageindicator/sample/MainActivity.kt | 2 +- dependencies.gradle | 7 +++++-- .../main/java/com/chahinem/pageindicator/PageIndicator.kt | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt b/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt index 7b07e9d..627d21d 100644 --- a/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt +++ b/app/src/main/java/com/chahinem/pageindicator/sample/MainActivity.kt @@ -34,7 +34,7 @@ class MainActivity : AppCompatActivity() { pagerPageIndicator.attachTo(pager) // Manual - manualPageIndicator.count = 0 + manualPageIndicator.count = 777 leftBtn.setOnClickListener { manualPageIndicator.swipePrevious() } rightBtn.setOnClickListener { manualPageIndicator.swipeNext() } } diff --git a/dependencies.gradle b/dependencies.gradle index 49dfbf2..e901992 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,19 +12,22 @@ ext { kotlinStdlib = 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + kotlinVersion def groupId = 'com.android.support' + animatedVectorDrawable = groupId + ':animated-vector-drawable:' + supportLibraryVersion appcompatV7 = groupId + ':appcompat-v7:' + supportLibraryVersion cardView = groupId + ':cardview-v7:' + supportLibraryVersion design = groupId + ':design:' + supportLibraryVersion + exifinterface = groupId + ':exifinterface:' + supportLibraryVersion recyclerviewV7 = groupId + ':recyclerview-v7:' + supportLibraryVersion supportAnnotations = groupId + ':support-annotations:' + supportLibraryVersion constraintLayout = groupId + '.constraint:constraint-layout:1.1.0' - picasso = 'com.squareup.picasso:picasso:2.71828' - supportLibs = [appcompatV7, + supportLibs = [animatedVectorDrawable, + appcompatV7, cardView, design, + exifinterface, recyclerviewV7, supportAnnotations, constraintLayout] diff --git a/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt b/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt index be58abf..fadc9d0 100644 --- a/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt +++ b/pageindicator/src/main/java/com/chahinem/pageindicator/PageIndicator.kt @@ -57,8 +57,8 @@ class PageIndicator @JvmOverloads constructor( dotManager?.let { it.dots.forEachIndexed { index, dot -> dotSizes[index] = it.dotSizeFor(dot) } } dotAnimators = Array(value) { ValueAnimator() } - initialPadding = when (count) { - in 1..4 -> (dotBound + (4 - count) * (dotSize + dotSpacing) + dotSpacing) / 2 + initialPadding = when (value) { + in 0..4 -> (dotBound + (4 - value) * (dotSize + dotSpacing) + dotSpacing) / 2 else -> 2 * (dotSize + dotSpacing) } invalidate() From bce3da349e740bff55be3e69626910e69500b2b8 Mon Sep 17 00:00:00 2001 From: chahine Date: Fri, 31 Aug 2018 17:34:04 -0400 Subject: [PATCH 3/4] fix travis --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 886d509..d7e59d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ android: components: - tools - platform-tools - - build-tools-27.0.3 - - android-27 + - build-tools-28.0.2 + - android-28 - extra-google-m2repository - extra-android-m2repository licenses: @@ -15,7 +15,7 @@ android: - 'google-gdk-license-.+' before_install: - - echo yes | sdkmanager "platforms;android-27" + - echo yes | sdkmanager "platforms;android-28" script: - ./gradlew clean build -PdisablePreDex --stacktrace --console plain From 9cef62e6c1d6ec0011e03f4a9819616447209446 Mon Sep 17 00:00:00 2001 From: chahine Date: Fri, 31 Aug 2018 17:38:11 -0400 Subject: [PATCH 4/4] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7e59d8..f27d63c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ android: components: - tools - platform-tools - - build-tools-28.0.2 + - build-tools-27.0.3 - android-28 - extra-google-m2repository - extra-android-m2repository