From 756b1fbadd7b5aca72167982c600dc540552be04 Mon Sep 17 00:00:00 2001 From: mcarare <“mihai.carare.dev@gmail.com”> Date: Fri, 13 Mar 2020 13:18:38 +0200 Subject: [PATCH] For #9140: Remove drawable from title in empty state panes --- .../fenix/home/sessioncontrol/SessionControlAdapter.kt | 10 ++++------ .../fenix/home/sessioncontrol/SessionControlView.kt | 2 -- .../viewholders/NoContentMessageViewHolder.kt | 4 ---- .../NoContentMessageWithActionViewHolder.kt | 4 +--- app/src/main/res/layout/no_content_message.xml | 3 --- .../main/res/layout/no_content_message_with_action.xml | 3 --- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt index 074a1d588..2dd904b94 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt @@ -77,13 +77,11 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) data class NoContentMessage( - @DrawableRes val icon: Int, @StringRes val header: Int, @StringRes val description: Int ) : AdapterItem(NoContentMessageViewHolder.LAYOUT_ID) data class NoContentMessageWithAction( - @DrawableRes val icon: Int, @StringRes val header: Int, @StringRes val description: Int, @DrawableRes val buttonIcon: Int = 0, @@ -208,12 +206,12 @@ class SessionControlAdapter( } is NoContentMessageWithActionViewHolder -> { val listener = { interactor.onOpenNewTabClicked() } - val (icon, header, description, buttonIcon, buttonText) = item as AdapterItem.NoContentMessageWithAction - holder.bind(icon, header, description, buttonIcon, buttonText, listener) + val (header, description, buttonIcon, buttonText) = item as AdapterItem.NoContentMessageWithAction + holder.bind(header, description, buttonIcon, buttonText, listener) } is NoContentMessageViewHolder -> { - val (icon, header, description) = item as AdapterItem.NoContentMessage - holder.bind(icon, header, description) + val (header, description) = item as AdapterItem.NoContentMessage + holder.bind(header, description) } is CollectionViewHolder -> { val (collection, expanded, sessionHasOpenTabs) = item as AdapterItem.CollectionItem diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt index a81931ba3..26a03220f 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt @@ -24,7 +24,6 @@ import org.mozilla.fenix.home.OnboardingState import org.mozilla.fenix.home.Tab val noTabMessage = AdapterItem.NoContentMessageWithAction( - R.drawable.ic_tabs, R.string.no_open_tabs_header_2, R.string.no_open_tabs_description, R.drawable.ic_new, @@ -32,7 +31,6 @@ val noTabMessage = AdapterItem.NoContentMessageWithAction( ) val noCollectionMessage = AdapterItem.NoContentMessage( - R.drawable.ic_tab_collection, R.string.no_collections_header, R.string.collections_description ) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageViewHolder.kt index bd7f6e81a..d3a2c89a3 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageViewHolder.kt @@ -5,22 +5,18 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders import android.view.View -import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.no_content_message.view.* -import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds import org.mozilla.fenix.R open class NoContentMessageViewHolder(private val view: View) : RecyclerView.ViewHolder(view) { fun bind( - @DrawableRes icon: Int, @StringRes header: Int, @StringRes description: Int ) { with(view.context) { - view.no_content_header.putCompoundDrawablesRelativeWithIntrinsicBounds(end = getDrawable(icon)) view.no_content_header.text = getString(header) view.no_content_description.text = getString(description) } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt index d83525673..e6a2aad00 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/NoContentMessageWithActionViewHolder.kt @@ -16,7 +16,6 @@ class NoContentMessageWithActionViewHolder( ) : NoContentMessageViewHolder(view) { /** - * @param icon The visible label for header text this menu item. * @param header ID of string resource for title text. * @param description ID of string resource for description text. * @param buttonIcon Optional ID of drawable resource for button icon. @@ -25,14 +24,13 @@ class NoContentMessageWithActionViewHolder( */ @Suppress("LongParameterList") fun bind( - @DrawableRes icon: Int, @StringRes header: Int, @StringRes description: Int, @DrawableRes buttonIcon: Int = 0, @StringRes buttonText: Int = 0, listener: (() -> Unit)? = null ) { - super.bind(icon, header, description) + super.bind(header, description) with(view.context) { if (buttonIcon != 0 || buttonText != 0) { diff --git a/app/src/main/res/layout/no_content_message.xml b/app/src/main/res/layout/no_content_message.xml index 29e00ffb2..ab466afef 100644 --- a/app/src/main/res/layout/no_content_message.xml +++ b/app/src/main/res/layout/no_content_message.xml @@ -18,10 +18,7 @@ android:id="@+id/no_content_header" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:drawableTint="?primaryText" - android:drawablePadding="8dp" tools:text="@tools:sample/lorem" - tools:drawableEnd="@drawable/ic_tab_collection" android:textAppearance="@style/HeaderTextStyle" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/no_content_message_with_action.xml b/app/src/main/res/layout/no_content_message_with_action.xml index ff10f5a4c..8a23bfd3d 100644 --- a/app/src/main/res/layout/no_content_message_with_action.xml +++ b/app/src/main/res/layout/no_content_message_with_action.xml @@ -18,11 +18,8 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="4dp" - android:drawablePadding="8dp" android:textAppearance="@style/HeaderTextStyle" android:textSize="16sp" - app:drawableTint="?primaryText" - tools:drawableEnd="@drawable/ic_tabs" tools:text="@tools:sample/lorem" />