The clickable area around each measurement type icon now has a ripple effect, improving touch feedback. This was achieved by applying the clickable modifier directly to the RoundMeasurementIcon and removing the wrapping Column

android_app/app/src/main/java/com/health/openscale/ui/screen/components/MeasurementTypeFilterRow.kt

@@ -19,12 +19,15 @@ package com.health.openscale.ui.screen.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -35,6 +38,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.Dp
@@ -189,15 +193,16 @@ fun MeasurementTypeFilterRow(
             val iconBackgroundColor = if (isSelected) Color(type.color) else MaterialTheme.colorScheme.surfaceVariant
             val iconColor = if (isSelected) Color.Black else MaterialTheme.colorScheme.onSurfaceVariant // Consider MaterialTheme.colorScheme.onPrimary for selected state if type.color is primary-like
 
-            Column(
+            RoundMeasurementIcon(
-                horizontalAlignment = Alignment.CenterHorizontally,
+                icon = type.icon.resource,
+                backgroundTint = iconBackgroundColor,
+                iconTint = iconColor,
+                size = iconSize,
                 modifier = Modifier
-                    .padding(vertical = 4.dp) // Padding for touch target
+                    .clip(CircleShape)
-                    .clickable {
+                    .clickable(
-                        if (!isInitialized) { // Prevent clicks during initial setup
+                        enabled = isInitialized,
-                            return@clickable
+                        onClick = {
-                        }
-
                             val currentSelectionMutable = displayedSelectedIds.toMutableList()
                             val currentlySelectedInList = type.id in currentSelectionMutable
 
@@ -222,13 +227,8 @@ fun MeasurementTypeFilterRow(
                                 onPersistSelectedTypeIds(setToPersist)
                             }
                         }
-            ) {
+                    )
-                RoundMeasurementIcon(
-                    icon = type.icon.resource,
-                    backgroundTint = iconBackgroundColor,
-                    iconTint = iconColor
             )
         }
     }
 }
-}

android_app/app/src/main/java/com/health/openscale/ui/screen/settings/UserDetailScreen.kt

@@ -519,12 +519,7 @@ fun UserDetailScreen(
                 onValueChange = {},
                 readOnly = true,
                 modifier = Modifier.fillMaxWidth(),
-                label = {
+                label = { Text(stringResource(R.string.my_goals_label)) },
-                    Text(
-                        text = stringResource(R.string.my_goals_label),
-                        style = MaterialTheme.typography.bodyLarge
-                    )
-                },
                 trailingIcon = {
                     IconButton(onClick = {
                         val firstTargetableType = allMeasurementTypes.firstOrNull {