2019-04-30 00:52:55 +02:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
2019-07-12 20:38:15 +02:00
|
|
|
* 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/. */
|
|
|
|
|
|
|
|
package org.mozilla.fenix.collections
|
2019-04-30 00:52:55 +02:00
|
|
|
|
2019-06-23 19:13:52 +02:00
|
|
|
import android.graphics.PorterDuff.Mode.SRC_IN
|
2019-04-30 00:52:55 +02:00
|
|
|
import android.view.LayoutInflater
|
|
|
|
import android.view.View
|
|
|
|
import android.view.ViewGroup
|
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
|
import kotlinx.android.synthetic.main.collections_list_item.view.*
|
2019-12-05 04:06:05 +01:00
|
|
|
import mozilla.components.feature.tab.collections.TabCollection
|
2019-04-30 00:52:55 +02:00
|
|
|
import org.mozilla.fenix.R
|
2019-06-07 18:33:07 +02:00
|
|
|
import org.mozilla.fenix.components.description
|
2019-07-15 17:43:30 +02:00
|
|
|
import org.mozilla.fenix.ext.getIconColor
|
2019-12-05 04:06:05 +01:00
|
|
|
import org.mozilla.fenix.home.Tab
|
2019-04-30 00:52:55 +02:00
|
|
|
|
|
|
|
class SaveCollectionListAdapter(
|
#4596 migrate collections (#5911)
* For #4596: move code from CollectionCreationComponent to CollectionCreationStore
Other than adding comments, no changes were made. The code will be updated in a following commit. This is in order to make the commit diff more readable.
* For 4596: update CollectionCreateStore to libstate
* For 4596: copied CollectionCreationUIView into CollectionCreationView
Otherwise, no code was changed. The next commit will update this code. This is in order to make the commit diff more readable.
* For 4596: update CollectionCreationView to LibState
Note that the minimal changes possible to enable migration were made. Refactoring will happen in a later commit.
* For 4596: updated CollectionCreationTabListAdapter to work with the new View
* For 4596: updated SaveCollectionListAdapter to work with the new View
* For 4596: implemented CollectionCreationController
For now, it has an identical interface to the interactor. In a later commit several of its responsibilities will be moved around, some to the interactor and some to the reducer
* For 4596: copied over previous reducer code
No other changes were made. The code will be updated in the following commit. This is done to make changes more readable for the reviewer
* For 4596: update reducer code param names
Otherwise, no changes at this time
* For 4596: add arguments to CreateCollectionFragment in nav_graph
These will be used to replace the current CreateCollectionViewModel, which shares data between fragments in a way that doesn't fit within our architecture.
* For 4596: pass arguments to collection via transaction instead of VM
The VM will be removed in a later commit
* For 4596: update BrowserToolbarController to share state to collection via its Direction
* For 4596: removed CreateCollectionViewModel
* For 4596: test tab retrieval in CreateCollectionFragment
* For 4596: fix crashing CreateCollectionFragmentTest
* For 4596: removed classes create collection classes used by old architecture
* For 4596: collection interactor rename + kdoc
* For 4596: moved collection interactor interface
* For 4596: renamed CreateCollectionFragment
All related classes followed the pattern of CollectionCreationX
* For 4596: kdoc CollectionCreationController
There's no effective difference between these calls and their interactor equivalent, so I linked to them
* For 4596: fix bug that caused rename to not work
* For 4596: removed unused collection actions
These were unused before the LibState refactor
* For 4596: kdoc StepChanged
* For 4596: removed todos about moving logic to the reducer
saveTabsToCollection: this could be moved, but that would involve creating a new action. SaveCollectionStep should probably be refactored out, so adding this layer of indirection seemed counterproductive
handleBackPress: needs to be able to call dismiss(). The reducer doesn't (and shouldn't) be able to do that, so this needs to live here
stepBack: called by handleBackPress. See above
* For 4596: wrote tests for CollectionCreationController#stepback
* For 4596: fixed tests broken by changes to collections
* For 4596: small readability refactor for CollectionController#stepBack
No change to functionality (see tests)
* For 4596: broke apart CollectionView#update
There's probably a lot more that could be done here, but smaller changes were made to reduce scope
* For 4596: remove unnecessary todos
It looks like we don't follow the suggested pattern in this project
* For 4596: test CollectionCreationController#normalSessionSize
* For 4596: updated naming in CollectionCreationController per review
2019-10-23 02:33:54 +02:00
|
|
|
private val interactor: CollectionCreationInteractor
|
2019-07-15 17:43:30 +02:00
|
|
|
) : RecyclerView.Adapter<CollectionViewHolder>() {
|
2019-04-30 00:52:55 +02:00
|
|
|
|
2019-05-16 23:35:15 +02:00
|
|
|
private var tabCollections = listOf<TabCollection>()
|
2019-05-23 19:11:22 +02:00
|
|
|
private var selectedTabs: Set<Tab> = setOf()
|
2019-04-30 00:52:55 +02:00
|
|
|
|
|
|
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CollectionViewHolder {
|
|
|
|
val view = LayoutInflater.from(parent.context)
|
|
|
|
.inflate(CollectionViewHolder.LAYOUT_ID, parent, false)
|
|
|
|
|
2019-07-15 17:43:30 +02:00
|
|
|
return CollectionViewHolder(view)
|
2019-04-30 00:52:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
override fun onBindViewHolder(holder: CollectionViewHolder, position: Int) {
|
2019-05-16 23:35:15 +02:00
|
|
|
val collection = tabCollections[position]
|
2019-04-30 00:52:55 +02:00
|
|
|
holder.bind(collection)
|
2019-07-15 17:43:30 +02:00
|
|
|
holder.itemView.setOnClickListener {
|
#4596 migrate collections (#5911)
* For #4596: move code from CollectionCreationComponent to CollectionCreationStore
Other than adding comments, no changes were made. The code will be updated in a following commit. This is in order to make the commit diff more readable.
* For 4596: update CollectionCreateStore to libstate
* For 4596: copied CollectionCreationUIView into CollectionCreationView
Otherwise, no code was changed. The next commit will update this code. This is in order to make the commit diff more readable.
* For 4596: update CollectionCreationView to LibState
Note that the minimal changes possible to enable migration were made. Refactoring will happen in a later commit.
* For 4596: updated CollectionCreationTabListAdapter to work with the new View
* For 4596: updated SaveCollectionListAdapter to work with the new View
* For 4596: implemented CollectionCreationController
For now, it has an identical interface to the interactor. In a later commit several of its responsibilities will be moved around, some to the interactor and some to the reducer
* For 4596: copied over previous reducer code
No other changes were made. The code will be updated in the following commit. This is done to make changes more readable for the reviewer
* For 4596: update reducer code param names
Otherwise, no changes at this time
* For 4596: add arguments to CreateCollectionFragment in nav_graph
These will be used to replace the current CreateCollectionViewModel, which shares data between fragments in a way that doesn't fit within our architecture.
* For 4596: pass arguments to collection via transaction instead of VM
The VM will be removed in a later commit
* For 4596: update BrowserToolbarController to share state to collection via its Direction
* For 4596: removed CreateCollectionViewModel
* For 4596: test tab retrieval in CreateCollectionFragment
* For 4596: fix crashing CreateCollectionFragmentTest
* For 4596: removed classes create collection classes used by old architecture
* For 4596: collection interactor rename + kdoc
* For 4596: moved collection interactor interface
* For 4596: renamed CreateCollectionFragment
All related classes followed the pattern of CollectionCreationX
* For 4596: kdoc CollectionCreationController
There's no effective difference between these calls and their interactor equivalent, so I linked to them
* For 4596: fix bug that caused rename to not work
* For 4596: removed unused collection actions
These were unused before the LibState refactor
* For 4596: kdoc StepChanged
* For 4596: removed todos about moving logic to the reducer
saveTabsToCollection: this could be moved, but that would involve creating a new action. SaveCollectionStep should probably be refactored out, so adding this layer of indirection seemed counterproductive
handleBackPress: needs to be able to call dismiss(). The reducer doesn't (and shouldn't) be able to do that, so this needs to live here
stepBack: called by handleBackPress. See above
* For 4596: wrote tests for CollectionCreationController#stepback
* For 4596: fixed tests broken by changes to collections
* For 4596: small readability refactor for CollectionController#stepBack
No change to functionality (see tests)
* For 4596: broke apart CollectionView#update
There's probably a lot more that could be done here, but smaller changes were made to reduce scope
* For 4596: remove unnecessary todos
It looks like we don't follow the suggested pattern in this project
* For 4596: test CollectionCreationController#normalSessionSize
* For 4596: updated naming in CollectionCreationController per review
2019-10-23 02:33:54 +02:00
|
|
|
interactor.selectCollection(collection, selectedTabs.toList())
|
2019-05-23 19:11:22 +02:00
|
|
|
}
|
2019-04-30 00:52:55 +02:00
|
|
|
}
|
|
|
|
|
2019-05-16 23:35:15 +02:00
|
|
|
override fun getItemCount(): Int = tabCollections.size
|
2019-04-30 00:52:55 +02:00
|
|
|
|
2019-05-23 19:11:22 +02:00
|
|
|
fun updateData(tabCollections: List<TabCollection>, selectedTabs: Set<Tab>) {
|
2019-05-16 23:35:15 +02:00
|
|
|
this.tabCollections = tabCollections
|
2019-05-23 19:11:22 +02:00
|
|
|
this.selectedTabs = selectedTabs
|
2019-05-16 23:35:15 +02:00
|
|
|
notifyDataSetChanged()
|
|
|
|
}
|
2019-04-30 00:52:55 +02:00
|
|
|
}
|
|
|
|
|
2019-07-15 17:43:30 +02:00
|
|
|
class CollectionViewHolder(view: View) : RecyclerView.ViewHolder(view) {
|
2019-04-30 00:52:55 +02:00
|
|
|
|
2019-05-06 20:20:19 +02:00
|
|
|
fun bind(collection: TabCollection) {
|
2019-07-15 17:43:30 +02:00
|
|
|
itemView.collection_item.text = collection.title
|
|
|
|
itemView.collection_description.text = collection.description(itemView.context)
|
2019-06-10 22:46:55 +02:00
|
|
|
|
2019-07-15 17:43:30 +02:00
|
|
|
itemView.collection_icon.setColorFilter(
|
|
|
|
collection.getIconColor(itemView.context),
|
2019-06-23 19:13:52 +02:00
|
|
|
SRC_IN
|
2019-06-10 22:46:55 +02:00
|
|
|
)
|
2019-05-31 19:59:51 +02:00
|
|
|
}
|
|
|
|
|
2019-04-30 00:52:55 +02:00
|
|
|
companion object {
|
|
|
|
const val LAYOUT_ID = R.layout.collections_list_item
|
|
|
|
}
|
|
|
|
}
|