From 5b46267237b499f212bdf9438f122deb78c0780b Mon Sep 17 00:00:00 2001 From: sijanr Date: Sat, 3 Oct 2020 17:49:50 -0700 Subject: [PATCH 1/5] For #15402: Hide ETP pop-up if the toolbar is not visible --- .../fenix/trackingprotection/TrackingProtectionOverlay.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index 2902b2392b60..0d7553e815a6 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -49,7 +49,7 @@ class TrackingProtectionOverlay( @Suppress("MagicNumber", "InflateParams") private fun showTrackingProtectionOnboarding() { - if (!getToolbar().hasWindowFocus()) return + if (getToolbar().translationY > 0) return val trackingOnboardingDialog = object : Dialog(context) { override fun onTouchEvent(event: MotionEvent): Boolean { From 19373c882b50ca6fa1a853629b07ad2773ac07df Mon Sep 17 00:00:00 2001 From: sijanr Date: Mon, 5 Oct 2020 13:05:34 -0700 Subject: [PATCH 2/5] For #15402: Hide ETP pop-up when top or bottom toolbar is not visible --- .../TrackingProtectionOverlay.kt | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index 0d7553e815a6..0c9154c5d06b 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -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 @@ -49,7 +51,24 @@ class TrackingProtectionOverlay( @Suppress("MagicNumber", "InflateParams") private fun showTrackingProtectionOnboarding() { - if (getToolbar().translationY > 0) return + + if (!getToolbar().hasWindowFocus()) return + + when (getToolbar().parent) { + is CoordinatorLayout -> { + if(getToolbar().translationY > 0) { + return + } + } + is AppBarLayout -> { + val appBarLayout = getToolbar().parent as AppBarLayout? + appBarLayout?.let { appBar -> + if(appBar.y != 0.toFloat()) { + return + } + } + } + } val trackingOnboardingDialog = object : Dialog(context) { override fun onTouchEvent(event: MotionEvent): Boolean { From 6146be47d2b01efc5ea6c6f28f7b68d7fc919a78 Mon Sep 17 00:00:00 2001 From: sijanr Date: Tue, 6 Oct 2020 16:05:03 -0700 Subject: [PATCH 3/5] For #15402: Improve toolbar's position check --- .../trackingprotection/TrackingProtectionOverlay.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index 0c9154c5d06b..d8b73eb6154c 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -54,13 +54,15 @@ class TrackingProtectionOverlay( if (!getToolbar().hasWindowFocus()) return - when (getToolbar().parent) { - is CoordinatorLayout -> { + val toolbarPosition = settings.toolbarPosition + + when (toolbarPosition) { + ToolbarPosition.BOTTOM -> { if(getToolbar().translationY > 0) { return } } - is AppBarLayout -> { + ToolbarPosition.TOP -> { val appBarLayout = getToolbar().parent as AppBarLayout? appBarLayout?.let { appBar -> if(appBar.y != 0.toFloat()) { @@ -82,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 From b4d5975254a04609ae70574dfa8cb33b9af7ab60 Mon Sep 17 00:00:00 2001 From: sijanr Date: Wed, 7 Oct 2020 18:51:34 -0700 Subject: [PATCH 4/5] For #15402: Use safe cast --- .../fenix/trackingprotection/TrackingProtectionOverlay.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index d8b73eb6154c..31f816e11757 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -63,7 +63,7 @@ class TrackingProtectionOverlay( } } ToolbarPosition.TOP -> { - val appBarLayout = getToolbar().parent as AppBarLayout? + val appBarLayout = getToolbar().parent as? AppBarLayout appBarLayout?.let { appBar -> if(appBar.y != 0.toFloat()) { return From c6d510897eb0137603f0dc7f6de2bfdd5e1a3145 Mon Sep 17 00:00:00 2001 From: sijanr Date: Thu, 8 Oct 2020 17:04:52 -0700 Subject: [PATCH 5/5] For #15402: Fix ktlint fails --- .../trackingprotection/TrackingProtectionOverlay.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index 31f816e11757..e3719304ad5b 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -13,7 +13,6 @@ 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 @@ -46,8 +45,8 @@ class TrackingProtectionOverlay( private fun shouldShowTrackingProtectionOnboarding(session: Session) = session.trackerBlockingEnabled && - session.trackersBlocked.isNotEmpty() && - settings.shouldShowTrackingProtectionCfr + session.trackersBlocked.isNotEmpty() && + settings.shouldShowTrackingProtectionCfr @Suppress("MagicNumber", "InflateParams") private fun showTrackingProtectionOnboarding() { @@ -58,14 +57,14 @@ class TrackingProtectionOverlay( when (toolbarPosition) { ToolbarPosition.BOTTOM -> { - if(getToolbar().translationY > 0) { + if (getToolbar().translationY > 0) { return } } ToolbarPosition.TOP -> { val appBarLayout = getToolbar().parent as? AppBarLayout appBarLayout?.let { appBar -> - if(appBar.y != 0.toFloat()) { + if (appBar.y != 0.toFloat()) { return } }