summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-07-21 11:41:44 +0200
committerAlbin <albin@mullvad.net>2023-07-21 11:41:44 +0200
commite2b3bcfef68d2642599db1e51790d4f194bfa65a (patch)
treee16fd446758ab1bdbfd710e9ced6fb1f89f9f720
parent7b30b8b7acd68af660acd12f948cec46620b68f7 (diff)
parentda6151b8649838f06df087210251a742b9ea5af0 (diff)
downloadmullvadvpn-e2b3bcfef68d2642599db1e51790d4f194bfa65a.tar.xz
mullvadvpn-e2b3bcfef68d2642599db1e51790d4f194bfa65a.zip
Merge branch 'fix-disconnect-button-text-alignment-droid-207'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt6
1 files changed, 5 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt
index ca92eb290c..ad483165f8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material3.Button
@@ -151,10 +152,13 @@ private fun DisconnectButton(
),
modifier = Modifier.weight(1f).height(height)
) {
+ // Offset to compensate for the reconnect button.
+ val paddingOffset = height + Dimens.listItemDivider
Text(
text = text,
style = MaterialTheme.typography.titleMedium,
- fontWeight = FontWeight.Bold
+ fontWeight = FontWeight.Bold,
+ modifier = Modifier.padding(start = paddingOffset)
)
}