Implement scroll-to-position behavior in OverviewScreen and TableScreen using SharedViewModel to track the last drill-down period.

*   **SharedViewModel.kt**: Added `lastDrillDownPeriodStart` StateFlow and a setter to track the start time of the most recent drill-down period.
*   **OverviewScreen.kt**: Updated the lifecycle observer to scroll the list to the previously viewed period upon returning from a drill-down view.
*   **TableScreen.kt**: Refactored `LaunchedEffect` to handle scrolling to the specific aggregated period when returning from a drill-down, while maintaining the highlighting logic for new measurements.

Author: oliexdev

android_app/app/src/main/java/com/health/openscale/ui/screen/overview/OverviewScreen.kt

@@ -81,6 +81,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -130,6 +131,8 @@ import com.health.openscale.ui.screen.settings.BluetoothViewModel
 import com.health.openscale.ui.shared.SharedViewModel
 import com.health.openscale.ui.shared.TopBarAction
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import java.text.DateFormat
 import java.util.Date
@@ -279,7 +282,7 @@ fun OverviewScreen(
 
     // ── Top bar ───────────────────────────────────────────────────────────────
     val lifecycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(lifecycleOwner, selectedUserId, bluetoothAction, timeFilterAction, isDrillDown) {
+    DisposableEffect(lifecycleOwner, selectedUserId, bluetoothAction, timeFilterAction, isDrillDown, aggregatedItems) {
         fun updateTopBar() {
             if (isDrillDown) {
                 val fmt = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault())
@@ -297,7 +300,17 @@ fun OverviewScreen(
         }
         updateTopBar()
         val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_RESUME) updateTopBar()
+            if (event == Lifecycle.Event.ON_RESUME) {
+                updateTopBar()
+                val target = sharedViewModel.lastDrillDownPeriodStart.value ?: return@LifecycleEventObserver
+                val idx = aggregatedItems.indexOfFirst { it.periodStartMillis == target }
+                if (idx >= 0) {
+                    scope.launch {
+                        listState.scrollToItem(idx)
+                        sharedViewModel.setLastDrillDownPeriodStart(null)
+                    }
+                }
+            }
         }
         lifecycleOwner.lifecycle.addObserver(observer)
         onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
@@ -568,11 +581,10 @@ fun OverviewScreen(
                                             measurementWithValues      = enrichedItem.measurementWithValues,
                                             processedValuesForDisplay  = enrichedItem.valuesWithTrend,
                                             userEvaluationContext      = userEvalContext,
-                                            onClick                    = {
+                                            onClick = {
                                                 currentSelectedAggregatedTs = ts
-                                                navController.navigate(
-                                                    Routes.overviewDrillDown(periodStart, periodEnd)
-                                                )
+                                                sharedViewModel.setLastDrillDownPeriodStart(periodStart)
+                                                navController.navigate(Routes.overviewDrillDown(periodStart, periodEnd))
                                             },
                                             onEdit                     = {
                                                 currentSelectedAggregatedTs = ts

android_app/app/src/main/java/com/health/openscale/ui/screen/table/TableScreen.kt

@@ -68,6 +68,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -560,19 +561,32 @@ fun TableScreen(
     }
 
     // ── Scroll + highlight ────────────────────────────────────────────────────
-    val latestMeasurementId   = remember(tableData) { tableData.firstOrNull()?.measurementId }
     var highlightedItemId     by remember { mutableStateOf<Int?>(null) }
     val lazyListState         = rememberLazyListState()
 
-    LaunchedEffect(latestMeasurementId) {
-        if (latestMeasurementId != null && tableData.isNotEmpty() && !isDrillDown) {
-            kotlinx.coroutines.delay(500)
-            if (latestMeasurementId == tableData.firstOrNull()?.measurementId) {
-                highlightedItemId = latestMeasurementId
-                lazyListState.animateScrollToItem(0)
-                kotlinx.coroutines.delay(1500)
-                highlightedItemId = null
-            }
+    val lastDrillDownPeriodStart by sharedViewModel.lastDrillDownPeriodStart.collectAsState()
+
+    LaunchedEffect(lastDrillDownPeriodStart) {
+        val target = lastDrillDownPeriodStart ?: return@LaunchedEffect
+
+        snapshotFlow { tableData }
+            .filter { it.isNotEmpty() }
+            .first()
+
+        val idx = tableData.indexOfFirst { it.periodStartMillis == target }
+        if (idx >= 0) {
+            lazyListState.scrollToItem(idx)
+            sharedViewModel.setLastDrillDownPeriodStart(null)
+            return@LaunchedEffect
+        }
+
+        val latestId = tableData.firstOrNull()?.measurementId ?: return@LaunchedEffect
+        kotlinx.coroutines.delay(500)
+        if (latestId == tableData.firstOrNull()?.measurementId) {
+            highlightedItemId = latestId
+            lazyListState.animateScrollToItem(0)
+            kotlinx.coroutines.delay(1500)
+            highlightedItemId = null
         }
     }
 
@@ -826,11 +840,9 @@ fun TableScreen(
                                     if (isInSelectionMode) {
                                         toggleKey(key)
                                     } else if (rowData.isAggregated) {
+                                        sharedViewModel.setLastDrillDownPeriodStart(rowData.periodStartMillis)
                                         navController.navigate(
-                                            Routes.tableDrillDown(
-                                                startMillis = rowData.periodStartMillis!!,
-                                                endMillis   = rowData.periodEndMillis!!,
-                                            )
+                                            Routes.tableDrillDown(rowData.periodStartMillis!!, rowData.periodEndMillis!!)
                                         )
                                     } else {
                                         navController.navigate(

android_app/app/src/main/java/com/health/openscale/ui/shared/SharedViewModel.kt

@@ -437,6 +437,13 @@ class SharedViewModel @Inject constructor(
     // Drill-down flow — raw, non-aggregated, fixed time window
     // -------------------------------------------------------------------------
 
+    private val _lastDrillDownPeriodStart = MutableStateFlow<Long?>(null)
+    val lastDrillDownPeriodStart: StateFlow<Long?> = _lastDrillDownPeriodStart.asStateFlow()
+
+    fun setLastDrillDownPeriodStart(periodStart: Long?) {
+        _lastDrillDownPeriodStart.value = periodStart
+    }
+
     /**
      * Cache of drill-down StateFlows keyed by "$startMillis-$endMillis".
      *