summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt6
1 files changed, 5 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
index 5bdaf586fe..dcde70b923 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
@@ -170,7 +170,11 @@ class CollapsibleTitleController(val parentView: View, scrollAreaId: Int = R.id.
yOffsetInterpolation.updated
if (shouldUpdate) {
- val progress = maxOf(0.0f, minOf(1.0f, scrollInterpolation.progress(scrollOffset)))
+ val progress = if (expandedTitleView != null) {
+ maxOf(0.0f, minOf(1.0f, scrollInterpolation.progress(scrollOffset)))
+ } else {
+ 1.0f
+ }
val scale = scaleInterpolation.interpolate(progress)
val offsetX = xOffsetInterpolation.interpolate(progress)