diff --git a/app/src/main/java/com/duckduckgo/app/global/view/FaviconImageView.kt b/app/src/main/java/com/duckduckgo/app/global/view/FaviconImageView.kt index 4b8a49584c92..006186a2ee0e 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/FaviconImageView.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/FaviconImageView.kt @@ -49,7 +49,7 @@ fun ImageView.loadFavicon( .load(file) .diskCacheStrategy(DiskCacheStrategy.NONE) .skipMemoryCache(true) - .transform(RoundedCorners(10)) + .transform(RoundedCorners(context.resources.getDimensionPixelSize(CommonR.dimen.verySmallShapeCornerRadius))) .placeholder(defaultDrawable) .error(defaultDrawable) .into(this) @@ -70,7 +70,7 @@ fun ImageView.loadFavicon( .load(bitmap) .diskCacheStrategy(DiskCacheStrategy.NONE) .skipMemoryCache(true) - .transform(RoundedCorners(10)) + .transform(RoundedCorners(context.resources.getDimensionPixelSize(CommonR.dimen.verySmallShapeCornerRadius))) .placeholder(defaultDrawable) .error(defaultDrawable) .into(this) @@ -97,7 +97,7 @@ fun generateDefaultDrawable( context: Context, domain: String, overridePlaceholderCharacter: String? = null, - @DimenRes cornerRadius: Int = CommonR.dimen.keyline_0, + @DimenRes cornerRadius: Int = CommonR.dimen.verySmallShapeCornerRadius, ): Drawable { return object : Drawable() { private val baseHost: String = domain.toUri().baseHost ?: "" diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt index 315dff12ff77..ff5c5188f3d5 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt @@ -19,8 +19,10 @@ package com.duckduckgo.app.tabs.ui import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap +import android.graphics.Rect import android.os.Bundle import android.view.LayoutInflater +import android.view.TouchDelegate import android.view.View import android.view.ViewGroup import android.widget.ImageView @@ -65,6 +67,7 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherItem.TrackerAnimationInfoPanel.Comp import com.duckduckgo.app.tabs.ui.TabSwitcherItem.TrackerAnimationInfoPanel.Companion.ANIMATED_TILE_NO_REPLACE_ALPHA import com.duckduckgo.common.ui.view.hide import com.duckduckgo.common.ui.view.show +import com.duckduckgo.common.ui.view.toPx import com.duckduckgo.common.utils.DispatcherProvider import com.duckduckgo.common.utils.swap import com.duckduckgo.mobile.android.R as AndroidR @@ -104,10 +107,12 @@ class TabSwitcherAdapter( return when (viewType) { GRID_TAB -> { val binding = ItemTabGridBinding.inflate(inflater, parent, false) + addExtraCloseButtonTouchArea(binding.close) TabSwitcherViewHolder.GridTabViewHolder(binding) } LIST_TAB -> { val binding = ItemTabListBinding.inflate(inflater, parent, false) + addExtraCloseButtonTouchArea(binding.close) TabSwitcherViewHolder.ListTabViewHolder(binding) } TRACKER_ANIMATION_TILE_INFO_PANEL -> { @@ -460,6 +465,8 @@ class TabSwitcherAdapter( const val GRID_TAB = 0 const val LIST_TAB = 1 const val TRACKER_ANIMATION_TILE_INFO_PANEL = 2 + + const val EXTRA_CLOSE_BUTTON_TOUCH_AREA = 6 // dp } interface TabViewHolder { @@ -518,3 +525,17 @@ class TabSwitcherAdapter( ) : TabSwitcherViewHolder(binding.root) } } + +private fun addExtraCloseButtonTouchArea(closeButton: ImageView) { + val parent = closeButton.parent as View + parent.post { + val extraSpace = TabSwitcherAdapter.TabSwitcherViewHolder.Companion.EXTRA_CLOSE_BUTTON_TOUCH_AREA.toPx() + val touchableArea = Rect() + closeButton.getHitRect(touchableArea) + touchableArea.top -= extraSpace + touchableArea.bottom += extraSpace + touchableArea.left -= extraSpace + touchableArea.right += extraSpace + parent.touchDelegate = TouchDelegate(touchableArea, closeButton) + } +} diff --git a/app/src/main/res/layout/item_tab_grid.xml b/app/src/main/res/layout/item_tab_grid.xml index e982a385630b..08fc344401f4 100644 --- a/app/src/main/res/layout/item_tab_grid.xml +++ b/app/src/main/res/layout/item_tab_grid.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/keyline_2" + style="@style/Widget.DuckDuckGo.TabCardView" app:cardCornerRadius="@dimen/mediumShapeCornerRadius"> + + + + diff --git a/common/common-ui/src/main/res/values/design-system-colors.xml b/common/common-ui/src/main/res/values/design-system-colors.xml index 4d4f9e104541..7f86aa3722e3 100644 --- a/common/common-ui/src/main/res/values/design-system-colors.xml +++ b/common/common-ui/src/main/res/values/design-system-colors.xml @@ -48,6 +48,7 @@ + @@ -58,6 +59,7 @@ + @@ -263,9 +265,10 @@ @color/blue80 - #27282A - #333538 - #404145 + #282828 + #373737 + #474747 + #1F1F1F #404145 @@ -281,6 +284,9 @@ #1FF9F9F9 + + #52171718 + #1FF9F9F9 #2EF9F9F9 @@ -295,6 +301,7 @@ #F2F2F2 #F9F9F9 #FFFFFF + #FFFFFF #FFFFFF @@ -310,6 +317,9 @@ #171F1F1F + + #2E1F1F1F + #171F1F1F #1F1F1F1F diff --git a/common/common-ui/src/main/res/values/design-system-dimensions.xml b/common/common-ui/src/main/res/values/design-system-dimensions.xml index 21c0653f866a..f206626b5e4a 100644 --- a/common/common-ui/src/main/res/values/design-system-dimensions.xml +++ b/common/common-ui/src/main/res/values/design-system-dimensions.xml @@ -28,6 +28,7 @@ 48dp + 4dp 8dp 12dp 16dp diff --git a/common/common-ui/src/main/res/values/widgets.xml b/common/common-ui/src/main/res/values/widgets.xml index ac25bfdde003..f23e68efe25e 100644 --- a/common/common-ui/src/main/res/values/widgets.xml +++ b/common/common-ui/src/main/res/values/widgets.xml @@ -465,7 +465,7 @@ @@ -474,6 +474,10 @@ @dimen/largeShapeCornerRadius + +