Merge pull request #2291 from HedvigInsurance/new-design/check-placeh…

…older-shimmer New design/check placeholder shimmer
HedvigInsurance · Nov 15, 2024 · 2fddf97 · 2fddf97
2 parents c05c9c9 + ad95d8d
commit 2fddf97
Show file tree

Hide file tree

Showing 16 changed files with 722 additions and 38 deletions.
diff --git a/app/design-system/design-system-hedvig/build.gradle.kts b/app/design-system/design-system-hedvig/build.gradle.kts
@@ -24,6 +24,5 @@ dependencies {
   implementation(projects.coreResources)
   implementation(projects.designSystemInternals)
   implementation(projects.navigationCore)
-  implementation(projects.placeholder)
   implementation(projects.coreUiData)
 }
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.placeholder.PlaceholderHighlight
-import com.hedvig.android.placeholder.fade
-import com.hedvig.android.placeholder.placeholder
+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
 
 @Composable
 internal fun FileContainer(
@@ -62,7 +62,7 @@ internal fun FileContainer(
     },
     modifier = modifier
       .height(109.dp)
-      .placeholder(visible = loadedImageIntrinsicSize.value == null, highlight = PlaceholderHighlight.fade())
+      .hedvigPlaceholder(visible = loadedImageIntrinsicSize.value == null, 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
@@ -36,9 +36,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.placeholder.PlaceholderHighlight
-import com.hedvig.android.placeholder.placeholder
-import com.hedvig.android.placeholder.shimmer
+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
 
 @Composable
 fun HedvigCard(
@@ -86,7 +86,7 @@ fun InsuranceCard(
         painter = ColorPainter(Color.Black.copy(alpha = 0.3f)),
         modifier = Modifier
           .matchParentSize()
-          .placeholder(visible = true, highlight = PlaceholderHighlight.shimmer()),
+          .hedvigPlaceholder(visible = true, highlight = PlaceholderHighlight.shimmer()),
         contentDescription = null,
       )
     } else {
@@ -127,14 +127,14 @@ fun InsuranceCard(
       HedvigText(
         topText,
         color = HedvigTheme.colorScheme.textWhite,
-        modifier = Modifier.placeholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
+        modifier = Modifier.hedvigPlaceholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
       )
       Spacer(Modifier.height(4.dp))
       HedvigTheme(darkTheme = true) {
         HedvigText(
           text = bottomText,
           color = HedvigTheme.colorScheme.textSecondaryTranslucent,
-          modifier = Modifier.placeholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
+          modifier = Modifier.hedvigPlaceholder(visible = isLoading, highlight = PlaceholderHighlight.shimmer()),
         )
       }
     }