Merge branch 'AllanWang-extension-factory-type' into develop

mikepenz · Jun 15, 2019 · 9c845be · 9c845be
2 parents 8ebd3f6 + bb60200
commit 9c845be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/extensions/ExtensionFactory.kt b/library-core/src/main/java/com/mikepenz/fastadapter/extensions/ExtensionFactory.kt
@@ -5,11 +5,9 @@ import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.IAdapterExtension
 import com.mikepenz.fastadapter.IItem
 
-interface ExtensionFactory {
+interface ExtensionFactory<T : IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>> {
 
-    val clazz: Class<out IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>>
+    val clazz: Class<T>
 
-    fun create(
-            fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>
-    ): IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>?
+    fun create(fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>): T?
 }
diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/extensions/ExtensionsFactories.kt b/library-core/src/main/java/com/mikepenz/fastadapter/extensions/ExtensionsFactories.kt
@@ -7,10 +7,9 @@ import com.mikepenz.fastadapter.IItem
 
 object ExtensionsFactories {
 
-    private val factories =
-            LinkedHashMap<Class<out IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>>, ExtensionFactory>()
+    private val factories = LinkedHashMap<Class<out IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>>, ExtensionFactory<*>>()
 
-    fun register(factory: ExtensionFactory) {
+    fun register(factory: ExtensionFactory<*>) {
         factories[factory.clazz] = factory
     }
 

diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtensionFactory.kt b/library-core/src/main/java/com/mikepenz/fastadapter/select/SelectExtensionFactory.kt
@@ -2,17 +2,16 @@ package com.mikepenz.fastadapter.select
 
 import androidx.recyclerview.widget.RecyclerView
 import com.mikepenz.fastadapter.FastAdapter
-import com.mikepenz.fastadapter.IAdapterExtension
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.extensions.ExtensionFactory
 
-class SelectExtensionFactory : ExtensionFactory {
+class SelectExtensionFactory : ExtensionFactory<SelectExtension<*>> {
 
     override val clazz = SelectExtension::class.java
 
     override fun create(
-            fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>
-    ): IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>? {
+        fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>
+    ): SelectExtension<*>? {
         return SelectExtension(fastAdapter)
     }
 }
diff --git a/...xpandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtensionFactory.kt b/...xpandable/src/main/java/com/mikepenz/fastadapter/expandable/ExpandableExtensionFactory.kt
@@ -2,17 +2,16 @@ package com.mikepenz.fastadapter.expandable
 
 import androidx.recyclerview.widget.RecyclerView
 import com.mikepenz.fastadapter.FastAdapter
-import com.mikepenz.fastadapter.IAdapterExtension
 import com.mikepenz.fastadapter.IItem
 import com.mikepenz.fastadapter.extensions.ExtensionFactory
 
-class ExpandableExtensionFactory : ExtensionFactory {
+class ExpandableExtensionFactory : ExtensionFactory<ExpandableExtension<*>> {
 
     override val clazz = ExpandableExtension::class.java
 
     override fun create(
-            fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>
-    ): IAdapterExtension<out IItem<out RecyclerView.ViewHolder>>? {
+        fastAdapter: FastAdapter<out IItem<out RecyclerView.ViewHolder>>
+    ): ExpandableExtension<*>? {
         return ExpandableExtension(fastAdapter)
     }
 }