parent
7c9a5c1f14
commit
76c83ba805
|
@ -17,14 +17,12 @@ 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.px2dip
|
||||
import org.mozilla.fenix.BuildConfig
|
||||
import org.mozilla.fenix.Config
|
||||
import org.mozilla.fenix.FenixApplication
|
||||
|
@ -111,6 +109,3 @@ 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.resources.getDimensionPixelSize(resource))
|
||||
|
|
|
@ -16,7 +16,6 @@ import android.widget.PopupWindow
|
|||
import kotlinx.android.synthetic.main.tracking_protection_onboarding_popup.view.*
|
||||
import mozilla.components.browser.session.Session
|
||||
import org.mozilla.fenix.R
|
||||
import org.mozilla.fenix.ext.getDimenInDip
|
||||
import org.mozilla.fenix.ext.increaseTapArea
|
||||
import org.mozilla.fenix.utils.Settings
|
||||
|
||||
|
@ -48,15 +47,16 @@ class TrackingProtectionOverlay(
|
|||
layout.onboarding_message.text =
|
||||
context.getString(R.string.etp_onboarding_message_2, context.getString(R.string.app_name))
|
||||
|
||||
val res = context.resources
|
||||
val trackingOnboarding = PopupWindow(
|
||||
layout,
|
||||
context.resources.getDimensionPixelSize(R.dimen.tp_onboarding_width),
|
||||
res.getDimensionPixelSize(R.dimen.tp_onboarding_width),
|
||||
WindowManager.LayoutParams.WRAP_CONTENT
|
||||
).apply {
|
||||
setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
isOutsideTouchable = true
|
||||
isFocusable = true
|
||||
elevation = context.resources.getDimension(R.dimen.mozac_browser_menu_elevation)
|
||||
elevation = res.getDimension(R.dimen.mozac_browser_menu_elevation)
|
||||
animationStyle = R.style.Mozac_Browser_Menu_Animation_OverflowMenuBottom
|
||||
}
|
||||
|
||||
|
@ -71,13 +71,14 @@ class TrackingProtectionOverlay(
|
|||
layout.measure(spec, spec)
|
||||
|
||||
val containerHeight = layout.measuredHeight
|
||||
val triangleHeight = context.getDimenInDip(R.dimen.tp_onboarding_triangle_height).toInt()
|
||||
val triangleHeight =
|
||||
(res.getDimension(R.dimen.tp_onboarding_triangle_height) / res.displayMetrics.density).toInt()
|
||||
|
||||
val toolbar = getToolbar()
|
||||
val trackingProtectionIcon: View =
|
||||
toolbar.findViewById(R.id.mozac_browser_toolbar_tracking_protection_indicator)
|
||||
|
||||
val xOffset = context.resources.getDimensionPixelSize(R.dimen.tp_onboarding_x_offset)
|
||||
val xOffset = res.getDimensionPixelSize(R.dimen.tp_onboarding_x_offset)
|
||||
|
||||
// Positioning the popup above the tp anchor.
|
||||
val yOffset = -containerHeight - (toolbar.height / 3 * 2) + triangleHeight
|
||||
|
|
Loading…
Reference in New Issue
Block a user