Fixed some more things

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/MullvadModalBottomSheet.kt

@@ -1,6 +1,9 @@
 package net.mullvad.mullvadvpn.compose.component
 
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.height
 import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -16,6 +19,7 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.cell.HeaderCell
 import net.mullvad.mullvadvpn.compose.cell.IconCell
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
+import net.mullvad.mullvadvpn.lib.theme.Dimens
 
 @Preview
 @Composable
@@ -54,6 +58,7 @@ fun MullvadModalBottomSheet(
         sheetState = sheetState,
         containerColor = backgroundColor,
         modifier = modifier,
+        windowInsets = WindowInsets(0, 0, 0, 0), // No insets
         dragHandle = { BottomSheetDefaults.DragHandle(color = onBackgroundColor) }
     ) {
         sheetContent(onBackgroundColor) {
@@ -65,5 +70,6 @@ fun MullvadModalBottomSheet(
                     }
                 }
         }
+        Spacer(modifier = Modifier.height(Dimens.cellHeight))
     }
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt

@@ -563,22 +563,27 @@ private fun BottomSheets(
 }
 
 private fun SelectLocationUiState.Content.indexOfSelectedRelayItem(): Int {
-    val rawIndex =
-        countries.indexOfFirst { relayCountry ->
-            relayCountry.location.location.country ==
-                when (selectedItem) {
-                    is RelayItem.Country -> selectedItem.code
-                    is RelayItem.City -> selectedItem.location.countryCode
-                    is RelayItem.Relay -> selectedItem.location.countryCode
-                    is RelayItem.CustomList,
-                    null -> null
-                }
-        }
-    return if (rawIndex >= 0) {
-        // Extra items are: Custom list header, custom list description and locations header
-        return rawIndex + customLists.size + EXTRA_ITEMS
+    if (selectedItem is RelayItem.CustomList) {
+        // Add the header for custom list
+        return filteredCustomLists.indexOfFirst { it.id == selectedItem.id } +
+            EXTRA_ITEM_CUSTOM_LIST
     } else {
-        rawIndex
+        val rawIndex =
+            countries.indexOfFirst { relayCountry ->
+                relayCountry.location.location.country ==
+                    when (selectedItem) {
+                        is RelayItem.Country -> selectedItem.code
+                        is RelayItem.City -> selectedItem.location.countryCode
+                        is RelayItem.Relay -> selectedItem.location.countryCode
+                        else -> null
+                    }
+            }
+        return if (rawIndex >= 0) {
+            // Extra items are: Custom list header, custom list description and locations header
+            return rawIndex + customLists.size + EXTRA_ITEMS_LOCATION
+        } else {
+            rawIndex
+        }
     }
 }
 
@@ -687,10 +692,7 @@ private fun EditCustomListBottomSheet(
     closeBottomSheet: () -> Unit
 ) {
     MullvadModalBottomSheet(closeBottomSheet = closeBottomSheet) { onBackgroundColor, onClose ->
-        HeaderCell(
-            text = stringResource(id = R.string.edit_custom_lists),
-            background = Color.Unspecified
-        )
+        HeaderCell(text = customList.name, background = Color.Unspecified)
         IconCell(
             iconId = R.drawable.icon_edit,
             title = stringResource(id = R.string.edit_name),
@@ -761,7 +763,8 @@ private fun CustomListResult.message(context: Context): String =
             context.getString(R.string.locations_were_changed_for, name)
     }
 
-private const val EXTRA_ITEMS = 3
+private const val EXTRA_ITEMS_LOCATION = 3
+private const val EXTRA_ITEM_CUSTOM_LIST = 1
 
 sealed interface BottomSheetState {
     data object Hidden : BottomSheetState