Merge branch 'release/1.4.0'

# Conflicts:
#	README.md

Author: mvojtkovszky

README.md

@@ -1,5 +1,5 @@
 # ProperBaseAdapter
-Straightforward, fast, easy to use and adaptable generic RecyclerView adapter.
+Straightforward, fast, easy to use and adaptable generic RecyclerView adapter. Never create another RecyclerView adapter again.
 
 ## How does it work?
 1. Define an AdapterItem representing an adapter item view type.
@@ -20,7 +20,7 @@ or inflate your own view.
 ``` kotlin
 class TextRowRecyclerItem(private val text: String): AdapterItem<View>() {
     override fun getNewView(parent: ViewGroup): View {
-        return LayoutInflater.from(parent.context).inflate(android.R.layout.activity_list_item, parent, false)
+        return getViewFromLayout(parent, android.R.layout.activity_list_item)
     }
     override fun onViewBound(view: View) {
         view.findViewById<TextView>(R.id.text1).text = text
@@ -47,7 +47,7 @@ fun setAnimation(@AnimRes animation: Int): Unit
 
 fun setClickListener(clickListener: View.OnClickListener?): Unit
 
-fun setMargins(startMargin: Int = 0, topMargin: Int = 0, endMargin: Int = 0, bottomMargin: Int = 0): Unit
+fun setMargins(marginStart: Int = 0, marginTop: Int = 0, marginEnd: Int = 0, marginBottom: Int = 0): Unit
 
 fun setIsStickyHeader(isStickyHeader: Boolean)
 
@@ -119,19 +119,18 @@ fun setItems(newData: MutableList<AdapterItem<*>>, notifyDataSetChanged: Boolean
 ```
 
 ## Nice! How do I get started?
-Add it in your root build.gradle at the end of repositories:
+Make sure root build.gradle repositories include JitPack
 ``` gradle
 allprojects {
-  repositories {
-    ...
-    maven { url 'https://jitpack.io' }
-  }
+    repositories {
+        maven { url 'https://jitpack.io' }
+    }
 }
 ```
 
-And make sure this is in your app build.gradle
+And ProperBaseAdapter dependency is added to app build.gradle
 ``` gradle
 dependencies {
-  implementation "com.github.mvojtkovszky:ProperBaseAdapter:$latest_version"
+    implementation "com.github.mvojtkovszky:ProperBaseAdapter:$latest_version"
 }
 ```

app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    buildToolsVersion "30.0.2"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8

