-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #219 from rubensousa/span_size_focus
Fix focus issues with different span sizes
- Loading branch information
Showing
22 changed files
with
848 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...rview/src/androidTest/kotlin/com/rubensousa/dpadrecyclerview/test/RecyclerViewFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright 2024 Rúben Sousa | ||
| * | ||
| * 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 com.rubensousa.dpadrecyclerview.test | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.View | ||
| import androidx.fragment.app.Fragment | ||
| import com.rubensousa.dpadrecyclerview.DpadRecyclerView | ||
| import com.rubensousa.dpadrecyclerview.testing.R | ||
|
|
||
| class RecyclerViewFragment : Fragment(R.layout.dpadrecyclerview_test_container) { | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| view.findViewById<DpadRecyclerView>(R.id.recyclerView).requestFocus() | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
...erview/src/androidTest/kotlin/com/rubensousa/dpadrecyclerview/test/helpers/TestAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Copyright 2024 Rúben Sousa | ||
| * | ||
| * 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 com.rubensousa.dpadrecyclerview.test.helpers | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.os.Handler | ||
| import android.os.Looper | ||
| import androidx.recyclerview.widget.DiffUtil | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import java.util.Collections | ||
| import java.util.concurrent.Executors | ||
|
|
||
| abstract class TestAdapter<VH : RecyclerView.ViewHolder>: RecyclerView.Adapter<VH>() { | ||
|
|
||
| companion object { | ||
| private val BACKGROUND_EXECUTOR = Executors.newFixedThreadPool(4) | ||
| private val MAIN_THREAD_HANDLER = Handler(Looper.getMainLooper()) | ||
| } | ||
|
|
||
| private var items: MutableList<Int> = Collections.emptyList() | ||
| private var currentVersion = 0 | ||
|
|
||
| @SuppressLint("NotifyDataSetChanged") | ||
| fun replaceList(items: MutableList<Int>) { | ||
| this.items = items | ||
| currentVersion++ | ||
| notifyDataSetChanged() | ||
| } | ||
|
|
||
| fun submitList(newList: MutableList<Int>, commitCallback: Runnable? = null) { | ||
| val version = ++currentVersion | ||
| if (items === newList) { | ||
| commitCallback?.run() | ||
| return | ||
| } | ||
|
|
||
| if (newList.isEmpty()) { | ||
| val removed = items.size | ||
| items = Collections.emptyList() | ||
| notifyItemRangeRemoved(0, removed) | ||
| return | ||
| } | ||
|
|
||
| if (items.isEmpty()) { | ||
| items = newList | ||
| notifyItemRangeInserted(0, newList.size) | ||
| return | ||
| } | ||
|
|
||
| val oldList = items | ||
| BACKGROUND_EXECUTOR.execute { | ||
| val diffResult = calculateDiff(oldList, newList) | ||
| MAIN_THREAD_HANDLER.post { | ||
| if (version == currentVersion) { | ||
| latchList(newList, diffResult, commitCallback) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun calculateDiff( | ||
| oldList: List<Int>, | ||
| newList: List<Int> | ||
| ): DiffUtil.DiffResult { | ||
| return DiffUtil.calculateDiff(object : DiffUtil.Callback() { | ||
| override fun getOldListSize(): Int = oldList.size | ||
| override fun getNewListSize(): Int = newList.size | ||
|
|
||
| override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { | ||
| val oldItem = oldList[oldItemPosition] | ||
| val newItem = newList[newItemPosition] | ||
| return oldItem == newItem | ||
| } | ||
|
|
||
| override fun areContentsTheSame( | ||
| oldItemPosition: Int, | ||
| newItemPosition: Int | ||
| ): Boolean { | ||
| val oldItem = oldList[oldItemPosition] | ||
| val newItem = newList[newItemPosition] | ||
| return oldItem == newItem | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| private fun latchList( | ||
| newList: MutableList<Int>, | ||
| result: DiffUtil.DiffResult, | ||
| commitCallback: Runnable? | ||
| ) { | ||
| items = newList | ||
| result.dispatchUpdatesTo(this) | ||
| commitCallback?.run() | ||
| } | ||
|
|
||
| fun removeAt(index: Int) { | ||
| if (index >= 0 && index < items.size) { | ||
| currentVersion++ | ||
| items.removeAt(index) | ||
| notifyItemRemoved(index) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| fun move(from: Int, to: Int) { | ||
| currentVersion++ | ||
| Collections.swap(items, from, to) | ||
| notifyItemMoved(from, to) | ||
| } | ||
|
|
||
| fun addAt(index: Int, item: Int) { | ||
| currentVersion++ | ||
| items.add(index, item) | ||
| notifyItemInserted(index) | ||
| } | ||
|
|
||
| override fun getItemCount(): Int = items.size | ||
|
|
||
| fun getItem(position: Int) = items[position] | ||
| } |
Oops, something went wrong.