Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #15402: Hide ETP pop-up if the toolbar is not visible #15667

Merged
merged 5 commits into from Oct 9, 2020
Merged

For #15402: Hide ETP pop-up if the toolbar is not visible #15667

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b46267
For #15402: Hide ETP pop-up if the toolbar is not visible
sijanr Oct 4, 2020
19373c8
For #15402: Hide ETP pop-up when top or bottom toolbar is not visible
sijanr Oct 5, 2020
6146be4
For #15402: Improve toolbar's position check
sijanr Oct 6, 2020
b4d5975
For #15402: Use safe cast
sijanr Oct 8, 2020
c6d5108
For #15402: Fix ktlint fails
sijanr Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 21 additions & 1 deletion app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt
View file
Open in desktop
Expand Up @@ -13,8 +13,10 @@ import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.widget.ImageView
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.isVisible
import androidx.core.view.marginTop
import com.google.android.material.appbar.AppBarLayout
import kotlinx.android.synthetic.main.tracking_protection_onboarding_popup.*
import kotlinx.android.synthetic.main.tracking_protection_onboarding_popup.view.*
import mozilla.components.browser.session.Session
Expand Down Expand Up @@ -49,8 +51,27 @@ class TrackingProtectionOverlay(

@Suppress("MagicNumber", "InflateParams")
private fun showTrackingProtectionOnboarding() {

if (!getToolbar().hasWindowFocus()) return

val toolbarPosition = settings.toolbarPosition

when (toolbarPosition) {
ToolbarPosition.BOTTOM -> {
if(getToolbar().translationY > 0) {
return
}
}
ToolbarPosition.TOP -> {
val appBarLayout = getToolbar().parent as AppBarLayout?
Mugurell marked this conversation as resolved.
Show resolved Hide resolved
appBarLayout?.let { appBar ->
if(appBar.y != 0.toFloat()) {
return
}
}
}
}

val trackingOnboardingDialog = object : Dialog(context) {
override fun onTouchEvent(event: MotionEvent): Boolean {

Expand All @@ -63,7 +84,6 @@ class TrackingProtectionOverlay(

val layout = LayoutInflater.from(context)
.inflate(R.layout.tracking_protection_onboarding_popup, null)
val toolbarPosition = settings.toolbarPosition

layout.drop_down_triangle.isVisible = toolbarPosition == ToolbarPosition.TOP
layout.pop_up_triangle.isVisible = toolbarPosition == ToolbarPosition.BOTTOM
Expand Down