Merge pull request #2340 from HedvigInsurance/ds/shimmer

DS shimmer
HedvigInsurance · Dec 4, 2024 · bf22d0b · bf22d0b
2 parents 76441ed + ceede84
commit bf22d0b
Show file tree

Hide file tree

Showing 20 changed files with 173 additions and 853 deletions.
diff --git a/app/core/core-ui/build.gradle.kts b/app/core/core-ui/build.gradle.kts
@@ -24,5 +24,4 @@ dependencies {
   implementation(projects.coreResources)
   implementation(projects.coreUiData)
   implementation(projects.designSystemHedvig)
-  implementation(projects.placeholder)
 }
diff --git a/app/design-system/design-system-hedvig/build.gradle.kts b/app/design-system/design-system-hedvig/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
   api(libs.androidx.compose.foundation)
   api(libs.coil.coil)
   api(projects.designSystemApi)
+  api(projects.placeholder)
 
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.foundationLayout)

diff --git a/...gn-system-hedvig/src/main/kotlin/com/hedvig/android/design/system/hedvig/FileContainer.kt b/...gn-system-hedvig/src/main/kotlin/com/hedvig/android/design/system/hedvig/FileContainer.kt
@@ -15,9 +15,9 @@ import coil.ImageLoader
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.request.ImageRequest
-import com.hedvig.android.design.system.hedvig.placeholder.PlaceholderHighlight
 import com.hedvig.android.design.system.hedvig.placeholder.fade
 import com.hedvig.android.design.system.hedvig.placeholder.hedvigPlaceholder
+import com.hedvig.android.placeholder.PlaceholderHighlight
 
 @Composable
 internal fun FileContainer(
@@ -62,7 +62,11 @@ internal fun FileContainer(
     },
     modifier = modifier
       .height(109.dp)
-      .hedvigPlaceholder(visible = loadedImageIntrinsicSize.value == null, highlight = PlaceholderHighlight.fade())
+      .hedvigPlaceholder(
+        visible = loadedImageIntrinsicSize.value == null,
+        shape = HedvigTheme.shapes.cornerMedium,
+        highlight = PlaceholderHighlight.fade(),
+      )
       .clip(HedvigTheme.shapes.cornerMedium),
   )
 }
diff --git a/...esign-system-hedvig/src/main/kotlin/com/hedvig/android/design/system/hedvig/HedvigCard.kt b/...esign-system-hedvig/src/main/kotlin/com/hedvig/android/design/system/hedvig/HedvigCard.kt
@@ -37,9 +37,9 @@ import com.hedvig.android.design.system.hedvig.HighlightLabelDefaults.HighlightS
 import com.hedvig.android.design.system.hedvig.HighlightLabelDefaults.HighlightShade.MEDIUM
 import com.hedvig.android.design.system.hedvig.icon.HedvigIcons
 import com.hedvig.android.design.system.hedvig.icon.HelipadOutline
-import com.hedvig.android.design.system.hedvig.placeholder.PlaceholderHighlight
 import com.hedvig.android.design.system.hedvig.placeholder.hedvigPlaceholder
 import com.hedvig.android.design.system.hedvig.placeholder.shimmer
+import com.hedvig.android.placeholder.PlaceholderHighlight
 
 @Composable
 fun HedvigCard(
@@ -88,7 +88,11 @@ fun InsuranceCard(
         painter = ColorPainter(Color.Black.copy(alpha = 0.3f)),
         modifier = Modifier
           .matchParentSize()
-          .hedvigPlaceholder(visible = true, highlight = PlaceholderHighlight.shimmer()),
+          .hedvigPlaceholder(
+            visible = true,
+            shape = HedvigTheme.shapes.cornerXLarge,
+            highlight = PlaceholderHighlight.shimmer(),
+          ),
         contentDescription = null,
       )
     } else {
@@ -129,14 +133,22 @@ fun InsuranceCard(
       HedvigText(
         topText,
         color = HedvigTheme.colorScheme.textWhite,
-        modifier = Modifier.hedvigPlaceholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
+        modifier = Modifier.hedvigPlaceholder(
+          visible = isLoading,
+          shape = HedvigTheme.shapes.cornerSmall,
+          highlight = PlaceholderHighlight.shimmer(),
+        ),
       )
       Spacer(Modifier.height(4.dp))
       HedvigTheme(darkTheme = true) {
         HedvigText(
           text = bottomText,
           color = HedvigTheme.colorScheme.textSecondaryTranslucent,
-          modifier = Modifier.hedvigPlaceholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
+          modifier = Modifier.hedvigPlaceholder(
+            visible = isLoading,
+            shape = HedvigTheme.shapes.cornerSmall,
+            highlight = PlaceholderHighlight.shimmer(),
+          ),
         )
       }
     }