app/src/main/kotlin/com/vojtkovszky/properbaseadapter/example/MainActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 import com.vojtkovszky.properbaseadapter.*
@@ -21,7 +22,7 @@ class MainActivity : AppCompatActivity(), ProperBaseAdapterImplementation {
         // let's start
         refreshRecyclerView(
             refreshType = DataDispatchMethod.SET_DATA_AND_REFRESH,
-            delayMillis = 1000)
+            delayMillis = 500)
     }
 
     override fun getAdapterData(data: MutableList<AdapterItem<*>>): MutableList<AdapterItem<*>> {
@@ -47,6 +48,7 @@ class MainActivity : AppCompatActivity(), ProperBaseAdapterImplementation {
 
         // and another image for the last row
         data.add(ImageViewItem(ContextCompat.getDrawable(this, android.R.drawable.ic_btn_speak_now))
+            .withMargins(marginBottom = resources.getDimensionPixelSize(R.dimen.dp16))
             .withViewTag("BOTTOM_IMAGE"))
 
         return data
@@ -56,6 +58,12 @@ class MainActivity : AppCompatActivity(), ProperBaseAdapterImplementation {
         return findViewById(R.id.recyclerView)
     }
 
+    override fun getNewLayoutManager(): RecyclerView.LayoutManager? {
+        return getRecyclerView()?.let {
+            LinearLayoutManager(it.context, RecyclerView.VERTICAL, false)
+        }
+    }
+
     override fun fadeOutStickyHeaders(): Boolean {
         return true
     }

app/src/main/kotlin/com/vojtkovszky/properbaseadapter/example/items/SectionHeaderItem.kt

@@ -1,6 +1,5 @@
 package com.vojtkovszky.properbaseadapter.example.items
 
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.vojtkovszky.properbaseadapter.AdapterItem
@@ -10,7 +9,7 @@ import kotlinx.android.synthetic.main.section_header_view.view.*
 class SectionHeaderItem(private val text: String): AdapterItem<View>() {
 
     override fun getNewView(parent: ViewGroup): View {
-        return LayoutInflater.from(parent.context).inflate(R.layout.section_header_view, parent, false)
+        return getViewFromLayout(parent, R.layout.section_header_view)
     }
 
     override fun onViewBound(view: View) {

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.0'
     repositories {
         google()
         jcenter()
@@ -12,6 +12,7 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenLocal()
         google()
         jcenter()
     }

properbaseadapter/build.gradle

@@ -1,10 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    buildToolsVersion "30.0.2"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -18,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 4
-        versionName "1.3.0"
+        versionCode 5
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,11 +31,48 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+// handle publishing
+project.afterEvaluate {
+    publishing {
+        publications {
+            library(MavenPublication) {
+                groupId = 'com.github.mvojtkovszky'
+                artifactId = 'BillingHelper'
+                version = android.defaultConfig.versionName
+                artifact bundleDebugAar
+                // make sure pom has all dependencies
+                pom.withXml {
+                    def dependenciesNode = asNode().appendNode('dependencies')
+                    configurations.api.allDependencies
+                            .findAll { dependency -> dependency.name != "unspecified" }
+                            .each { dependency ->
+                                addDependency(dependenciesNode.appendNode('dependency'), dependency, "compile")
+                            }
+                    configurations.implementation.allDependencies
+                            .findAll { dependency -> !configurations.api.allDependencies.contains(dependency) }
+                            .findAll { dependency -> dependency.name != "unspecified" }
+                            .each { dependency ->
+                                addDependency(dependenciesNode.appendNode('dependency'), dependency, "runtime")
+                            }
+                }
+            }
+        }
+    }
+}
+
+static def addDependency(dependencyNode, dependency, scope) {
+    dependencyNode.appendNode('groupId', dependency.group)
+    dependencyNode.appendNode('artifactId', dependency.name)
+    dependencyNode.appendNode('version', dependency.version)
+    dependencyNode.appendNode('scope', scope)
+}

properbaseadapter/src/main/AndroidManifest.xml

@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vojtkovszky.properbaseadapter" />
+<manifest package="com.vojtkovszky.properbaseadapter" />

properbaseadapter/src/main/kotlin/com/vojtkovszky/properbaseadapter/AdapterItem.kt

@@ -1,8 +1,10 @@
 package com.vojtkovszky.properbaseadapter
 
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.AnimRes
+import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.reflect.KClass
 
@@ -19,7 +21,6 @@ abstract class AdapterItem<AIV: View> : AdapterViewHolder.OnCallbackListener<AIV
     private var boundPosition = RecyclerView.NO_POSITION // position when bind is called
 
     @AnimRes internal var animation: Int = 0  // animation when view will get displayed
-    internal var layoutParamsInitialized = false // flag telling us if layout parameters have been applied yet
     internal var isStickyHeader: Boolean = false   // sticky header option.
     internal var clickListener: View.OnClickListener? = null  // generic click listener
     internal var viewTag: Any? = null  // allows to attach a tag to item
@@ -49,7 +50,15 @@ abstract class AdapterItem<AIV: View> : AdapterViewHolder.OnCallbackListener<AIV
             }
             return h
         }
-    }
+
+        /**
+         * Convenience function to return inflated view from layout.
+         * Commonly used for [getNewView] when using own custom layout
+         */
+        fun getViewFromLayout(parent: ViewGroup, @LayoutRes layoutRes: Int): View {
+            return LayoutInflater.from(parent.context).inflate(layoutRes, parent, false)
+        }
+     }
 
     /**
      * Called when underlying adapter calls
@@ -158,15 +167,15 @@ abstract class AdapterItem<AIV: View> : AdapterViewHolder.OnCallbackListener<AIV
     /**
      * Define custom margins for this item to be applied when view gets bound.
      */
