Fix bad SharedContentKey

Author: Inky-developer

app/src/main/java/com/inky/fitnesscalendar/ui/App.kt

@@ -228,18 +228,21 @@ private fun AppNavigation(
             ) { backStackEntry ->
                 val route: Views.NewActivity = backStackEntry.toRoute()
                 onCurrentView(route)
-                NewActivity(
-                    route.activityId,
-                    onSave = {
-                        scope.launch {
-                            viewModel.repository.saveActivity(it)
-                        }
-                        navController.popBackStack()
-                    },
-                    onNavigateBack = { navController.popBackStack() },
-                    onNavigateNewPlace = { navController.navigate(SettingsViews.PlaceDialog()) },
-                    initialDay = route.initialStartDay
-                )
+
+                ProvideSharedContent(sharedContentScope = this@SharedTransitionLayout) {
+                    NewActivity(
+                        route.activityId,
+                        onSave = {
+                            scope.launch {
+                                viewModel.repository.saveActivity(it)
+                            }
+                            navController.popBackStack()
+                        },
+                        onNavigateBack = { navController.popBackStack() },
+                        onNavigateNewPlace = { navController.navigate(SettingsViews.PlaceDialog()) },
+                        initialDay = route.initialStartDay
+                    )
+                }
             }
 
             composable<Views.ApiNewActivity>(

app/src/main/java/com/inky/fitnesscalendar/ui/components/ActivityCard.kt

@@ -62,6 +62,7 @@ import com.inky.fitnesscalendar.localization.LocalizationRepository
 import com.inky.fitnesscalendar.ui.util.ContextFormat
 import com.inky.fitnesscalendar.ui.util.Icons
 import com.inky.fitnesscalendar.ui.util.SharedContentKey
+import com.inky.fitnesscalendar.ui.util.applyIf
 import com.inky.fitnesscalendar.ui.util.sharedElement
 import com.inky.fitnesscalendar.ui.util.skipToLookaheadSize
 import com.inky.fitnesscalendar.util.asNonEmptyOrNull
@@ -149,7 +150,11 @@ fun ActivityCard(
                 onClick = { imageViewerUri = it.getImageUri(context) },
                 modifier = Modifier
                     .padding(all = 8.dp)
-                    .sharedElement(SharedContentKey.ActivityImage)
+                    .applyIf(richActivity.activity.uid != null) {
+                        sharedElement(
+                            SharedContentKey.ActivityImage(richActivity.activity.uid!!)
+                        )
+                    }
             )
         }
     }

app/src/main/java/com/inky/fitnesscalendar/ui/components/AppFrame.kt

@@ -9,21 +9,18 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import com.inky.fitnesscalendar.ui.theme.FitnessCalendarTheme
+import com.inky.fitnesscalendar.ui.util.applyIf
 
 @Composable
 fun AppFrame(modifier: Modifier = Modifier, app: @Composable () -> Unit) {
     FitnessCalendarTheme {
         // In landscape mode, use the more conservative `safeDrawingPadding`, which looks
         // uglier but makes sure that no content is obstructed
         val orientation = LocalConfiguration.current.orientation
-        val baseModifier = modifier.imePadding()
-        val surfaceModifier = when (orientation) {
-            Configuration.ORIENTATION_LANDSCAPE -> baseModifier.safeDrawingPadding()
-            else -> baseModifier
-        }
-
         Surface(
-            modifier = surfaceModifier,
+            modifier = modifier
+                .imePadding()
+                .applyIf(orientation == Configuration.ORIENTATION_LANDSCAPE) { safeDrawingPadding() },
             color = MaterialTheme.colorScheme.background
         ) {
             app()

app/src/main/java/com/inky/fitnesscalendar/ui/util/SharedContentKey.kt

@@ -8,7 +8,7 @@ import com.inky.fitnesscalendar.ui.localSharedTransition
 sealed class SharedContentKey {
     data class ActivityCard(val id: Int?) : SharedContentKey()
 
-    data object ActivityImage : SharedContentKey()
+    data class ActivityImage(val activityId: Int) : SharedContentKey()
 
     data object NewActivityFAB : SharedContentKey()
 

app/src/main/java/com/inky/fitnesscalendar/ui/util/modifierExtensions.kt

@@ -0,0 +1,11 @@
+package com.inky.fitnesscalendar.ui.util
+
+import androidx.compose.ui.Modifier
+
+inline fun Modifier.applyIf(condition: Boolean, block: Modifier.() -> Modifier): Modifier {
+    return if (condition) {
+        block()
+    } else {
+        this
+    }
+}

app/src/main/java/com/inky/fitnesscalendar/ui/views/EditActivityView.kt

@@ -81,6 +81,9 @@ import com.inky.fitnesscalendar.ui.components.SelectImageDropdownMenuItem
 import com.inky.fitnesscalendar.ui.components.defaultTopAppBarColors
 import com.inky.fitnesscalendar.ui.components.optionGroupDefaultBackground
 import com.inky.fitnesscalendar.ui.util.Icons
+import com.inky.fitnesscalendar.ui.util.SharedContentKey
+import com.inky.fitnesscalendar.ui.util.applyIf
+import com.inky.fitnesscalendar.ui.util.sharedElement
 import com.inky.fitnesscalendar.util.Option
 import com.inky.fitnesscalendar.util.asNonEmptyOrNull
 import com.inky.fitnesscalendar.util.toDate
@@ -310,7 +313,11 @@ fun NewActivity(
                         }
                     },
                     onClick = { imageViewerImage = it },
-                    modifier = Modifier.padding(vertical = 4.dp)
+                    modifier = Modifier
+                        .padding(vertical = 4.dp)
+                        .applyIf(editState.activityId != null) {
+                            sharedElement(SharedContentKey.ActivityImage(editState.activityId!!))
+                        }
                 )
             }
 

app/src/main/java/com/inky/fitnesscalendar/ui/views/TrackDetailsView.kt

@@ -257,7 +257,7 @@ fun TrackDetailsData(
             onClick = { imagePopup = it },
             modifier = Modifier
                 .padding(all = 8.dp)
-                .sharedElement(SharedContentKey.ActivityImage)
+                .sharedElement(SharedContentKey.ActivityImage(state.initialActivity.activity.uid!!))
         )
     }