Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-17 15:26:23 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/25281 - Consider the toolbar when reporting stories visibility

Browse Source 
The toolbar may appear over the Pocket stories causing our functionality for
reporting when a specific story is visible to misreport.
At the moment hardcoding the toolbar height in the visibility checks seems like
the best solution to ensure reliable data.
This commit is contained in:
Mugurell 2022-05-18 19:57:12 +03:00 committed by mergify[bot]
parent ce4bf5a766
commit 5f946b6b22
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt
View File

@ -6,7 +6,6 @@
package org.mozilla.fenix.home.pocket
import android.content.Context
import android.graphics.Rect
import android.net.Uri
import androidx.annotation.FloatRange
@ -40,6 +39,7 @@ import androidx.compose.ui.layout.boundsInWindow
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.semantics
@ -66,6 +66,7 @@ import org.mozilla.fenix.compose.StaggeredHorizontalGrid
import org.mozilla.fenix.compose.PrimaryText
import org.mozilla.fenix.compose.TabSubtitleWithInterdot
import org.mozilla.fenix.compose.SecondaryText
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.theme.FirefoxTheme
import org.mozilla.fenix.theme.Theme
import kotlin.math.max
@ -278,8 +279,20 @@ private fun Modifier.onShown(
val context = LocalContext.current
var wasEventReported by remember { mutableStateOf(false) }
val toolbarHeight = context.resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
val isToolbarPlacedAtBottom = context.settings().shouldUseBottomToolbar
// Get a Rect of the entire screen minus system insets minus the toolbar
val screenBounds = Rect()
.apply { LocalView.current.getWindowVisibleDisplayFrame(this) }
.apply {
when (isToolbarPlacedAtBottom) {
true -> bottom -= toolbarHeight
false -> top += toolbarHeight
}
}
onGloballyPositioned { coordinates ->
if (!wasEventReported && coordinates.isVisible(context, threshold) &&
if (!wasEventReported && coordinates.isVisible(screenBounds, threshold) &&
System.currentTimeMillis() - initialTime > MINIMUM_TIME_TO_SETTLE_MS
) {
wasEventReported = true
@ -294,19 +307,12 @@ private fun Modifier.onShown(
* the screen bounds.
*/
private fun LayoutCoordinates.isVisible(
context: Context,
visibleRect: Rect,
@FloatRange(from = 0.0, to = 1.0) threshold: Float,
): Boolean {
if (!isAttached) return false
val screenBounds = Rect(
/* left = */0,
/* top = */0,
/* right = */context.resources.displayMetrics.widthPixels,
/* bottom = */context.resources.displayMetrics.heightPixels
)
return boundsInWindow().toAndroidRect().getIntersectPercentage(screenBounds) >= threshold
return boundsInWindow().toAndroidRect().getIntersectPercentage(visibleRect) >= threshold
}
/**