refactor

pramodbharti · Oct 12, 2023 · 1dcad82 · 1dcad82
1 parent f1dc5cf
commit 1dcad82
Show file tree

Hide file tree

Showing 19 changed files with 495 additions and 432 deletions.
diff --git a/app/src/main/java/com/pramodbharti/filmo/MainActivity.kt b/app/src/main/java/com/pramodbharti/filmo/MainActivity.kt
@@ -1,12 +1,14 @@
 package com.pramodbharti.filmo
 
+import FilmoApp
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.pramodbharti.filmo.ui.theme.FilmoTheme
 
 class MainActivity : ComponentActivity() {
@@ -15,11 +17,8 @@ class MainActivity : ComponentActivity() {
         setContent {
             FilmoTheme {
                 // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-
+                Surface(tonalElevation = 5.dp) {
+                    FilmoApp()
                 }
             }
         }

diff --git a/app/src/main/java/com/pramodbharti/filmo/dummydata/DummyData.kt b/app/src/main/java/com/pramodbharti/filmo/dummydata/DummyData.kt
@@ -0,0 +1,66 @@
+package com.pramodbharti.filmo.dummydata
+
+import com.pramodbharti.filmo.R
+import com.pramodbharti.filmo.ui.models.MediaItem
+import com.pramodbharti.filmo.ui.screens.details.Cast
+
+val dummyMovies: List<MediaItem> = listOf(
+    MediaItem(
+        123,
+        "Testing one",
+        R.drawable.poster1,
+        R.drawable.back_drop1,
+        ""
+    ), MediaItem(
+        133,
+        "Testing one",
+        R.drawable.poster2,
+        R.drawable.back_drop2,
+        ""
+    ), MediaItem(
+        1230,
+        "Testing one",
+        R.drawable.poster1,
+        R.drawable.back_drop1,
+        ""
+    ),
+    MediaItem(
+        123,
+        "Testing one",
+        R.drawable.poster1,
+        R.drawable.back_drop1,
+        ""
+    ), MediaItem(
+        133,
+        "Testing one",
+        R.drawable.poster2,
+        R.drawable.back_drop2,
+        ""
+    ), MediaItem(
+        1230,
+        "Testing one",
+        R.drawable.poster1,
+        R.drawable.back_drop1,
+        ""
+    )
+)
+
+
+val dummyGenreList = listOf(
+    "Adventure",
+    "Action",
+    "Animation",
+    "Documentary",
+    "Fantasy",
+    "History",
+    "Science Fiction"
+)
+
+val dummyCastData = listOf(
+    Cast("Pramod Bharti", R.drawable.dddd),
+    Cast("Konark Chakra", R.drawable.placeholder),
+    Cast("Unknown Profile", R.drawable.profile_picture),
+    Cast("Pramod Bharti", R.drawable.dddd),
+    Cast("Konark Chakra", R.drawable.placeholder),
+    Cast("Unknown Profile", R.drawable.profile_picture)
+)
diff --git a/app/src/main/java/com/pramodbharti/filmo/ui/components/CarouselItem.kt b/app/src/main/java/com/pramodbharti/filmo/ui/components/CarouselItem.kt
@@ -0,0 +1,95 @@
+package com.pramodbharti.filmo.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import coil.request.ImageRequest
+import com.pramodbharti.filmo.dummydata.dummyMovies
+import com.pramodbharti.filmo.ui.Constants
+import com.pramodbharti.filmo.ui.models.MediaItem
+import com.pramodbharti.filmo.ui.theme.FilmoTheme
+
+@Composable
+fun CarouselItem(movieItem: MediaItem, modifier: Modifier = Modifier) {
+    Card(
+        modifier = modifier,
+        elevation = CardDefaults.cardElevation(defaultElevation = 8.dp),
+        shape = RectangleShape
+    ) {
+        Box {
+            AsyncImage(
+                model = ImageRequest.Builder(context = LocalContext.current)
+                    .data("${Constants.IMAGE_URL_500}${movieItem.poster}")
+                    .crossfade(true)
+                    .build(),
+                contentDescription = movieItem.title,
+                contentScale = ContentScale.Crop,
+                placeholder = painterResource(id = movieItem.backdrop),
+                error = painterResource(id = movieItem.backdrop),
+                modifier = Modifier
+                    .height(230.dp)
+                    .fillMaxWidth()
+            )
+
+            Column(
+                modifier = Modifier
+                    .align(Alignment.BottomStart)
+                    .background(
+                        brush = Brush.verticalGradient(
+                            colorStops = arrayOf(
+                                0.0f to Color.Black.copy(alpha = 0.0f),
+                                0.6f to Color.Black.copy(alpha = 0.8f),
+                                1f to Color.Black.copy(alpha = 0.8f)
+                            )
+                        )
+                    )
+                    .fillMaxWidth()
+            ) {
+                Text(
+                    text = "John Wick 4",
+                    style = TextStyle(
+                        color = Color.White,
+                        fontWeight = FontWeight.Bold
+                    ),
+                    modifier = Modifier.padding(start = 16.dp, top = 16.dp)
+                )
+                Text(
+                    text = "Crime, Thriller",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = Color.Gray,
+                    modifier = Modifier.padding(start = 16.dp, bottom = 16.dp)
+                )
+            }
+
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun CarouselItemPReview() {
+    FilmoTheme {
+        CarouselItem(movieItem = dummyMovies[1])
+    }
+}
diff --git a/app/src/main/java/com/pramodbharti/filmo/ui/components/CastItemsRow.kt b/app/src/main/java/com/pramodbharti/filmo/ui/components/CastItemsRow.kt
@@ -0,0 +1,65 @@
+package com.pramodbharti.filmo.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import coil.request.ImageRequest
+import com.pramodbharti.filmo.ui.screens.details.Cast
+
+@Composable
+fun CastItemsRow(casts: List<Cast>, modifier: Modifier = Modifier) {
+    LazyRow(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(16.dp),
+        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+    ) {
+        items(casts) {
+            CastItem(cast = it)
+        }
+    }
+}
+
+@Composable
+fun CastItem(cast: Cast, modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier.width(80.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        AsyncImage(
+            model = ImageRequest
+                .Builder(context = LocalContext.current)
+                .data(cast.photo)
+                .crossfade(true)
+                .build(),
+            placeholder = painterResource(id = cast.photo),
+            error = painterResource(id = cast.photo),
+            contentScale = ContentScale.Crop,
+            contentDescription = null,
+            modifier = Modifier
+                .clip(CircleShape)
+                .height(80.dp)
+        )
+        Text(
+            text = cast.name,
+            style = MaterialTheme.typography.bodyMedium,
+            textAlign = TextAlign.Center
+        )
+    }
+}
diff --git a/...ti/filmo/ui/screens/home/FilmoCarousel.kt → ...arti/filmo/ui/components/FilmoCarousel.kt b/...ti/filmo/ui/screens/home/FilmoCarousel.kt → ...arti/filmo/ui/components/FilmoCarousel.kt
@@ -1,4 +1,4 @@
-package com.pramodbharti.filmo.ui.screens.home
+package com.pramodbharti.filmo.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -29,7 +29,7 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.pramodbharti.filmo.ui.components.carouselTransition
+import com.pramodbharti.filmo.dummydata.dummyMovies
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 

diff --git a/app/src/main/java/com/pramodbharti/filmo/ui/components/MediaItemsRow.kt b/app/src/main/java/com/pramodbharti/filmo/ui/components/MediaItemsRow.kt
@@ -0,0 +1,52 @@
+package com.pramodbharti.filmo.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import coil.compose.AsyncImage
+import coil.request.ImageRequest
+import com.pramodbharti.filmo.ui.Constants
+import com.pramodbharti.filmo.ui.models.MediaItem
+
+@Composable
+fun MediaItemsPosterRow(movies: List<MediaItem>, modifier: Modifier = Modifier) {
+    LazyRow(
+        modifier = modifier,
+        contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        items(movies) { movie ->
+            MediaPoster(movieItem = movie)
+        }
+    }
+}
+
+@Composable
+fun MediaPoster(movieItem: MediaItem, modifier: Modifier = Modifier) {
+    Card(
+        modifier = modifier,
+        elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
+    ) {
+        AsyncImage(
+            model = ImageRequest.Builder(context = LocalContext.current)
+                .data("${Constants.IMAGE_URL_500}${movieItem.poster}")
+                .crossfade(true)
+                .build(),
+            contentDescription = movieItem.title,
+            contentScale = ContentScale.Crop,
+            placeholder = painterResource(id = movieItem.poster),
+            error = painterResource(id = movieItem.poster),
+            modifier = Modifier.size(150.dp, 230.dp)
+        )
+    }
+}
diff --git a/app/src/main/java/com/pramodbharti/filmo/ui/components/Slots.kt b/app/src/main/java/com/pramodbharti/filmo/ui/components/Slots.kt
@@ -0,0 +1,28 @@
+package com.pramodbharti.filmo.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.paddingFromBaseline
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun MediaSlots(
+    title: String,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit
+) {
+    Column(modifier) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleMedium,
+            modifier = Modifier
+                .paddingFromBaseline(top = 32.dp)
+                .padding(horizontal = 16.dp)
+        )
+        content()
+    }
+}