From 3f144bdbeeda6057d244b6a6eabff7b1f73d32ba Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 13:05:03 -0700 Subject: Add initial binding --- build.gradle | 6 +- fastadapter-databinding/.gitignore | 1 + fastadapter-databinding/build.gradle | 21 ++++ fastadapter-databinding/consumer-rules.pro | 0 fastadapter-databinding/proguard-rules.pro | 21 ++++ .../src/main/AndroidManifest.xml | 1 + .../fastadapter/databinding/BindingItem.kt | 122 +++++++++++++++++++++ .../fastadapter/databinding/FastBindingAdapter.kt | 45 ++++++++ settings.gradle | 1 + 9 files changed, 216 insertions(+), 2 deletions(-) create mode 100644 fastadapter-databinding/.gitignore create mode 100644 fastadapter-databinding/build.gradle create mode 100644 fastadapter-databinding/consumer-rules.pro create mode 100644 fastadapter-databinding/proguard-rules.pro create mode 100644 fastadapter-databinding/src/main/AndroidManifest.xml create mode 100644 fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt create mode 100644 fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt diff --git a/build.gradle b/build.gradle index bc5fadf..e9c7d86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,9 @@ import kau.ChangelogGenerator import kau.Plugins -buildscript { +buildscript { + ext.kotlin_version = '1.3.41' + repositories { google() jcenter() @@ -17,7 +19,7 @@ buildscript { classpath Plugins.dexCount classpath Plugins.gitVersion classpath Plugins.spotless - } + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } wrapper.setDistributionType(Wrapper.DistributionType.ALL) } diff --git a/fastadapter-databinding/.gitignore b/fastadapter-databinding/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/fastadapter-databinding/.gitignore @@ -0,0 +1 @@ +/build diff --git a/fastadapter-databinding/build.gradle b/fastadapter-databinding/build.gradle new file mode 100644 index 0000000..aefb22e --- /dev/null +++ b/fastadapter-databinding/build.gradle @@ -0,0 +1,21 @@ +import kau.Dependencies +import kau.Versions + +ext.kauSubModuleMinSdk = Versions.coreMinSdk + +apply from: '../android-lib.gradle' + +android { + dataBinding { + enabled = true + } +} + +dependencies { + implementation project(':core') + + api Dependencies.fastAdapter + api Dependencies.fastAdapter("utils") +} + +apply from: '../artifacts.gradle' diff --git a/fastadapter-databinding/consumer-rules.pro b/fastadapter-databinding/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/fastadapter-databinding/proguard-rules.pro b/fastadapter-databinding/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/fastadapter-databinding/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/fastadapter-databinding/src/main/AndroidManifest.xml b/fastadapter-databinding/src/main/AndroidManifest.xml new file mode 100644 index 0000000..acd1012 --- /dev/null +++ b/fastadapter-databinding/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt new file mode 100644 index 0000000..e52838b --- /dev/null +++ b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt @@ -0,0 +1,122 @@ +package ca.allanwang.fastadapter.databinding + + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.databinding.DataBindingUtil +import androidx.databinding.ViewDataBinding +import androidx.recyclerview.widget.RecyclerView +import ca.allanwang.gitdroid.logger.L +import ca.allanwang.gitdroid.views.BR +import com.bumptech.glide.Glide +import com.mikepenz.fastadapter.FastAdapter +import com.mikepenz.fastadapter.items.AbstractItem +import com.mikepenz.fastadapter.listeners.ClickEventHook + +typealias GenericBindingItem = BindingItem<*> + +abstract class BindingItem(open val data: Any?) : AbstractItem(), + BindingLayout { + + override val type: Int + get() = layoutRes + + override fun createView(ctx: Context, parent: ViewGroup?): View { + val binding: ViewDataBinding = DataBindingUtil.inflate( + LayoutInflater.from(ctx), + layoutRes, parent, + false, + null + ) + return binding.root + } + + final override fun bindView(holder: ViewHolder, payloads: MutableList) { + super.bindView(holder, payloads) + val binding = DataBindingUtil.getBinding(holder.itemView) ?: return + binding.bindView(holder, payloads) + binding.executePendingBindings() + } + + open fun Binding.bindView(holder: ViewHolder, payloads: MutableList) { + setVariable(BR.model, data) + } + + final override fun unbindView(holder: ViewHolder) { + super.unbindView(holder) + val binding = DataBindingUtil.getBinding(holder.itemView) ?: return + binding.unbindView(holder) + binding.unbind() + } + + open fun Binding.unbindView(holder: ViewHolder) {} + + final override fun getViewHolder(v: View): ViewHolder = ViewHolder(v, layoutRes) + + override fun failedToRecycle(holder: ViewHolder): Boolean { + L.e { "Failed to recycle" } + return super.failedToRecycle(holder) + } + + companion object { + @JvmStatic + protected fun unbindGlide(vararg imageView: ImageView) { + if (imageView.isEmpty()) { + return + } + val manager = Glide.with(imageView.first().context) + imageView.forEach { manager.clear(it) } + } + + @JvmStatic + protected fun unbind(vararg imageView: ImageView) { + imageView.forEach { it.setImageDrawable(null) } + } + + @JvmStatic + protected fun unbind(vararg textView: TextView) { + textView.forEach { it.text = null } + } + } + + class ViewHolder(itemView: View, internal val layoutRes: Int) : RecyclerView.ViewHolder(itemView) + +} + +interface BindingLayout { + val layoutRes: Int +} + + +abstract class BindingClickEventHook>(val identifier: BindingLayout) : + ClickEventHook() { + + private fun RecyclerView.ViewHolder.binding(): Binding? { + val holder = this as? BindingItem.ViewHolder ?: return null + if (holder.layoutRes != identifier.layoutRes) { + return null + } + return DataBindingUtil.getBinding(itemView) + } + + final override fun onBind(viewHolder: RecyclerView.ViewHolder): View? = + viewHolder.binding()?.onBind(viewHolder) ?: super.onBind(viewHolder) + + open fun Binding.onBind(viewHolder: RecyclerView.ViewHolder): View? = super.onBind(viewHolder) + + final override fun onBindMany(viewHolder: RecyclerView.ViewHolder): List? = + viewHolder.binding()?.onBindMany(viewHolder) ?: super.onBindMany(viewHolder) + + open fun Binding.onBindMany(viewHolder: RecyclerView.ViewHolder): List? = super.onBindMany(viewHolder) + + final override fun onClick(v: View, position: Int, fastAdapter: FastAdapter, item: Item) { + val binding: Binding = DataBindingUtil.findBinding(v) ?: return + binding.onClick(v, position, fastAdapter, item) + } + + abstract fun Binding.onClick(v: View, position: Int, fastAdapter: FastAdapter, item: Item) +} \ No newline at end of file diff --git a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt new file mode 100644 index 0000000..2270b5d --- /dev/null +++ b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt @@ -0,0 +1,45 @@ +package ca.allanwang.fastadapter.databinding + +import com.mikepenz.fastadapter.FastAdapter +import com.mikepenz.fastadapter.IAdapter +import com.mikepenz.fastadapter.IItemAdapter +import com.mikepenz.fastadapter.adapters.ItemAdapter +import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil + +class FastBindingAdapter private constructor(private val adapter: ItemAdapter) : + FastAdapter(), + IItemAdapter by adapter { + + constructor() : this(ItemAdapter()) + + var lastClearTime: Long = -1 + + init { + super.addAdapter(0, adapter) + } + + override fun clear(): FastBindingAdapter { + if (itemCount != 0) { + adapter.clear() + lastClearTime = System.currentTimeMillis() + } + return this + } + + override fun > addAdapter( + index: Int, + adapter: A + ): FastAdapter { + throw IllegalArgumentException("FastBindingAdapter only allows one adapter") + } + + fun setWithDiff(items: List, detectMoves: Boolean = true) { + FastAdapterDiffUtil.set( + adapter, + items, + null, + detectMoves + ) + } + +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 42d498e..0ec0606 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,7 @@ include ':core', ':about', ':adapter', ':fastadapter', + ':fastadapter-databinding', ':colorpicker', ':mediapicker', ':kpref-activity', -- cgit v1.2.3 From fe69957ee3a38023e3e7d1d9555523c69eef2ac2 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 17:53:48 -0700 Subject: Use newer data binding and remove single fast adapter --- core-ui/src/main/res-public/values/public.xml | 6 +-- core/src/main/res-public/values/public.xml | 34 ++++++------ .../fastadapter/databinding/BindingItem.kt | 60 +++++++++------------- .../fastadapter/databinding/FastBindingAdapter.kt | 45 ---------------- 4 files changed, 43 insertions(+), 102 deletions(-) delete mode 100644 fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml index f62ed25..c8c2e56 100644 --- a/core-ui/src/main/res-public/values/public.xml +++ b/core-ui/src/main/res-public/values/public.xml @@ -1,10 +1,10 @@ + + + - - - \ No newline at end of file diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml index 443f32e..211c539 100644 --- a/core/src/main/res-public/values/public.xml +++ b/core/src/main/res-public/values/public.xml @@ -1,25 +1,20 @@ + - + + + + + - - - - - - - - - - - - - + + + @@ -105,7 +100,6 @@ - @@ -113,6 +107,12 @@ - - + + + + + + + + \ No newline at end of file diff --git a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt index e52838b..d800fcd 100644 --- a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt +++ b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt @@ -1,25 +1,24 @@ package ca.allanwang.fastadapter.databinding - import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.recyclerview.widget.RecyclerView -import ca.allanwang.gitdroid.logger.L -import ca.allanwang.gitdroid.views.BR -import com.bumptech.glide.Glide +import ca.allanwang.kau.logging.KL import com.mikepenz.fastadapter.FastAdapter +import com.mikepenz.fastadapter.GenericItem import com.mikepenz.fastadapter.items.AbstractItem import com.mikepenz.fastadapter.listeners.ClickEventHook -typealias GenericBindingItem = BindingItem<*> +interface VhModel { + fun vh(): GenericItem +} -abstract class BindingItem(open val data: Any?) : AbstractItem(), +abstract class BindingItem(open val data: Any?) : + AbstractItem(), BindingLayout { override val type: Int @@ -29,22 +28,22 @@ abstract class BindingItem(open val data: Any?) : Abs val binding: ViewDataBinding = DataBindingUtil.inflate( LayoutInflater.from(ctx), layoutRes, parent, - false, - null + false ) return binding.root } + fun getBinding(holder: ViewHolder): Binding? = + DataBindingUtil.getBinding(holder.itemView) + final override fun bindView(holder: ViewHolder, payloads: MutableList) { super.bindView(holder, payloads) - val binding = DataBindingUtil.getBinding(holder.itemView) ?: return + val binding = getBinding(holder) ?: return binding.bindView(holder, payloads) binding.executePendingBindings() } - open fun Binding.bindView(holder: ViewHolder, payloads: MutableList) { - setVariable(BR.model, data) - } + abstract fun Binding.bindView(holder: ViewHolder, payloads: MutableList) final override fun unbindView(holder: ViewHolder) { super.unbindView(holder) @@ -58,40 +57,26 @@ abstract class BindingItem(open val data: Any?) : Abs final override fun getViewHolder(v: View): ViewHolder = ViewHolder(v, layoutRes) override fun failedToRecycle(holder: ViewHolder): Boolean { - L.e { "Failed to recycle" } + KL.e { "Failed to recycle" } return super.failedToRecycle(holder) } - companion object { - @JvmStatic - protected fun unbindGlide(vararg imageView: ImageView) { - if (imageView.isEmpty()) { - return - } - val manager = Glide.with(imageView.first().context) - imageView.forEach { manager.clear(it) } - } - - @JvmStatic - protected fun unbind(vararg imageView: ImageView) { - imageView.forEach { it.setImageDrawable(null) } - } - - @JvmStatic - protected fun unbind(vararg textView: TextView) { - textView.forEach { it.text = null } - } + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (other !is BindingItem<*>) return false + return identifier == other.identifier && data == other.data } - class ViewHolder(itemView: View, internal val layoutRes: Int) : RecyclerView.ViewHolder(itemView) + override fun hashCode(): Int = data.hashCode() + class ViewHolder(itemView: View, internal val layoutRes: Int) : + RecyclerView.ViewHolder(itemView) } interface BindingLayout { val layoutRes: Int } - abstract class BindingClickEventHook>(val identifier: BindingLayout) : ClickEventHook() { @@ -111,7 +96,8 @@ abstract class BindingClickEventHook? = viewHolder.binding()?.onBindMany(viewHolder) ?: super.onBindMany(viewHolder) - open fun Binding.onBindMany(viewHolder: RecyclerView.ViewHolder): List? = super.onBindMany(viewHolder) + open fun Binding.onBindMany(viewHolder: RecyclerView.ViewHolder): List? = + super.onBindMany(viewHolder) final override fun onClick(v: View, position: Int, fastAdapter: FastAdapter, item: Item) { val binding: Binding = DataBindingUtil.findBinding(v) ?: return diff --git a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt deleted file mode 100644 index 2270b5d..0000000 --- a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/FastBindingAdapter.kt +++ /dev/null @@ -1,45 +0,0 @@ -package ca.allanwang.fastadapter.databinding - -import com.mikepenz.fastadapter.FastAdapter -import com.mikepenz.fastadapter.IAdapter -import com.mikepenz.fastadapter.IItemAdapter -import com.mikepenz.fastadapter.adapters.ItemAdapter -import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil - -class FastBindingAdapter private constructor(private val adapter: ItemAdapter) : - FastAdapter(), - IItemAdapter by adapter { - - constructor() : this(ItemAdapter()) - - var lastClearTime: Long = -1 - - init { - super.addAdapter(0, adapter) - } - - override fun clear(): FastBindingAdapter { - if (itemCount != 0) { - adapter.clear() - lastClearTime = System.currentTimeMillis() - } - return this - } - - override fun > addAdapter( - index: Int, - adapter: A - ): FastAdapter { - throw IllegalArgumentException("FastBindingAdapter only allows one adapter") - } - - fun setWithDiff(items: List, detectMoves: Boolean = true) { - FastAdapterDiffUtil.set( - adapter, - items, - null, - detectMoves - ) - } - -} \ No newline at end of file -- cgit v1.2.3 From acd9323165edbba48846009942bf830ccb580950 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 18:00:29 -0700 Subject: Add SingleFastAdapter --- fastadapter/build.gradle | 3 +- .../ca/allanwang/kau/adapters/SingleFastAdapter.kt | 42 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle index ff58fe8..0fbcce9 100644 --- a/fastadapter/build.gradle +++ b/fastadapter/build.gradle @@ -10,7 +10,8 @@ dependencies { api project(':adapter') api Dependencies.fastAdapter - api Dependencies.fastAdapter("utils") + implementation Dependencies.fastAdapter("diff") + implementation Dependencies.fastAdapter("utils") } apply from: '../artifacts.gradle' diff --git a/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt new file mode 100644 index 0000000..1155c79 --- /dev/null +++ b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt @@ -0,0 +1,42 @@ +package ca.allanwang.kau.adapters + +import com.mikepenz.fastadapter.FastAdapter +import com.mikepenz.fastadapter.GenericItem +import com.mikepenz.fastadapter.IAdapter +import com.mikepenz.fastadapter.IItemAdapter +import com.mikepenz.fastadapter.adapters.ItemAdapter +import com.mikepenz.fastadapter.diff.FastAdapterDiffUtil + +/** + * Fast adapter with prewrapped item adapter + */ +class SingleFastAdapter private constructor(val adapter: ItemAdapter) : + FastAdapter(), IItemAdapter by adapter { + + constructor() : this(ItemAdapter()) + + var lastClearTime: Long = -1 + + init { + super.addAdapter(0, adapter) + } + + override fun clear(): SingleFastAdapter { + if (itemCount != 0) { + adapter.clear() + lastClearTime = System.currentTimeMillis() + } + return this + } + + override fun > addAdapter( + index: Int, + adapter: A + ): FastAdapter { + throw IllegalStateException("SingleFastAdapter only allows one adapter.") + } + + fun setWithDiff(items: List, detectMoves: Boolean = true) { + FastAdapterDiffUtil.set(adapter, items, detectMoves) + } +} \ No newline at end of file -- cgit v1.2.3 From fbe6d910d43e45145d13eb08c48f83addee1da56 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 18:01:50 -0700 Subject: Update buildscript --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e9c7d86..cf8998f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,7 @@ import kau.ChangelogGenerator import kau.Plugins -buildscript { - ext.kotlin_version = '1.3.41' +buildscript { repositories { google() @@ -19,7 +18,7 @@ buildscript { classpath Plugins.dexCount classpath Plugins.gitVersion classpath Plugins.spotless - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } + } wrapper.setDistributionType(Wrapper.DistributionType.ALL) } -- cgit v1.2.3 From 96b0895a15d1c637075eab05a59575cce2746cfc Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 18:10:09 -0700 Subject: Add missing dependency --- about/build.gradle | 1 + .../ca/allanwang/fastadapter/databinding/BindingItem.kt | 17 ++++++++++++++++- .../ca/allanwang/kau/adapters/SingleFastAdapter.kt | 17 ++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/about/build.gradle b/about/build.gradle index 274ef5c..114428b 100644 --- a/about/build.gradle +++ b/about/build.gradle @@ -11,6 +11,7 @@ android { dependencies { implementation project(':core-ui') implementation project(':fastadapter') + implementation Dependencies.fastAdapter("utils") api Dependencies.aboutLibraries } diff --git a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt index d800fcd..b2b0f26 100644 --- a/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt +++ b/fastadapter-databinding/src/main/kotlin/ca/allanwang/fastadapter/databinding/BindingItem.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2019 Allan Wang + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package ca.allanwang.fastadapter.databinding import android.content.Context @@ -105,4 +120,4 @@ abstract class BindingClickEventHook, item: Item) -} \ No newline at end of file +} diff --git a/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt index 1155c79..e183bde 100644 --- a/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt +++ b/fastadapter/src/main/kotlin/ca/allanwang/kau/adapters/SingleFastAdapter.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2019 Allan Wang + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package ca.allanwang.kau.adapters import com.mikepenz.fastadapter.FastAdapter @@ -39,4 +54,4 @@ class SingleFastAdapter private constructor(val adapter: ItemAdapter, detectMoves: Boolean = true) { FastAdapterDiffUtil.set(adapter, items, detectMoves) } -} \ No newline at end of file +} -- cgit v1.2.3 From 0470656b4b880d522d8a9e1355f570400d8442e7 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 18:18:25 -0700 Subject: Update versions --- buildSrc/src/main/kotlin/kau/Versions.kt | 16 ++++++++-------- docs/Changelog.md | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- sample/src/main/res/xml/kau_changelog.xml | 5 +---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index a646292..b4b08b0 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -15,7 +15,7 @@ object Versions { const val googleMaterial = "1.0.0" // https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview - const val recyclerView = "1.1.0-beta02" + const val recyclerView = "1.1.0-beta04" // https://mvnrepository.com/artifact/androidx.cardview/cardview const val cardView = "1.0.0" @@ -24,13 +24,13 @@ object Versions { const val constraintLayout = "2.0.0-beta2" // https://kotlinlang.org/docs/reference/using-gradle.html - const val kotlin = "1.3.41" + const val kotlin = "1.3.50" // https://github.com/Kotlin/kotlinx.coroutines/releases const val coroutines = "1.3.1" // https://github.com/mikepenz/AboutLibraries/releases - const val aboutLibraries = "6.2.3" + const val aboutLibraries = "7.0.3" // https://github.com/wasabeef/Blurry/releases const val blurry = "3.0.0" @@ -42,13 +42,13 @@ object Versions { const val glide = "4.9.0" // https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency - const val iconics = "4.0.1-b01" + const val iconics = "4.0.1-b02" const val iconicsGoogle = "3.0.1.4" const val iconicsMaterial = "2.2.0.6" const val iconicsCommunity = "3.5.95.1" // https://github.com/afollestad/material-dialogs/releases - const val materialDialog = "3.1.0" + const val materialDialog = "3.1.1" // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google const val espresso = "3.1.1" @@ -62,10 +62,10 @@ object Versions { const val testRules = "1.1.1" // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md - const val spotless = "3.24.1" + const val spotless = "3.24.2" // https://github.com/bugsnag/bugsnag-android/releases - const val bugsnag = "4.18.0" + const val bugsnag = "4.19.1" // https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases const val bugsnagPlugin="4.5.2" @@ -75,7 +75,7 @@ object Versions { // https://github.com/dcendents/android-maven-gradle-plugin/releases const val mavenPlugin = "2.1" // https://github.com/Triple-T/gradle-play-publisher/releases - const val playPublishPlugin = "2.2.1" + const val playPublishPlugin = "2.4.1" // https://github.com/KeepSafe/dexcount-gradle-plugin/releases const val dexCountPlugin = "0.8.6" diff --git a/docs/Changelog.md b/docs/Changelog.md index 0078430..f76fbe4 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -2,6 +2,7 @@ ## v5.2.0 * :fastadapter: Migrate fastadapter to v4.x.x +* :fastadapter: Remove fastadapter utils from api ## v5.1.0 * :adapter: Moved fastadapter elements to new module, :fastadapter:. To migrate, simply rename the dependency. If you don't use fast adapter, no changes are necessary diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f1f2eac..ce43d4f 100644 --- 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.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index de73b41..82d27c2 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -8,7 +8,7 @@ - + @@ -16,7 +16,6 @@ - @@ -26,13 +25,11 @@ - - -- cgit v1.2.3 From c7f2361ab63c45c8b6a370b6ab711dc7f398a4cf Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 18:32:09 -0700 Subject: Fix update errors --- .../ca/allanwang/kau/about/AboutActivityBase.kt | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt index f02d073..b12ad0e 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt @@ -47,7 +47,10 @@ import kotlinx.android.synthetic.main.kau_activity_about.* * Note that for the auto detection to work, the R fields must be excluded from Proguard * Manual lib listings and other extra modifications can be done so by overriding the open functions */ -abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilder: Configs.() -> Unit = {}) : +abstract class AboutActivityBase( + val rClass: Class<*>?, + private val configBuilder: Configs.() -> Unit = {} +) : KauBaseActivity(), ViewPager.OnPageChangeListener { val currentPage: Int @@ -90,7 +93,8 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde addOnPageChangeListener(this@AboutActivityBase) } about_indicator.setViewPager(about_pager) - about_draggable_frame.addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(this) { + about_draggable_frame.addListener(object : + ElasticDragDismissFrameLayout.SystemChromeFader(this) { override fun onDragDismissed() { window.returnTransition = TransitionInflater.from(this@AboutActivityBase) .inflateTransition(if (about_draggable_frame.translationY > 0) R.transition.kau_exit_slide_bottom else R.transition.kau_exit_slide_top) @@ -142,7 +146,14 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde * This is fetched asynchronously and you may override it to customize the list */ open fun getLibraries(libs: Libs): List = - libs.prepareLibraries(this, null, null, true, true, true)!! + libs.prepareLibraries( + this, + emptyArray(), + emptyArray(), + autoDetect = true, + checkCachedDetection = true, + sort = true + ) /* * ------------------------------------------------------------------- @@ -182,7 +193,8 @@ abstract class AboutActivityBase(val rClass: Class<*>?, private val configBuilde override fun onPageScrollStateChanged(state: Int) = Unit - override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit + override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = + Unit override fun onPageSelected(position: Int) { if (pageStatus[position] == 0) pageStatus[position] = 1 // mark as seen if previously null -- cgit v1.2.3 From eafb4881cc6c33d7ae94b1f1e1b5b34fb18ebd03 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 14 Sep 2019 19:01:33 -0700 Subject: Revert about library to older variant --- about/build.gradle | 1 - .../main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt | 10 +++++----- buildSrc/src/main/kotlin/kau/Versions.kt | 2 +- docs/Changelog.md | 1 - fastadapter/build.gradle | 2 +- kpref-activity/build.gradle | 2 ++ sample/src/main/res/xml/kau_changelog.xml | 1 - 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/about/build.gradle b/about/build.gradle index 114428b..274ef5c 100644 --- a/about/build.gradle +++ b/about/build.gradle @@ -11,7 +11,6 @@ android { dependencies { implementation project(':core-ui') implementation project(':fastadapter') - implementation Dependencies.fastAdapter("utils") api Dependencies.aboutLibraries } diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt index b12ad0e..7ba7811 100644 --- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt +++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt @@ -148,11 +148,11 @@ abstract class AboutActivityBase( open fun getLibraries(libs: Libs): List = libs.prepareLibraries( this, - emptyArray(), - emptyArray(), - autoDetect = true, - checkCachedDetection = true, - sort = true + null, + null, + true, + true, + true ) /* diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt index b4b08b0..3c54625 100644 --- a/buildSrc/src/main/kotlin/kau/Versions.kt +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -30,7 +30,7 @@ object Versions { const val coroutines = "1.3.1" // https://github.com/mikepenz/AboutLibraries/releases - const val aboutLibraries = "7.0.3" + const val aboutLibraries = "6.2.3" // https://github.com/wasabeef/Blurry/releases const val blurry = "3.0.0" diff --git a/docs/Changelog.md b/docs/Changelog.md index f76fbe4..0078430 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -2,7 +2,6 @@ ## v5.2.0 * :fastadapter: Migrate fastadapter to v4.x.x -* :fastadapter: Remove fastadapter utils from api ## v5.1.0 * :adapter: Moved fastadapter elements to new module, :fastadapter:. To migrate, simply rename the dependency. If you don't use fast adapter, no changes are necessary diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle index 0fbcce9..8abe566 100644 --- a/fastadapter/build.gradle +++ b/fastadapter/build.gradle @@ -10,8 +10,8 @@ dependencies { api project(':adapter') api Dependencies.fastAdapter + api Dependencies.fastAdapter("utils") implementation Dependencies.fastAdapter("diff") - implementation Dependencies.fastAdapter("utils") } apply from: '../artifacts.gradle' diff --git a/kpref-activity/build.gradle b/kpref-activity/build.gradle index 5cce460..7df08d3 100644 --- a/kpref-activity/build.gradle +++ b/kpref-activity/build.gradle @@ -1,3 +1,5 @@ +import kau.Dependencies + ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk ext.kauSubModuleResourcePrefix = "kau_pref_" diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index 82d27c2..5fee3cb 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -8,7 +8,6 @@ - -- cgit v1.2.3