Merge pull request #1 from filipkowicz/data_binding_view_holders

filipkowicz · web-flow · commit b9488844f63b · 2019-12-23T23:56:13.000+01:00
DataBinding version
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "app/src/main/java/headerGist"]
-	path = app/src/main/java/headerGist
+	path = headeritemdecorator/src/main/java/com/filipkowicz/headeritemdecorator/headerGist
 	url = git@gist.github.com:1a769001fae407b8813ab4387c42fcbd.git
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,8 @@ apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
+apply plugin: 'kotlin-kapt'
+
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -21,12 +23,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    dataBinding {
+        enabled = true
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(":headeritemdecorator")
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
@@ -35,5 +42,5 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
 }
diff --git a/app/src/main/java/com/filipkowicz/examples/MainActivity.kt b/app/src/main/java/com/filipkowicz/examples/MainActivity.kt
@@ -1,13 +1,18 @@
 package com.filipkowicz.examples
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
 import com.filipkowicz.examples.ui.main.MainFragment
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+        )
         setContentView(R.layout.main_activity)
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
diff --git a/app/src/main/java/com/filipkowicz/examples/ui/main/Adapter.kt b/app/src/main/java/com/filipkowicz/examples/ui/main/Adapter.kt
@@ -3,14 +3,17 @@ package com.filipkowicz.examples.ui.main
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.TextView
+import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.filipkowicz.examples.BR
 import com.filipkowicz.examples.R
+import com.filipkowicz.examples.databinding.HeaderLayoutBinding
+import com.filipkowicz.examples.databinding.ItemLayoutBinding
 
 class Adapter
-    : ListAdapter<ListItem, RecyclerView.ViewHolder>(object : DiffUtil.ItemCallback<ListItem>() {
+    : ListAdapter<ListItem, DataBindingViewHolder>(object : DiffUtil.ItemCallback<ListItem>() {
     override fun areItemsTheSame(oldItem: ListItem, newItem: ListItem): Boolean {
         return oldItem.itemType == newItem.itemType
     }
@@ -21,29 +24,30 @@ class Adapter
     }
 }) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataBindingViewHolder =
         when (viewType) {
-            R.layout.item_layout -> LayoutInflater.from(parent.context).inflate(
-                viewType,
-                parent,
-                false
-            )
-            R.layout.header_layout -> LayoutInflater.from(parent.context).inflate(
-                viewType,
-                parent,
-                false
-            )
+            R.layout.item_layout -> HeaderLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            R.layout.header_layout -> ItemLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
             else -> throw IllegalArgumentException("no supported item id")
         }.let {
-            object : RecyclerView.ViewHolder(it) {}
+             DataBindingViewHolder(it)
         }
 
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        (holder.itemView as? TextView)?.text = (getItem(position) as? MainViewModel.Data)?.data
+    override fun onBindViewHolder(holder: DataBindingViewHolder, position: Int) {
+        holder.bind(getItem(position) as MainViewModel.Data)
     }
 
     override fun getItemViewType(position: Int): Int {
         return getItem(position).itemType
     }
+}
+
+class DataBindingViewHolder(private val binding: ViewDataBinding) : RecyclerView.ViewHolder(binding.root) {
+
+    fun bind(item: MainViewModel.Data) {
+        binding.setVariable(BR.data, item.data)
+        binding.executePendingBindings()
+    }
+
 }
diff --git a/app/src/main/java/com/filipkowicz/examples/ui/main/MainFragment.kt b/app/src/main/java/com/filipkowicz/examples/ui/main/MainFragment.kt
@@ -1,15 +1,15 @@
 package com.filipkowicz.examples.ui.main
 
-import HeaderItemDecoration
-import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.RecyclerView
 import com.filipkowicz.examples.R
