From f6adb18ab4238bfdc0f54cd72ac0b4d010eb066c Mon Sep 17 00:00:00 2001 From: Oksana Pokrovskaya Date: Tue, 13 Mar 2018 14:43:56 +0300 Subject: [PATCH] static --- .../adapters/DelegateListAdapter.kt | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegateListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegateListAdapter.kt index f4664a9..5ea4fae 100644 --- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegateListAdapter.kt +++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegateListAdapter.kt @@ -87,9 +87,7 @@ class DelegateListAdapter( attachedRecyclerViews.add(recyclerView) } - private fun anyRecyclerViewShown(): Boolean { - return attachedRecyclerViews.any { it.isShown } - } + private fun anyRecyclerViewShown(): Boolean = attachedRecyclerViews.any { it.isShown } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { super.onDetachedFromRecyclerView(recyclerView) @@ -101,9 +99,7 @@ class DelegateListAdapter( * * @return List of [AdapterDelegate]. */ - fun getDelegates(): List> { - return Collections.unmodifiableList(delegates) - } + fun getDelegates(): List> = Collections.unmodifiableList(delegates) /** * Adds [ItemAdapterDelegate] to adapter. @@ -239,9 +235,7 @@ class DelegateListAdapter( } - override fun getItemCount(): Int { - return headersCount + items.size + footersCount - } + override fun getItemCount(): Int = headersCount + items.size + footersCount @Suppress("UNCHECKED_CAST") override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TItemViewHolder { @@ -255,7 +249,9 @@ class DelegateListAdapter( override fun onBindViewHolder(holder: TItemViewHolder, positionInAdapter: Int) { tryDelegateAction(positionInAdapter, - BiConsumer { itemAdapterDelegate, positionInCollection -> bindItemViewHolder(itemAdapterDelegate, holder, items[positionInCollection!!], null, positionInAdapter, positionInCollection!!) }, + BiConsumer { itemAdapterDelegate, positionInCollection -> + bindItemViewHolder(itemAdapterDelegate, holder, items[positionInCollection], null, positionInAdapter, positionInCollection) + }, Consumer { positionAdapterDelegate -> positionAdapterDelegate.onBindViewHolder(holder, positionInAdapter) }, Consumer { positionInCollection -> if (positionInCollection >= 0) { @@ -316,7 +312,8 @@ class DelegateListAdapter( { any -> when (onItemClickListener) { is OnItemClickListener<*> -> (onItemClickListener as OnItemClickListener).onItemClicked(item) - is OnItemWithPositionClickListener<*> -> (onItemClickListener as OnItemWithPositionClickListener).onItemClicked(item, positionInAdapter, positionInCollection) + is OnItemWithPositionClickListener<*> -> (onItemClickListener as OnItemWithPositionClickListener) + .onItemClicked(item, positionInAdapter, positionInCollection) else -> Lc.assertion("Unexpected onItemClickListener type " + onItemClickListener!!) } }, @@ -404,9 +401,7 @@ class DelegateListAdapter( * @param positionInCollection Position of clicked item in inner collection; * @return True if click listener enabled for such item. */ - fun isOnClickListenerDisabled(item: TItem, positionInAdapter: Int, positionInCollection: Int): Boolean { - return false - } + fun isOnClickListenerDisabled(item: TItem, positionInAdapter: Int, positionInCollection: Int): Boolean = false /** * Interface to simply add item click listener. @@ -442,10 +437,6 @@ class DelegateListAdapter( } - private inner class LongContainer { - - var value: Long = 0 - - } + private data class LongContainer(var value: Long = 0) }