Remove usages of glow (unsupported before Android 10)

nielsvanvelzen · Sep 18, 2024 · 32baa94 · 32baa94
1 parent 9b90ac9
commit 32baa94
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/PopupContainer.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/PopupContainer.kt
@@ -1,5 +1,6 @@
 package nl.ndat.tvlauncher.ui.component
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -15,7 +16,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupPositionProvider
 import androidx.compose.ui.window.PopupProperties
-import androidx.tv.material3.Glow
+import androidx.tv.material3.Border
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
 import androidx.tv.material3.SurfaceDefaults
@@ -69,7 +70,10 @@ fun PopupContainer(
 						contentColor = MaterialTheme.colorScheme.onSecondaryContainer,
 					),
 					shape = RoundedCornerShape(8.dp),
-					glow = Glow(Color.White, 6.dp),
+					border = Border(
+						border = BorderStroke(2.dp, Color.White),
+						shape = RoundedCornerShape(8.dp),
+					),
 				) {
 					Box(modifier = Modifier.padding(8.dp)) {
 						popupContent()

diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/card/AppCard.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/card/AppCard.kt
@@ -1,6 +1,7 @@
 package nl.ndat.tvlauncher.ui.component.card
 
 import android.content.Intent
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsFocusedAsState
@@ -26,7 +27,6 @@ import androidx.palette.graphics.Palette
 import androidx.tv.material3.Border
 import androidx.tv.material3.Card
 import androidx.tv.material3.CardDefaults
-import androidx.tv.material3.Glow
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.StandardCardContainer
 import androidx.tv.material3.Text
@@ -87,13 +87,11 @@ fun AppCard(
 							.height(baseHeight)
 							.aspectRatio(16f / 9f),
 						interactionSource = interactionSource,
-						glow = CardDefaults.glow(
-							focusedGlow = Glow(
-								elevationColor = imagePrimaryColor ?: MaterialTheme.colorScheme.border,
-								elevation = 10.dp
+						border = CardDefaults.border(
+							focusedBorder = Border(
+								border = BorderStroke(2.dp, imagePrimaryColor ?: MaterialTheme.colorScheme.border),
 							)
 						),
-						border = CardDefaults.border(focusedBorder = Border.None),
 						onClick = {
 							if (launchIntentUri != null) {
 								context.startActivity(Intent.parseUri(launchIntentUri, 0))

diff --git a/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/card/ChannelProgramCard.kt b/app/src/main/kotlin/nl/ndat/tvlauncher/ui/component/card/ChannelProgramCard.kt
@@ -1,6 +1,7 @@
 package nl.ndat.tvlauncher.ui.component.card
 
 import android.content.Intent
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
@@ -20,7 +21,6 @@ import androidx.palette.graphics.Palette
 import androidx.tv.material3.Border
 import androidx.tv.material3.Card
 import androidx.tv.material3.CardDefaults
-import androidx.tv.material3.Glow
 import androidx.tv.material3.MaterialTheme
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
@@ -39,13 +39,11 @@ fun ChannelProgramCard(
 		modifier = modifier
 			.height(baseHeight)
 			.aspectRatio(program.posterArtAspectRatio?.floatValue ?: 1f),
-		glow = CardDefaults.glow(
-			focusedGlow = Glow(
-				elevationColor = imagePrimaryColor ?: MaterialTheme.colorScheme.border,
-				elevation = 10.dp
+		border = CardDefaults.border(
+			focusedBorder = Border(
+				border = BorderStroke(2.dp, imagePrimaryColor ?: MaterialTheme.colorScheme.border),
 			)
 		),
-		border = CardDefaults.border(focusedBorder = Border.None),
 		onClick = {
 			if (program.intentUri != null) {
 				context.startActivity(Intent.parseUri(program.intentUri, 0))