diff options
| author | Albin <albin@mullvad.net> | 2023-07-21 17:04:31 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-21 17:04:31 +0200 |
| commit | 1785459e9db5af6a7302a0a826351e5d310edb45 (patch) | |
| tree | 75f2179966fc43d3b749ac32429e59a7555f7a18 /android | |
| parent | 7087c16fa8ff4b6256498d4dc71fc34156fd6d15 (diff) | |
| parent | 92ba51950dd8f80e7f8f5c16806639b713061e5d (diff) | |
| download | mullvadvpn-1785459e9db5af6a7302a0a826351e5d310edb45.tar.xz mullvadvpn-1785459e9db5af6a7302a0a826351e5d310edb45.zip | |
Merge branch 'reduce-location-info-flickering-droid-217'
Diffstat (limited to 'android')
3 files changed, 9 insertions, 3 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt index 48671136e0..9d64b2d395 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt @@ -516,11 +516,12 @@ class ConnectScreenTest { fun testToggleTunnelInfo() { // Arrange val mockedClickHandler: () -> Unit = mockk(relaxed = true) + val dummyLocation = GeoIpLocation(null, null, "dummy country", null, "dummy hostname") composeTestRule.setContent { ConnectScreen( uiState = ConnectUiState( - location = null, + location = dummyLocation, relayLocation = null, versionInfo = null, tunnelUiState = TunnelState.Connecting(null, null), diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt index 9980908353..15dcc030e7 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationInfo.kt @@ -113,7 +113,10 @@ fun LocationInfo( text = "${stringResource(id = R.string.out_address)} $outAddress", color = colorExpanded, style = MaterialTheme.typography.labelMedium, - modifier = Modifier.alpha(if (isExpanded) AlphaVisible else AlphaInvisible) + modifier = + Modifier.alpha( + if (isExpanded && outAddress.isNotEmpty()) AlphaVisible else AlphaInvisible + ) ) } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index b6b31b7f3b..8ff8cc5ee6 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -95,7 +95,9 @@ fun ConnectScreen( ) LocationInfo( onToggleTunnelInfo = onToggleTunnelInfo, - isVisible = uiState.tunnelRealState != TunnelState.Disconnected, + isVisible = + uiState.tunnelRealState != TunnelState.Disconnected && + uiState.location?.hostname != null, isExpanded = uiState.isTunnelInfoExpanded, location = uiState.location, inAddress = uiState.inAddress, |