summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-03 16:00:08 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-06-03 16:26:08 +0000
commitccfaa962426a91992246c0a66303042e50e79d83 (patch)
tree2d2e9d94fbb5a6cbc7c8897d6850e0325a7d1000 /android/src/main
parent1d9dcd986f1abb840cbb1dc7920d9e50f6e8a98c (diff)
downloadmullvadvpn-ccfaa962426a91992246c0a66303042e50e79d83.tar.xz
mullvadvpn-ccfaa962426a91992246c0a66303042e50e79d83.zip
Add space for notification banner to expand
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt14
1 files changed, 14 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 2a9d54f59e..36cf498e40 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -16,6 +16,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
private lateinit var actionButton: ConnectActionButton
private lateinit var switchLocationButton: SwitchLocationButton
private lateinit var headerBar: HeaderBar
+ private lateinit var body: View
private lateinit var notificationBanner: NotificationBanner
private lateinit var status: ConnectionStatus
private lateinit var locationInfo: LocationInfo
@@ -42,7 +43,12 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
}
headerBar = HeaderBar(view, resources)
+
+ body = view.findViewById(R.id.body)
+
notificationBanner = NotificationBanner(view, parentActivity, appVersionInfoCache, daemon)
+ notificationBanner.onHeightChange = { newHeight -> updateBodyPaddingTop(newHeight) }
+
status = ConnectionStatus(view, resources)
locationInfo = LocationInfo(view, context!!)
@@ -121,6 +127,14 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
state.putBoolean(KEY_IS_TUNNEL_INFO_EXPANDED, isTunnelInfoExpanded)
}
+ private fun updateBodyPaddingTop(newPaddingTop: Int) {
+ body.apply {
+ if (paddingTop != newPaddingTop) {
+ setPadding(paddingLeft, newPaddingTop, paddingRight, paddingBottom)
+ }
+ }
+ }
+
private fun updateTunnelState(uiState: TunnelState, realState: TunnelState) {
notificationBanner.tunnelState = realState
locationInfo.state = realState