+import com.filipkowicz.headeritemdecorator.HeaderItemDecoration
 
 class MainFragment : Fragment() {
 
@@ -26,7 +26,9 @@ class MainFragment : Fragment() {
         return inflater.inflate(R.layout.main_fragment, container, false).also {
             it.findViewById<RecyclerView>(R.id.recycler).apply {
                 adapter = this@MainFragment.adapter
-                addItemDecoration(HeaderItemDecoration(this) {
+                addItemDecoration(HeaderItemDecoration(this,
+                    shouldFadeOutHeader = true
+                ) {
                     this@MainFragment.adapter.getItemViewType(it) == R.layout.header_layout
                 })
             }
diff --git a/app/src/main/java/com/filipkowicz/examples/ui/main/MainViewModel.kt b/app/src/main/java/com/filipkowicz/examples/ui/main/MainViewModel.kt
@@ -9,6 +9,7 @@ class MainViewModel : ViewModel() {
 
     val items: LiveData<List<ListItem>> = MutableLiveData(
         listOf(
+            Data(R.layout.header_layout, "HEADER 0"),
             Data(R.layout.item_layout, "item 1"),
             Data(R.layout.item_layout, "item 2"),
             Data(R.layout.header_layout, "HEADER 1"),
diff --git a/app/src/main/java/headerGist b/app/src/main/java/headerGist
diff --git a/app/src/main/res/layout/header_layout.xml b/app/src/main/res/layout/header_layout.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textView"
-    android:layout_width="match_parent"
-    android:layout_height="102dp"
-    android:gravity="center"
-    android:background="@color/colorAccent"
-    style="@style/TextAppearance.AppCompat.Headline"
-    android:text="Header" />
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="data"
+            type="String" />
+
+    </data>
+
+    <TextView
+        android:id="@+id/textView"
+        style="@style/TextAppearance.AppCompat.Headline"
+        android:layout_width="match_parent"
+        android:layout_height="102dp"
+        android:background="@color/colorAccent"
+        android:gravity="center"
+        android:text="@{data}"
+        tools:text="header" />
+</layout>
diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/textView"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:gravity="center"
-    android:background="@color/colorPrimary"
-    style="@style/TextAppearance.AppCompat.Display3"
-    android:text="Item" />
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="data"
+            type="String" />
+
+    </data>
+
+    <TextView
+        android:id="@+id/textView"
+        style="@style/TextAppearance.AppCompat.Display3"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:background="@color/colorPrimary"
+        android:gravity="center"
+        android:text="@{data}"
+        tools:text="item" />
+</layout>
diff --git a/app/src/main/res/layout/main_fragment.xml b/app/src/main/res/layout/main_fragment.xml
@@ -5,16 +5,29 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#ff00ff"
     tools:context=".ui.main.MainFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        android:clipToPadding="false"
         android:orientation="vertical"
-        app:layout_constraintTop_toTopOf="parent"
+        android:paddingTop="150dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:background="#aaffffff"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:title="@string/app_name"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,11 +1,13 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -8,9 +8,11 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-beta04'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
+        classpath 'com.novoda:bintray-release:0.9.2'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/headeritemdecorator/.gitignore b/headeritemdecorator/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/headeritemdecorator/build.gradle b/headeritemdecorator/build.gradle
@@ -0,0 +1,68 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+    defaultConfig {
+        minSdkVersion 22
+        targetSdkVersion 29
+        versionCode 2
+        versionName computeVersionName()
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+
+}
+
+def computeVersionName() {
+    return "0.8"
+}
+
+
+//to release use ./gradlew clean build headeritemdecorator:bintrayUpload -PdryRun=false
+publish {
+
+    Properties properties = new Properties()
+    InputStream inputStream = project.rootProject.file('local.properties').newDataInputStream() ;
+    properties.load( inputStream )
+    bintrayUser = properties.getProperty('bintrayUser')
+    bintrayKey = properties.getProperty('bintrayKey')
+
+    def groupProjectID = 'com.filipkowicz.tools'
+    def artifactProjectID = 'header-item-decoration'
+    def publishVersionID = computeVersionName()
+
+    userOrg = 'filipkowicz'
+    repoName = 'HeaderItemDecoration'
+    groupId = groupProjectID
+    artifactId = artifactProjectID
+    publishVersion = publishVersionID
+    desc = 'Simple decorator for recyclerView to add Sticky headers in Kotlin'
+    website = 'https://gist.github.com/filipkowicz/1a769001fae407b8813ab4387c42fcb'
+
+}
diff --git a/headeritemdecorator/consumer-rules.pro b/headeritemdecorator/consumer-rules.pro
diff --git a/headeritemdecorator/proguard-rules.pro b/headeritemdecorator/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/headeritemdecorator/src/androidTest/java/com/filipkowicz/headeritemdecorator/ExampleInstrumentedTest.kt b/headeritemdecorator/src/androidTest/java/com/filipkowicz/headeritemdecorator/ExampleInstrumentedTest.kt
diff --git a/headeritemdecorator/src/main/AndroidManifest.xml b/headeritemdecorator/src/main/AndroidManifest.xml
diff --git a/headeritemdecorator/src/main/java/com/filipkowicz/headeritemdecorator/headerGist b/headeritemdecorator/src/main/java/com/filipkowicz/headeritemdecorator/headerGist
diff --git a/headeritemdecorator/src/test/java/com/filipkowicz/headeritemdecorator/ExampleUnitTest.kt b/headeritemdecorator/src/test/java/com/filipkowicz/headeritemdecorator/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 [submodule "app/src/main/java/headerGist"]
 -	path = app/src/main/java/headerGist
 +	path = headeritemdecorator/src/main/java/com/filipkowicz/headeritemdecorator/headerGist
 	url = [email protected]:1a769001fae407b8813ab4387c42fcbd.git