diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index a5990589e..94951dc4b 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -54,6 +54,7 @@ import org.mozilla.fenix.ext.increaseTapArea import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.getDimenInDip import org.mozilla.fenix.home.sessioncontrol.SessionControlChange import org.mozilla.fenix.home.sessioncontrol.TabCollection import org.mozilla.fenix.mvi.getManagedEmitter @@ -385,11 +386,12 @@ class BrowserFragment : BaseBrowserFragment(), BackHandler { layout.measure(spec, spec) val containerHeight = layout.measuredHeight + val triangleHeight = it.getDimenInDip(R.dimen.tp_onboarding_triangle_height).toInt() val xOffset = it.dimen(R.dimen.tp_onboarding_x_offset) // Positioning the popup above the tp anchor. - val yOffset = -containerHeight - (browserToolbarView.view.height / THREE * 2) + val yOffset = -containerHeight - (browserToolbarView.view.height / THREE * 2) + triangleHeight trackingOnboarding.showAsDropDown(tpIcon, xOffset, yOffset) it.settings().incrementTrackingProtectionOnboardingCount() diff --git a/app/src/main/java/org/mozilla/fenix/ext/Context.kt b/app/src/main/java/org/mozilla/fenix/ext/Context.kt index 921a1a257..d1f72a1af 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/Context.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/Context.kt @@ -17,12 +17,15 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.AttrRes import androidx.annotation.ColorInt +import androidx.annotation.DimenRes import androidx.annotation.StringRes import androidx.fragment.app.FragmentActivity import mozilla.components.browser.search.SearchEngineManager import mozilla.components.support.base.log.Log import mozilla.components.support.base.log.Log.Priority.WARN import mozilla.components.support.ktx.android.content.getColorFromAttr +import org.jetbrains.anko.dimen +import org.jetbrains.anko.px2dip import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config import org.mozilla.fenix.FenixApplication @@ -109,3 +112,6 @@ fun Context.getColorFromAttr(@AttrRes attr: Int) = getColorFromAttr(attr) fun Context.settings(isCrashReportEnabledInBuild: Boolean = BuildConfig.CRASH_REPORTING && Config.channel.isReleased) = Settings.getInstance(this, isCrashReportEnabledInBuild) + +fun Context.getDimenInDip(@DimenRes resource: Int) = + this.px2dip(this.dimen(resource)) diff --git a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml index 2bc488d82..b42c95d25 100644 --- a/app/src/main/res/layout/tracking_protection_onboarding_popup.xml +++ b/app/src/main/res/layout/tracking_protection_onboarding_popup.xml @@ -47,7 +47,7 @@ 48dp 8dp 256dp - 4dp + 0dp + 16dp 46dp