Merge pull request #5 from U1F4F1/sampleapp

Sampleapp

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.4'
+    ext.kotlin_version = '1.1.4-3'
     repositories {
         jcenter()
     }

powerbottomsheet/build.gradle

@@ -2,16 +2,21 @@ apply plugin: 'com.android.library'
 apply plugin: 'de.mobilej.unmock'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven-publish'
 
+androidExtensions {
+    experimental = true
+}
+
 android {
     compileSdkVersion 26
     buildToolsVersion "26.0.1"
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 26
         versionCode 2
-        versionName "1.2"
+        versionName "1.5"
     }
     buildTypes {
         release {
@@ -60,7 +65,7 @@ publishing {
         maven(MavenPublication) {
             groupId 'com.u1f4f1.powerbetterbottomsheet'
             artifactId 'powerbetterbottomsheet'
-            version '3.0'
+            version '1.5'
             artifact("$buildDir/outputs/aar/powerbottomsheet-release.aar")
             pom.withXml {
                 def dependenciesNode = asNode().appendNode('dependencies')

powerbottomsheet/src/main/java/com/u1f4f1/powerbottomsheet/Log.kt

@@ -83,6 +83,4 @@ fun error(throwable: Throwable, message: String) {
     Log.e(LOG_TAG, message, throwable)
 }
 
-private fun shouldSkipMessage(level: Int) : Boolean {
-    return logLevel > level
-}
+private fun shouldSkipMessage(level: Int) : Boolean = logLevel > level

powerbottomsheet/src/main/java/com/u1f4f1/powerbottomsheet/bottomsheet/BottomSheetAdapter.kt

@@ -13,12 +13,12 @@ import java.util.concurrent.LinkedBlockingDeque
 
 abstract class BottomSheetAdapter(val behavior: AnchorPointBottomSheetBehavior<*>?) : EpoxyAdapter() {
     val updates = LinkedBlockingDeque<Runnable>()
-    lateinit var recyclerViewTransitionRunnable: Runnable
+    protected lateinit var recyclerViewTransitionRunnable: Runnable
 
     init {
         val onBottomSheetStateChanged = object : AnchorPointBottomSheetBehavior.BottomSheetStateCallback {
             override fun onStateChanged(bottomSheet: View, newState: BottomSheetState) {
-                for (i in 0..updates.size - 1) {
+                for (i in 0 until updates.size) {
                     updates.pop()?.run()
                 }
             }
@@ -27,19 +27,8 @@ abstract class BottomSheetAdapter(val behavior: AnchorPointBottomSheetBehavior<*
         behavior?.addBottomSheetStateCallback(onBottomSheetStateChanged)
     }
 
-    override fun notifyModelChanged(model: EpoxyModel<*>?) {
-        if (!(behavior?.isStable ?: false)) {
-            updates.add(Runnable {
-                super.notifyModelChanged(model)
-            })
-            return
-        }
-
-        super.notifyModelChanged(model)
-    }
-
     override fun notifyModelsChanged() {
-        if (!(behavior?.isStable ?: false)) {
+        if (behavior?.isStable != true) {
             updates.add(Runnable {
                 super.notifyModelsChanged()
             })
@@ -54,11 +43,10 @@ abstract class BottomSheetAdapter(val behavior: AnchorPointBottomSheetBehavior<*
         super.onAttachedToRecyclerView(recyclerView)
 
         trace("BottomSheetAdapter.onAttachedToRecyclerView(recyclerView: RecyclerView?)")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            recyclerViewTransitionRunnable = Runnable { TransitionManager.beginDelayedTransition(recyclerView) }
+        recyclerViewTransitionRunnable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Runnable { TransitionManager.beginDelayedTransition(recyclerView) }
         } else {
-            // I would rather invoke an empty lambda than have to check for null everywhere
-            recyclerViewTransitionRunnable = Runnable { }
+            Runnable { /* no op */ }
         }
     }
 }

powerbottomsheet/src/main/java/com/u1f4f1/powerbottomsheet/bottomsheet/SavedState.kt

@@ -1,20 +1,7 @@
 package com.u1f4f1.powerbottomsheet.bottomsheet
 
-import android.os.Parcel
 import android.os.Parcelable
-import com.u1f4f1.powerbottomsheet.createParcel
+import kotlinx.android.parcel.Parcelize
 
-data class SavedState(var bottomSheetState: BottomSheetState) : Parcelable {
-    companion object {
-        @JvmField @Suppress("unused")
-        val CREATOR = createParcel { SavedState(it) }
-    }
-
-    constructor(parcelIn: Parcel) : this(BottomSheetState.fromInt(parcelIn.readInt()))
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeInt(bottomSheetState.ordinal)
-    }
-
-    override fun describeContents() = 0
-}
+@Parcelize
+class SavedState(var bottomSheetState: BottomSheetState) : Parcelable