From 7b6c9b94b18bc91888328b4931fd5802dac7dc0f Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Wed, 8 May 2019 11:12:41 -0700 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/2205: Modifies styling of collections and tabs (https://github.com/mozilla-mobile/fenix/pull/2328) * For https://github.com/mozilla-mobile/fenix/issues/2205: Modifies styling of collections and tabs * Change bounding box --- .../viewholders/CollectionViewHolder.kt | 4 ---- .../viewholders/TabHeaderViewHolder.kt | 12 ++++------ .../viewholders/TabInCollectionViewHolder.kt | 4 ++++ .../viewholders/TabViewHolder.kt | 11 ++-------- app/src/main/res/layout/collection_header.xml | 2 ++ .../res/layout/collection_home_list_row.xml | 16 +++++++------- app/src/main/res/layout/tab_header.xml | 13 ++++++----- app/src/main/res/layout/tab_in_collection.xml | 13 ++++++----- app/src/main/res/layout/tab_list_row.xml | 22 +++++-------------- 9 files changed, 40 insertions(+), 57 deletions(-) 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 cad283092..5c4169c28 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 @@ -21,7 +21,6 @@ import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem import org.mozilla.fenix.DefaultThemeManager import org.mozilla.fenix.R -import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.home.sessioncontrol.CollectionAction import org.mozilla.fenix.home.sessioncontrol.SessionControlAction import org.mozilla.fenix.home.sessioncontrol.TabCollection @@ -55,7 +54,6 @@ class CollectionViewHolder( } collection_overflow_button.run { - increaseTapArea(buttonIncreaseDps) setOnClickListener { collectionMenu.menuBuilder .build(view.context) @@ -64,7 +62,6 @@ class CollectionViewHolder( } collection_share_button.run { - increaseTapArea(buttonIncreaseDps) setOnClickListener { actionEmitter.onNext(CollectionAction.ShareTabs(collection)) } @@ -166,7 +163,6 @@ class CollectionViewHolder( const val COLLAPSED_MARGIN = 12 const val LAYOUT_ID = R.layout.collection_home_list_row const val maxTitleLength = 20 - const val buttonIncreaseDps = 24 } enum class CollectionState { diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt index 6f7dd15d5..315530546 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt @@ -13,7 +13,6 @@ import mozilla.components.browser.menu.BrowserMenu import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.item.SimpleBrowserMenuItem import org.mozilla.fenix.R -import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.home.sessioncontrol.SessionControlAction import org.mozilla.fenix.home.sessioncontrol.TabAction import org.mozilla.fenix.home.sessioncontrol.onNext @@ -42,13 +41,13 @@ class TabHeaderViewHolder( if (isPrivate) R.string.tabs_header_private_title else R.string.tab_header_label header_text.text = context.getString(headerTextResourceId) - add_tab_button.increaseTapArea(addTabButtonIncreaseDps) - add_tab_button.setOnClickListener { - actionEmitter.onNext(TabAction.Add) + add_tab_button.run { + setOnClickListener { + actionEmitter.onNext(TabAction.Add) + } } tabs_overflow_button.run { - increaseTapArea(overflowButtonIncreaseDps) setOnClickListener { tabsMenu.menuBuilder .build(view.context) @@ -93,8 +92,5 @@ class TabHeaderViewHolder( companion object { const val LAYOUT_ID = R.layout.tab_header - - const val addTabButtonIncreaseDps = 8 - const val overflowButtonIncreaseDps = 8 } } 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 30933996f..8a9e56c6d 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 @@ -22,6 +22,7 @@ import org.jetbrains.anko.backgroundColor import org.mozilla.fenix.R import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getColorFromAttr +import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.home.sessioncontrol.CollectionAction import org.mozilla.fenix.home.sessioncontrol.SessionControlAction import org.mozilla.fenix.home.sessioncontrol.Tab @@ -46,6 +47,7 @@ class TabInCollectionViewHolder( var isLastTab = false init { + collection_tab_icon.clipToOutline = true collection_tab_icon.outlineProvider = object : ViewOutlineProvider() { override fun getOutline(view: View?, outline: Outline?) { @@ -59,6 +61,7 @@ class TabInCollectionViewHolder( } } + collection_tab_close_button.increaseTapArea(buttonIncreaseDps) collection_tab_close_button.setOnClickListener { actionEmitter.onNext(CollectionAction.RemoveTab(collection, tab)) } @@ -93,6 +96,7 @@ class TabInCollectionViewHolder( } companion object { + const val buttonIncreaseDps = 12 const val LAYOUT_ID = R.layout.tab_in_collection } } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt index aa1ceb905..643475534 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt @@ -50,6 +50,8 @@ class TabViewHolder( actionEmitter.onNext(TabAction.Share(tab?.sessionId!!)) } } + + close_tab_button.increaseTapArea(buttonIncreaseDps) item_tab.setOnClickListener { actionEmitter.onNext(TabAction.Select(tab?.sessionId!!)) } @@ -78,15 +80,6 @@ class TabViewHolder( ) } } - - tab_overflow_button.run { - increaseTapArea(buttonIncreaseDps) - setOnClickListener { - tabMenu.menuBuilder - .build(view.context) - .show(anchor = it) - } - } } fun bindSession(tab: Tab) { diff --git a/app/src/main/res/layout/collection_header.xml b/app/src/main/res/layout/collection_header.xml index bc2c2b54d..8215f37e2 100644 --- a/app/src/main/res/layout/collection_header.xml +++ b/app/src/main/res/layout/collection_header.xml @@ -7,6 +7,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/collections_header" android:layout_marginTop="5dp" + android:layout_marginBottom="15.5dp" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -27,6 +28,7 @@ android:text="@string/collections_header" android:textAppearance="@style/HeaderTextStyle" android:layout_marginTop="15dp" + android:layout_marginStart="4.5dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/divider_line" /> 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 84885eb6f..3f79e62e4 100644 --- a/app/src/main/res/layout/collection_home_list_row.xml +++ b/app/src/main/res/layout/collection_home_list_row.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:layout_marginStart="18dp" + android:layout_marginStart="16dp" android:tint="@null" android:src="@drawable/ic_archive" app:layout_constraintStart_toStartOf="parent" @@ -36,7 +36,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="17dp" - android:layout_marginStart="14dp" + android:layout_marginStart="12dp" android:ellipsize="end" android:maxLines="1" android:minLines="1" @@ -72,23 +72,23 @@ diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml index d7f66e2f7..79d91a67e 100644 --- a/app/src/main/res/layout/tab_header.xml +++ b/app/src/main/res/layout/tab_header.xml @@ -6,7 +6,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/tabs_header" - android:layout_marginBottom="12dp" + android:layout_marginBottom="15.5dp" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -14,6 +14,7 @@ android:id="@+id/header_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="4.5dp" android:text="@string/tab_header_label" android:textAppearance="@style/HeaderTextStyle" app:layout_constraintBottom_toBottomOf="parent" @@ -22,8 +23,9 @@ diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml index b58a6c746..8ff5f68d8 100644 --- a/app/src/main/res/layout/tab_list_row.xml +++ b/app/src/main/res/layout/tab_list_row.xml @@ -49,7 +49,6 @@ android:id="@+id/tab_title" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="4dp" android:layout_marginStart="8dp" android:layout_marginBottom="8dp" android:ellipsize="end" @@ -62,29 +61,18 @@ app:layout_constraintTop_toBottomOf="@id/hostname" app:layout_constraintBottom_toBottomOf="parent"/> - - -