Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

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

Merged
merged 1 commit into from
Mar 30, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
16 changes: 7 additions & 9 deletions app/src/main/res/layout/collection_home_list_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,43 @@
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"
android:maxLines="1"
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"
Expand Down