Cherry-pick from release branch (#3525)

* Update navigation Padding; Update load and performance icons

* Add error states for unavailable gateways

* Add new backend events

Author: mrkiwi

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/manager/backend/NymBackendManager.kt

@@ -306,6 +306,13 @@ class NymBackendManager @Inject constructor(
 
 				else -> Unit
 			}
+
+			is BackendEvent.AccountState -> {
+				Timber.d("AccountState: ${backendEvent.event}")
+			}
+			is BackendEvent.ConfigChanged -> {
+				Timber.d("ConfigChanged")
+			}
 		}
 	}
 

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/details/DetailsScreen.kt

@@ -1,14 +1,18 @@
 package net.nymtech.nymvpn.ui.screens.details
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -79,9 +83,12 @@ fun DetailsScreen(appUiState: AppUiState, id: String, type: GatewayType, gateway
 @Composable
 fun DetailsScreen(detailsUiState: DetailsUiState, onSelectServerClick: () -> Unit) {
 	Column(
+		verticalArrangement = Arrangement.spacedBy(8.dp.scaledHeight(), Alignment.Top),
 		horizontalAlignment = Alignment.Start,
 		modifier = Modifier
-			.fillMaxSize(),
+			.fillMaxSize()
+			.background(MaterialTheme.colorScheme.background)
+			.padding(WindowInsets.systemBars.asPaddingValues()),
 	) {
 		Column(
 			modifier = Modifier
@@ -156,7 +163,7 @@ internal fun PreviewPrivacyScreen() {
 			countryCode = "DE",
 			mixnetScore = Score.HIGH,
 			score = Score.HIGH,
-			load = Score.MEDIUM,
+			load = Score.HIGH,
 			uptime = 89f,
 			lastUpdated = "September 11, 2025 at 13:31",
 			asnName = "Google LLC",

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/ui/screens/details/components/DetailsSectionPerformance.kt

@@ -17,6 +17,8 @@ import androidx.compose.ui.unit.dp
 import net.nymtech.nymvpn.R
 import net.nymtech.nymvpn.ui.theme.Typography
 import net.nymtech.nymvpn.util.extensions.capitalizeFirstLowerRest
+import net.nymtech.nymvpn.util.extensions.colorLoad
+import net.nymtech.nymvpn.util.extensions.colorPerformance
 import net.nymtech.nymvpn.util.extensions.formatUtcString
 import net.nymtech.nymvpn.util.extensions.getScoreIcon
 import nym_vpn_lib_types.Score
@@ -38,7 +40,7 @@ fun DetailsSectionPerformance(score: Score?, load: Score?, uptime: Float?, lastU
 						Text(
 							text = s.name.capitalizeFirstLowerRest(),
 							style = Typography.bodyMedium,
-							color = MaterialTheme.colorScheme.onBackground,
+							color = s.colorPerformance(),
 							fontFamily = FontFamily(Font(R.font.lab_grotesque_regular)),
 						)
 					}
@@ -50,17 +52,10 @@ fun DetailsSectionPerformance(score: Score?, load: Score?, uptime: Float?, lastU
 			add(
 				stringResource(R.string.details_server_load) to {
 					Row(verticalAlignment = Alignment.CenterVertically) {
-						val loadIcon = getScoreIcon(l)
-						Image(
-							loadIcon.first,
-							contentDescription = loadIcon.second,
-							modifier = Modifier.size(16.dp),
-						)
-						Spacer(modifier = Modifier.width(6.dp))
 						Text(
 							text = l.name.capitalizeFirstLowerRest(),
 							style = Typography.bodyMedium,
-							color = MaterialTheme.colorScheme.onBackground,
+							color = l.colorLoad(),
 							fontFamily = FontFamily(Font(R.font.lab_grotesque_regular)),
 						)
 					}

nym-vpn-android/app/src/main/java/net/nymtech/nymvpn/util/extensions/UiExtensions.kt

@@ -21,6 +21,7 @@ import net.nymtech.nymvpn.NymVpn
 import net.nymtech.nymvpn.ui.Route
 import kotlin.reflect.KClass
 import net.nymtech.nymvpn.R
+import net.nymtech.nymvpn.ui.theme.CustomColors
 import net.nymtech.vpn.backend.Tunnel
 import net.nymtech.vpn.model.NymGateway
 import nym_vpn_lib_types.EntryPoint
@@ -143,6 +144,8 @@ fun ErrorStateReason.toUserMessage(context: Context): String {
 		ErrorStateReason.TunnelProvider -> context.getString(R.string.error_tunnel_provider)
 		ErrorStateReason.CredentialWastedOnEntryGateway -> context.getString(R.string.error_bandwidth_entry)
 		ErrorStateReason.CredentialWastedOnExitGateway -> context.getString(R.string.error_bandwidth_exit)
+		ErrorStateReason.PerformantEntryGatewayUnavailable -> context.getString(R.string.error_gateway_unavailable_entry)
+		ErrorStateReason.PerformantExitGatewayUnavailable -> context.getString(R.string.error_gateway_unavailable_exit)
 	}
 }
 
@@ -192,6 +195,26 @@ fun getScoreIcon(score: Score): Pair<ImageVector, String> {
 	}
 }
 
+@Composable
+fun Score.colorLoad(): Color {
+	return when (this) {
+		Score.HIGH -> Color.Red
+		Score.MEDIUM -> CustomColors.warning
+		Score.LOW -> Color.Green
+		Score.OFFLINE -> Color.Gray
+	}
+}
+
+@Composable
+fun Score.colorPerformance(): Color {
+	return when (this) {
+		Score.HIGH -> Color.Green
+		Score.MEDIUM -> CustomColors.warning
+		Score.LOW -> Color.Red
+		Score.OFFLINE -> Color.Gray
+	}
+}
+
 fun String.capitalizeFirstLowerRest(): String {
 	return this.lowercase()
 		.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }

nym-vpn-android/app/src/main/res/values/strings.xml

@@ -188,6 +188,8 @@
 	<string name="error_active_plan">You don’t have an active plan. Tap Get started to begin anonymous browsing.</string>
 	<string name="error_bandwidth_entry">Entry gateway is not responding or responding badly to a bandwidth increase.</string>
 	<string name="error_bandwidth_exit">Exit gateway is not responding or responding badly to a bandwidth increase.</string>
+	<string name="error_gateway_unavailable_entry">The entry gateway can\'t connect. Try another!</string>
+	<string name="error_gateway_unavailable_exit">The exit gateway can\'t connect. Try another!</string>
 	<!-- Main Screen -->
 	<string name="main_get_started_button">Get started</string>
 	<string name="connection_state_resolving_addresses">Resolving API IP addresses</string>

nym-vpn-android/core/src/main/java/net/nymtech/vpn/backend/NymBackend.kt

@@ -414,6 +414,13 @@ class NymBackend private constructor(private val context: Context) : Backend, Tu
 				onStateChange(event.asTunnelState())
 				tunnel?.onBackendEvent(BackendEvent.Tunnel(event.v1))
 			}
+
+			is TunnelEvent.AccountState -> {
+				tunnel?.onBackendEvent(BackendEvent.AccountState(event.v1))
+			}
+			is TunnelEvent.ConfigChanged -> {
+				tunnel?.onBackendEvent(BackendEvent.ConfigChanged(event.v1))
+			}
 		}
 	}
 

nym-vpn-android/core/src/main/java/net/nymtech/vpn/model/BackendEvent.kt

@@ -3,9 +3,13 @@ package net.nymtech.vpn.model
 import nym_vpn_lib_types.MixnetEvent
 import nym_vpn_lib_types.TunnelState
 import nym_vpn_lib.VpnException
+import nym_vpn_lib_types.AccountControllerState
+import nym_vpn_lib_types.BoxedVpnServiceConfig
 
 sealed class BackendEvent {
 	data class Mixnet(val event: MixnetEvent) : BackendEvent()
 	data class Tunnel(val state: TunnelState) : BackendEvent()
+	data class AccountState(val event: AccountControllerState) : BackendEvent()
+	data class ConfigChanged(val event: BoxedVpnServiceConfig) : BackendEvent()
 	data class StartFailure(val exception: VpnException) : BackendEvent()
 }