Commit ab789511 authored by mcarare's avatar mcarare Committed by Emily Kager
Browse files

For #9496: Vertically align collection name and icons to collection icon

parent e820a35f

app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt

+0 −7
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders 


import android.content.Context

import android.view.View

import android.view.ViewGroup

import androidx.core.graphics.BlendModeColorFilterCompat.createBlendModeColorFilterCompat

import androidx.core.graphics.BlendModeCompat.SRC_IN

import androidx.recyclerview.widget.RecyclerView
@@ -76,16 +75,12 @@ class CollectionViewHolder( 


    private fun updateCollectionUI() {

        view.collection_title.text = collection.title

        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_share_button.visibility = View.VISIBLE

            view.collection_overflow_button.visibility = View.VISIBLE

        } else {

            layoutParams.bottomMargin = COLLAPSED_MARGIN

            view.collection_share_button.visibility = View.GONE

            view.collection_overflow_button.visibility = View.GONE

        }
@@ -98,8 +93,6 @@ class CollectionViewHolder( 


    companion object {

        const val buttonIncreaseDps = 16

        const val EXPANDED_PADDING = 60

        const val COLLAPSED_MARGIN = 12

        const val LAYOUT_ID = R.layout.collection_home_list_row

        const val maxTitleLength = 20

    }

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

+7 −9
Original line number Diff line number Diff line
@@ -20,20 +20,18 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="16dp"

        android:layout_marginTop="12dp"

        android:importantForAccessibility="no"

        android:tint="@null"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_tab_collection" />

        app:srcCompat="@drawable/ic_tab_collection"

        app:tint="@null" />



    <TextView

        android:id="@+id/collection_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="24dp"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="16dp"

        android:layout_marginEnd="8dp"

        android:ellipsize="end"

        android:gravity="start"
@@ -41,24 +39,24 @@ 
        android:minLines="1"

        android:textAppearance="@style/Header14TextStyle"

        app:layout_constrainedWidth="true"

        app:layout_constraintBottom_toBottomOf="@id/collection_icon"

        app:layout_constraintEnd_toStartOf="@id/chevron"

        app:layout_constraintHorizontal_bias="0.0"

        app:layout_constraintHorizontal_chainStyle="packed"

        app:layout_constraintStart_toEndOf="@+id/collection_icon"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintTop_toTopOf="@id/collection_icon"

        tools:text="@tools:sample/lorem/random" />



    <ImageView

        android:id="@+id/chevron"

        android:layout_width="10dp"

        android:layout_height="6dp"

        android:layout_marginTop="24dp"

        android:layout_marginEnd="16dp"

        android:background="@drawable/ic_chevron"

        android:contentDescription="@string/tab_menu"

        app:layout_constraintBottom_toBottomOf="@id/collection_icon"

        app:layout_constraintEnd_toStartOf="@+id/collection_share_button"

        app:layout_constraintStart_toEndOf="@+id/collection_title"

        app:layout_constraintTop_toTopOf="parent" />

        app:layout_constraintTop_toTopOf="@id/collection_icon" />



    <ImageButton

        android:id="@+id/collection_share_button"