-    open fun withMargins(marginStart: Int = 0,
-                         marginTop: Int = 0,
-                         marginEnd: Int = 0,
-                         marginBottom: Int = 0
+    open fun withMargins(marginStart: Int? = null,
+                         marginTop: Int? = null,
+                         marginEnd: Int? = null,
+                         marginBottom: Int? = null
     ): AdapterItem<AIV> {
-        this.marginStart = marginStart
-        this.marginTop = marginTop
-        this.marginEnd = marginEnd
-        this.marginBottom = marginBottom
+        this.marginStart = marginStart ?: this.marginStart
+        this.marginTop = marginTop ?: this.marginTop
+        this.marginEnd = marginEnd ?: this.marginEnd
+        this.marginBottom = marginBottom ?: this.marginBottom
         return this
     }
 

properbaseadapter/src/main/kotlin/com/vojtkovszky/properbaseadapter/ProperBaseAdapter.kt

@@ -17,6 +17,9 @@ class ProperBaseAdapter constructor(data: MutableList<AdapterItem<*>> = mutableL
     // cache view type ids
     var viewTypeCachingEnabled = true
 
+    // allows us to properly set layout parameters in case LinearLayout is used
+    var linearLayoutManagerOrientation = RecyclerView.VERTICAL
+
     // Represents data in the adapter
     private lateinit var data: MutableList<AdapterItem<*>>
     // Represents cache of view type ids from our data.
@@ -247,7 +250,12 @@ class ProperBaseAdapter constructor(data: MutableList<AdapterItem<*>> = mutableL
             // retrieve params or create new. By default parameters take full available width
             val itemViewLayoutParams =
                 if (viewHolder.itemView.layoutParams != null) viewHolder.itemView.layoutParams as RecyclerView.LayoutParams
-                else RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+                else {
+                    val width =
+                        if (linearLayoutManagerOrientation == RecyclerView.VERTICAL) ViewGroup.LayoutParams.MATCH_PARENT
+                        else ViewGroup.LayoutParams.WRAP_CONTENT
+                    RecyclerView.LayoutParams(width, ViewGroup.LayoutParams.WRAP_CONTENT)
+                }
             // apply margins as defined by adapter item
             itemViewLayoutParams.setMargins(adapterItem.marginStart, adapterItem.marginTop,
                     adapterItem.marginEnd, adapterItem.marginBottom)
@@ -256,7 +264,6 @@ class ProperBaseAdapter constructor(data: MutableList<AdapterItem<*>> = mutableL
             if (viewHolder.itemView.layoutParams == null) {
                 viewHolder.itemView.layoutParams = itemViewLayoutParams
             }
-            adapterItem.layoutParamsInitialized = true
 
             // add generic click listener, if present
             if (adapterItem.clickListener != null) {

properbaseadapter/src/main/kotlin/com/vojtkovszky/properbaseadapter/ProperBaseAdapterImplementation.kt

@@ -36,7 +36,7 @@ interface ProperBaseAdapterImplementation {
      * Define a layout manager.
      * Default implementation will use LinearLayoutManager
      */
-    fun getLayoutManager(): RecyclerView.LayoutManager? {
+    fun getNewLayoutManager(): RecyclerView.LayoutManager? {
         return getRecyclerView()?.let { LinearLayoutManager(it.context) }
     }
 
@@ -98,11 +98,16 @@ interface ProperBaseAdapterImplementation {
         try {
             // set layout manager if not set
             if (recyclerView.layoutManager == null) {
-                recyclerView.layoutManager = getLayoutManager()
+                recyclerView.layoutManager = getNewLayoutManager()
             }
 
             // setup adapters
-            val adapter = getAdapter() ?: ProperBaseAdapter()
+            val adapter = getAdapter() ?: ProperBaseAdapter().also {
+                // allows us to properly set default layout parameters in case LinearLayout is used
+                if (recyclerView.layoutManager is LinearLayoutManager) {
+                    it.linearLayoutManagerOrientation = (recyclerView.layoutManager as LinearLayoutManager).orientation
+                }
+            }
 
             // different behaviour based on refresh type
             when (refreshType) {