For #1843 - Passes selected tabs through the MVI loop

app/src/main/java/org/mozilla/fenix/collections/CollectionCreationComponent.kt

@@ -19,14 +19,18 @@ data class Tab(
     val title: String
 )
 
-data class CollectionCreationState(val tabs: List<Tab> = listOf()) : ViewState
+data class CollectionCreationState(val tabs: List<Tab> = listOf(), val selectedTabs: List<Tab> = listOf()) : ViewState
 
 sealed class CollectionCreationChange : Change {
     data class TabListChange(val tabs: List<Tab>) : CollectionCreationChange()
+    data class TabAdded(val tab: Tab) : CollectionCreationChange()
+    data class TabRemoved(val tab: Tab) : CollectionCreationChange()
 }
 
 sealed class CollectionCreationAction : Action {
     object Close : CollectionCreationAction()
+    data class AddTabToSelection(val tab: Tab) : CollectionCreationAction()
+    data class RemoveTabFromSelection(val tab: Tab) : CollectionCreationAction()
 }
 
 class CollectionCreationComponent(
@@ -40,6 +44,14 @@ class CollectionCreationComponent(
     override val reducer: Reducer<CollectionCreationState, CollectionCreationChange> = { state, change ->
         when (change) {
             is CollectionCreationChange.TabListChange -> state.copy(tabs = change.tabs)
+            is CollectionCreationChange.TabAdded -> {
+                val selectedTabs = listOf(change.tab) + state.selectedTabs
+                state.copy(selectedTabs = selectedTabs)
+            }
+            is CollectionCreationChange.TabRemoved -> {
+                val selectedTabs = state.selectedTabs.filter { it.sessionId != change.tab.sessionId }
+                state.copy(selectedTabs = selectedTabs)
+            }
         }
     }
 

app/src/main/java/org/mozilla/fenix/collections/CollectionCreationTabListAdapter.kt

@@ -3,10 +3,11 @@ package org.mozilla.fenix.collections
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CompoundButton
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.Observer
 import kotlinx.android.synthetic.main.collection_tab_list_row.view.*
-import kotlinx.android.synthetic.main.tab_list_row.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -21,7 +22,8 @@ class CollectionCreationTabListAdapter(
 ) : RecyclerView.Adapter<TabViewHolder>() {
 
 
-    private var data: List<Tab> = listOf()
+    private var tabs: List<Tab> = listOf()
+    private var selectedTabs: List<Tab> = listOf()
     private lateinit var job: Job
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabViewHolder {
@@ -31,10 +33,12 @@ class CollectionCreationTabListAdapter(
     }
 
     override fun onBindViewHolder(holder: TabViewHolder, position: Int) {
-        holder.bind(data[position])
+        val tab = tabs[position]
+        val isSelected = selectedTabs.contains(tab)
+        holder.bind(tab, isSelected)
     }
 
-    override fun getItemCount(): Int = data.size
+    override fun getItemCount(): Int = tabs.size
 
     override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
         super.onAttachedToRecyclerView(recyclerView)
@@ -46,12 +50,27 @@ class CollectionCreationTabListAdapter(
         job.cancel()
     }
 
-    fun updateData(tabs: List<Tab>) {
-        data = tabs
-        notifyDataSetChanged()
+    fun updateData(tabs: List<Tab>, selectedTabs: List<Tab>) {
+        val diffUtil = DiffUtil.calculateDiff(TabDiffUtil(this.tabs, tabs))
+
+        this.tabs = tabs
+        this.selectedTabs = selectedTabs
+
+        diffUtil.dispatchUpdatesTo(this)
     }
 }
 
+private class TabDiffUtil(val old: List<Tab>, val new: List<Tab>) : DiffUtil.Callback() {
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean =
+        old[oldItemPosition].sessionId == new[newItemPosition].sessionId
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean =
+        old[oldItemPosition].url == new[newItemPosition].url
+
+    override fun getOldListSize(): Int = old.size
+    override fun getNewListSize(): Int = new.size
+}
+
 class TabViewHolder(
     val view: View,
     actionEmitter: Observer<CollectionCreationAction>,
@@ -62,15 +81,34 @@ class TabViewHolder(
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.IO + job
 
-    var tab: Tab? = null
+    private var tab: Tab? = null
+    private val checkbox = view.tab_selected_checkbox!!
+    private val checkboxListener = CompoundButton.OnCheckedChangeListener { _, isChecked ->
+        tab?.apply {
+            val action = if (isChecked) CollectionCreationAction.AddTabToSelection(this)
+            else CollectionCreationAction.RemoveTabFromSelection(this)
 
-    init { }
+            actionEmitter.onNext(action)
+        }
+    }
 
-    fun bind(tab: Tab) {
+    init {
+        view.collection_item_tab.setOnClickListener {
+            checkbox.isChecked = !checkbox.isChecked
+        }
+    }
+
+    fun bind(tab: Tab, isSelected: Boolean) {
         this.tab = tab
 
         view.hostname.text = tab.hostname
         view.tab_title.text = tab.title
+        checkbox.setOnCheckedChangeListener(null)
+        if (checkbox.isChecked != isSelected) {
+            checkbox.isChecked = isSelected
+        }
+        checkbox.setOnCheckedChangeListener(checkboxListener)
+
         launch(Dispatchers.IO) {
             val bitmap = view.favicon_image.context.components.utils.icons
                 .loadIcon(IconRequest(tab.url)).await().bitmap
@@ -83,4 +121,4 @@ class TabViewHolder(
     companion object {
         const val LAYOUT_ID = R.layout.collection_tab_list_row
     }
-}
+}

app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt

@@ -46,6 +46,6 @@ class CollectionCreationUIView(
     }
 
     override fun updateView() = Consumer<CollectionCreationState> {
-        collectionCreationTabListAdapter.updateData(it.tabs)
+        collectionCreationTabListAdapter.updateData(it.tabs, it.selectedTabs)
     }
 }

app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt

@@ -4,10 +4,7 @@ package org.mozilla.fenix.collections
    License, v. 2.0. If a copy of the MPL was not distributed with this
    file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -52,7 +49,11 @@ class CreateCollectionFragment : DialogFragment() {
 
         getAutoDisposeObservable<CollectionCreationAction>().subscribe {
             when (it) {
-                is CollectionCreationAction.Close -> dismissAllowingStateLoss()
+                is CollectionCreationAction.Close -> dismiss()
+                is CollectionCreationAction.AddTabToSelection -> getManagedEmitter<CollectionCreationChange>()
+                    .onNext(CollectionCreationChange.TabAdded(it.tab))
+                is CollectionCreationAction.RemoveTabFromSelection -> getManagedEmitter<CollectionCreationChange>()
+                    .onNext(CollectionCreationChange.TabRemoved(it.tab))
             }
         }
     }

app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt

@@ -106,7 +106,7 @@ class HistoryListItemViewHolder(
             // This prevent us from cutting off the animation
             val shouldCheck = mode.selectedItems.contains(item)
             if (checkbox.isChecked != shouldCheck) {
-                checkbox.isChecked = mode.selectedItems.contains(item)
+                checkbox.isChecked = shouldCheck
             }
             checkbox.setOnCheckedChangeListener(checkListener)
         }

app/src/main/res/layout/collection_tab_list_row.xml

@@ -64,5 +64,16 @@
             app:layout_constraintEnd_toEndOf="@id/hostname"
             app:layout_constraintTop_toBottomOf="@id/hostname"
             app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <CheckBox
+            android:id="@+id/tab_selected_checkbox"
+            android:clickable="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:elevation="1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>

app/src/main/res/values/styles.xml

@@ -110,6 +110,11 @@
 
 
     <style name="CreateCollectionDialogStyle" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:colorControlNormal">?accentBright</item>
+        <item name="android:colorControlActivated">?accentBright</item>
+        <item name="android:colorControlHighlight">?accent</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
+
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/Animation.Design.BottomSheetDialog</item>
         <item name="windowNoTitle">true</item>