Merge branch 'back-button-texts-overlap-title-text-droid-288'

5 files changed, 13 insertions, 28 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt
index f8b20db7bf..f2906f1d46 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CollapsingTopBar.kt
@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.compose.component
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -28,20 +27,20 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.lib.theme.MullvadDarkBlue
-import net.mullvad.mullvadvpn.lib.theme.MullvadWhite60
+import net.mullvad.mullvadvpn.lib.theme.AppTheme
 
 @Preview
 @Composable
 private fun PreviewTopBar() {
-    CollapsingTopBar(
-        backgroundColor = MullvadDarkBlue,
-        onBackClicked = {},
-        title = "View title",
-        progress = 1.0f,
-        backTitle = "Back",
-        modifier = Modifier.height(102.dp)
-    )
+    AppTheme {
+        CollapsingTopBar(
+            backgroundColor = MaterialTheme.colorScheme.secondary,
+            onBackClicked = {},
+            title = "View title",
+            progress = 1.0f,
+            modifier = Modifier.height(102.dp)
+        )
+    }
 }
 
 @Composable
@@ -50,17 +49,14 @@ fun CollapsingTopBar(
     onBackClicked: () -> Unit,
     title: String,
     progress: Float,
-    backTitle: String,
     modifier: Modifier,
     backIcon: Int? = null,
     shouldRotateBackButtonDown: Boolean = false
 ) {
     val expandedToolbarHeight = dimensionResource(id = R.dimen.expanded_toolbar_height)
     val iconSize = dimensionResource(id = R.dimen.icon_size)
-    val iconPadding = dimensionResource(id = R.dimen.small_padding)
     val sideMargin = dimensionResource(id = R.dimen.side_margin)
     val verticalMargin = dimensionResource(id = R.dimen.cell_label_vertical_padding)
-    val textSize = dimensionResource(id = R.dimen.text_small).value.sp
     val maxTopPadding = 48
     val minTopPadding = 14
     val maxTitleSize = 30
@@ -76,7 +72,7 @@ fun CollapsingTopBar(
         colors =
             ButtonDefaults.buttonColors(
                 contentColor = Color.White,
-                containerColor = MullvadDarkBlue
+                containerColor = backgroundColor
             ),
         shape = MaterialTheme.shapes.small
     ) {
@@ -88,13 +84,6 @@ fun CollapsingTopBar(
                     .width(iconSize)
                     .height(iconSize)
         )
-        Spacer(modifier = Modifier.width(iconPadding).fillMaxHeight())
-        Text(
-            text = backTitle,
-            color = MullvadWhite60,
-            fontWeight = FontWeight.Bold,
-            fontSize = textSize
-        )
     }
 
     Text(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
index 314e10862e..c9f90b4d53 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
@@ -89,7 +89,6 @@ fun AccountScreen(
                 title = stringResource(id = R.string.settings_account),
                 progress = progress,
                 modifier = scaffoldModifier,
-                backTitle = String(),
                 shouldRotateBackButtonDown = true
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
index fdae96dd5a..22edb7a950 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
@@ -81,7 +81,6 @@ fun SettingsScreen(
                 title = stringResource(id = R.string.settings),
                 progress = progress,
                 modifier = scaffoldModifier,
-                backTitle = String(),
                 shouldRotateBackButtonDown = true
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
index 138f569b30..ac101b48ab 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -106,8 +106,7 @@ fun SplitTunnelingScreen(
                 onBackClicked = { onBackClick() },
                 title = stringResource(id = R.string.split_tunneling),
                 progress = progress,
-                modifier = scaffoldModifier,
-                backTitle = stringResource(id = R.string.settings)
+                modifier = scaffoldModifier
             )
         },
     ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index 6eefb362ec..a458c3164a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -280,8 +280,7 @@ fun VpnSettingsScreen(
                 onBackClicked = { onBackClick() },
                 title = stringResource(id = R.string.settings_vpn),
                 progress = progress,
-                modifier = scaffoldModifier,
-                backTitle = stringResource(id = R.string.settings)
+                modifier = scaffoldModifier
             )
         },
     ) {