diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsListAdapter.kt similarity index 92% rename from app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt rename to app/src/main/java/org/mozilla/fenix/tabtray/CollectionsListAdapter.kt index 41fba72139..ddc5b32b5b 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsListAdapter.kt @@ -14,10 +14,14 @@ import androidx.recyclerview.widget.RecyclerView import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds import org.mozilla.fenix.R -internal class CollectionsAdapter( +/** + * An adapter for displaying an option to create a new collection and the list of existing + * collections. + */ +class CollectionsListAdapter( private val collections: Array, private val onNewCollectionClicked: () -> Unit -) : RecyclerView.Adapter() { +) : RecyclerView.Adapter() { @VisibleForTesting internal var checkedPosition = 1 diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt index 6bda59cf29..4fe94bb08e 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt @@ -432,7 +432,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler .setView(customLayout) .setPositiveButton(android.R.string.ok) { dialog, _ -> val selectedCollection = - (list.adapter as CollectionsAdapter).getSelectedCollection() + (list.adapter as CollectionsListAdapter).getSelectedCollection() val collection = tabCollectionStorage.cachedTabCollections[selectedCollection] viewLifecycleOwner.lifecycleScope.launch(Main) { tabCollectionStorage.addTabsToCollection(collection, sessionList) @@ -452,7 +452,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler val dialog = builder.create() val adapter = - CollectionsAdapter(arrayOf(it.getString(R.string.tab_tray_add_new_collection)) + collections) { + CollectionsListAdapter(arrayOf(it.getString(R.string.tab_tray_add_new_collection)) + collections) { dialog.dismiss() showAddNewCollectionDialog(sessionList) } diff --git a/app/src/test/java/org/mozilla/fenix/tabtray/CollectionsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabtray/CollectionsListAdapterTest.kt similarity index 89% rename from app/src/test/java/org/mozilla/fenix/tabtray/CollectionsAdapterTest.kt rename to app/src/test/java/org/mozilla/fenix/tabtray/CollectionsListAdapterTest.kt index f63afa7374..3ff93ea9b3 100644 --- a/app/src/test/java/org/mozilla/fenix/tabtray/CollectionsAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabtray/CollectionsListAdapterTest.kt @@ -14,7 +14,7 @@ import org.junit.runner.RunWith import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) -class CollectionsAdapterTest { +class CollectionsListAdapterTest { private val collectionList: Array = arrayOf( "Add new collection", @@ -25,14 +25,14 @@ class CollectionsAdapterTest { @Test fun `getItemCount should return the correct list size`() { - val adapter = CollectionsAdapter(collectionList, onNewCollectionClicked) + val adapter = CollectionsListAdapter(collectionList, onNewCollectionClicked) assertEquals(3, adapter.itemCount) } @Test fun `getSelectedCollection should account for add new collection when returning right item`() { - val adapter = CollectionsAdapter(collectionList, onNewCollectionClicked) + val adapter = CollectionsListAdapter(collectionList, onNewCollectionClicked) // first collection by default assertEquals(1, adapter.checkedPosition) @@ -44,7 +44,7 @@ class CollectionsAdapterTest { @Test fun `creates and binds viewholder`() { - val adapter = CollectionsAdapter(collectionList, onNewCollectionClicked) + val adapter = CollectionsListAdapter(collectionList, onNewCollectionClicked) val holder1 = adapter.createViewHolder(FrameLayout(testContext), 0) val holder2 = adapter.createViewHolder(FrameLayout(testContext), 0)