diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-23 23:37:30 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-01 19:12:29 +0000 |
| commit | 5069f501441c602c448af482a00c9e7f3b86318f (patch) | |
| tree | d74686b3cee17953ff1a907a96dee35eafc48fff /android/src | |
| parent | 4062e84cd4a18d5207cf26bb1569bd064b3cde39 (diff) | |
| download | mullvadvpn-5069f501441c602c448af482a00c9e7f3b86318f.tar.xz mullvadvpn-5069f501441c602c448af482a00c9e7f3b86318f.zip | |
Show collapsed if expanded title isn't available
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt | 6 |
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) |