Merge pull request #32 from UmairKhalid786/feature/movies_and_favorites_grid_upgrade_to_tv_material_3

Feature/movies and favorites grid upgrade to tv material 3

Author: UmairKhalid786

app/src/main/java/com/techlads/composetv/home/carousel/CarouselItem.kt

@@ -1,32 +1,19 @@
 package com.techlads.composetv.home.carousel
 
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.tv.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
-import androidx.tv.material3.ExperimentalTvMaterial3Api
-import androidx.tv.material3.contentColorFor
-import com.techlads.composetv.theme.AppTheme
+import androidx.tv.material3.Text
 import com.techlads.composetv.widgets.BorderedFocusableItem
 
-
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun CarouselItem(parent: Int, child: Int, onItemFocus: (item: Int) -> Unit) {
     BorderedFocusableItem(
@@ -46,48 +33,15 @@ fun CarouselItem(parent: Int, child: Int, onItemFocus: (item: Int) -> Unit) {
 }
 
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun VerticalCarouselItem(parent: Int, child: Int) {
-
-    var isFocused by remember { mutableStateOf(false) }
-    val scale = animateFloatAsState(if (isFocused) 1.05f else 1f)
-
-
-    Card(
+    BorderedFocusableItem(
+        onClick = {  },
         modifier = Modifier
-            .zIndex(if (isFocused) 20f else 1f)
-            .graphicsLayer(
-                scaleX = scale.value,
-                scaleY = scale.value
-            )
             .padding(8.dp)
-            .fillMaxWidth()
-            .aspectRatio(0.6f)
-            .onFocusChanged {
-                isFocused = it.isFocused
-            }
-            .border(
-                border = BorderStroke(
-                    1.dp,
-                    if (isFocused)
-                        contentColorFor(backgroundColor = AppTheme.surface)
-                    else
-                        Color.Transparent
-                ), shape = MaterialTheme.shapes.medium
-            )
-            .clickable { }
-            .focusable(),
-        colors = CardDefaults.cardColors(
-            containerColor = AppTheme.surface,
-            contentColor = contentColorFor(backgroundColor = AppTheme.surface)
-        )
-    ) {
+            .aspectRatio(0.6f)) {
         Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
-            Text(
-                text = "Item $parent x $child",
-                textAlign = TextAlign.Center,
-            )
+            Text(text = "Item $parent x $child", textAlign = TextAlign.Center)
         }
     }
 }

app/src/main/java/com/techlads/composetv/leftmenu/MenuHeader.kt

@@ -40,7 +40,7 @@ fun MenuHeader(expanded: Boolean = true) {
         )
         Text(
             text = "Compose Tv",
-            fontWeight = FontWeight.Thin,
+            fontWeight = FontWeight.Normal,
             fontSize = 16.sp,
             modifier = Modifier.alpha(animatedAlpha.value),
             maxLines = 1