diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
index e5afaeddb8..055af0c660 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
@@ -17,7 +17,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import mozilla.components.feature.tab.collections.TabCollection
import org.mozilla.fenix.R
-import org.mozilla.fenix.components.description
import org.mozilla.fenix.ext.getIconColor
import org.mozilla.fenix.ext.increaseTapArea
import org.mozilla.fenix.home.sessioncontrol.CollectionInteractor
@@ -77,17 +76,18 @@ class CollectionViewHolder(
private fun updateCollectionUI() {
view.collection_title.text = collection.title
- view.collection_description.text = collection.description(view.context)
val layoutParams = view.layoutParams as ViewGroup.MarginLayoutParams
view.isActivated = expanded
if (expanded) {
layoutParams.bottomMargin = 0
collection_title.setPadding(0, 0, 0, EXPANDED_PADDING)
- view.collection_description.visibility = View.GONE
+ view.collection_share_button.visibility = View.VISIBLE
+ view.collection_overflow_button.visibility = View.VISIBLE
} else {
layoutParams.bottomMargin = COLLAPSED_MARGIN
- view.collection_description.visibility = View.VISIBLE
+ view.collection_share_button.visibility = View.GONE
+ view.collection_overflow_button.visibility = View.GONE
}
view.collection_icon.colorFilter = createBlendModeColorFilterCompat(
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
index 0fd2808bea..7677c1b8be 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
@@ -10,7 +10,11 @@ import android.view.ViewOutlineProvider
import androidx.appcompat.content.res.AppCompatResources
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.tab_in_collection.*
+import kotlinx.android.synthetic.main.list_element.divider_line
+import kotlinx.android.synthetic.main.list_element.list_element_title
+import kotlinx.android.synthetic.main.list_element.list_item_close_button
+import kotlinx.android.synthetic.main.list_element.list_item_icon
+import kotlinx.android.synthetic.main.list_element.list_item_url
import mozilla.components.feature.tab.collections.TabCollection
import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.ktx.android.util.dpToFloat
@@ -35,8 +39,8 @@ class TabInCollectionViewHolder(
var isLastTab = false
init {
- collection_tab_icon.clipToOutline = true
- collection_tab_icon.outlineProvider = object : ViewOutlineProvider() {
+ list_item_icon.clipToOutline = true
+ list_item_icon.outlineProvider = object : ViewOutlineProvider() {
override fun getOutline(view: View, outline: Outline?) {
outline?.setRoundRect(
0,
@@ -52,8 +56,8 @@ class TabInCollectionViewHolder(
interactor.onCollectionOpenTabClicked(tab)
}
- collection_tab_close_button.increaseTapArea(buttonIncreaseDps)
- collection_tab_close_button.setOnClickListener {
+ list_item_close_button.increaseTapArea(buttonIncreaseDps)
+ list_item_close_button.setOnClickListener {
interactor.onCollectionRemoveTab(collection, tab)
}
}
@@ -66,10 +70,10 @@ class TabInCollectionViewHolder(
}
private fun updateTabUI() {
- collection_tab_hostname.text = tab.url.toShortUrl(view.context.components.publicSuffixList)
+ list_item_url.text = tab.url.toShortUrl(view.context.components.publicSuffixList)
- collection_tab_title.text = tab.title
- collection_tab_icon.context.components.core.icons.loadIntoView(collection_tab_icon, tab.url)
+ list_element_title.text = tab.title
+ list_item_icon.context.components.core.icons.loadIntoView(list_item_icon, tab.url)
// If I'm the last one...
if (isLastTab) {
@@ -83,6 +87,6 @@ class TabInCollectionViewHolder(
companion object {
const val buttonIncreaseDps = 12
- const val LAYOUT_ID = R.layout.tab_in_collection
+ const val LAYOUT_ID = R.layout.list_element
}
}
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index 366d4d8dc4..302d65bf09 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -1,14 +1,12 @@
-
-
-
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_tab_collection" />
-
-
+ app:layout_constraintTop_toTopOf="@id/collection_icon"
+ app:srcCompat="@drawable/ic_hollow_share"
+ tools:visibility="visible" />
+ app:layout_constraintTop_toTopOf="@id/collection_icon"
+ app:srcCompat="@drawable/ic_menu"
+ tools:visibility="visible" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toBottomOf="parent"/>
+ app:layout_constraintEnd_toEndOf="@id/list_element_title"
+ app:layout_constraintStart_toStartOf="@id/list_element_title"
+ app:layout_constraintTop_toBottomOf="@id/list_element_title" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>