Merge pull request #86 from VictorKabata/temp

Temp -> Develop
VictorKabata · Jul 6, 2023 · edd4fd0 · edd4fd0
2 parents 02f21d5 + f605856
commit edd4fd0
Show file tree

Hide file tree

Showing 159 changed files with 2,454 additions and 760 deletions.
diff --git a/app-android/notflix.jks b/app-android/notflix.jks
diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts
@@ -7,6 +7,18 @@ dependencies {
     implementation(project(":shared"))
 
     implementation(compose.desktop.currentOs)
+
+    implementation(libs.voyager.core)
+    implementation(libs.voyager.navigator)
+    implementation(libs.voyager.tabNavigator)
+
+    implementation(libs.kamel)
+
+    testImplementation(kotlin("test"))
+    testImplementation(libs.turbine)
+    testImplementation(libs.ktor.mock)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlinX.coroutines.test)
 }
 
 compose.desktop {

diff --git a/app-desktop/src/main/kotlin/NotflixDesktop.kt b/app-desktop/src/main/kotlin/NotflixDesktop.kt
@@ -1,12 +1,13 @@
 import androidx.compose.ui.window.application
 import com.vickikbt.shared.di.initKoin
+import di.desktopModule
 import org.koin.core.Koin
 import ui.screens.main.MainScreen
 
 lateinit var koin: Koin
 
 fun main() {
-    koin = initKoin(enableNetworkLogs = true).koin
+    koin = initKoin(enableNetworkLogs = true) { modules(desktopModule) }.koin
 
     return application {
         MainScreen(applicationScope = this)

diff --git a/app-desktop/src/main/kotlin/di/DesktopModule.kt b/app-desktop/src/main/kotlin/di/DesktopModule.kt
@@ -0,0 +1,16 @@
+package di
+
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import ui.screens.details.DetailsScreenModel
+import ui.screens.favourites.FavouritesScreenModel
+import ui.screens.home.HomeScreenModel
+import ui.screens.settings.SettingsScreenModel
+
+val desktopModule = module {
+
+    singleOf(::HomeScreenModel)
+    singleOf(::DetailsScreenModel)
+    singleOf(::FavouritesScreenModel)
+    singleOf(::SettingsScreenModel)
+}
diff --git a/app-desktop/src/main/kotlin/ui/components/ItemMovieCast.kt b/app-desktop/src/main/kotlin/ui/components/ItemMovieCast.kt
@@ -1,41 +1,56 @@
 package ui.components
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Card
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vickikbt.shared.domain.models.Actor
+import io.kamel.image.KamelImage
+import io.kamel.image.lazyPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import ui.theme.TextSecondary
-import utils.AsyncImage
 import utils.loadImage
-import utils.loadImageBitmap
 
 @Composable
 fun ItemMovieCast(modifier: Modifier = Modifier, actor: Actor) {
     val imageUrl = actor.profilePath?.loadImage()
 
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        AsyncImage(
-            modifier = Modifier.fillMaxSize(),
-            load = { loadImageBitmap(imageUrl) },
-            painterFor = { remember { BitmapPainter(it) } },
-            contentDescription = "Cast",
-            contentScale = ContentScale.Crop
-        )
+    val painterResource = lazyPainterResource(imageUrl ?: "") {
+        coroutineContext = Job() + Dispatchers.IO
+    }
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+        Card(
+            modifier = Modifier.size(90.dp),
+            shape = CircleShape
+        ) {
+            KamelImage(
+                modifier = Modifier.fillMaxSize(),
+                resource = painterResource,
+                contentDescription = "Cast",
+                contentScale = ContentScale.Crop
+            )
+        }
 
         Text(
-            modifier = Modifier.width(78.dp),
+            modifier = Modifier.widthIn(max = 90.dp),
             text = actor.name ?: "Unknown actor",
             style = MaterialTheme.typography.h6,
             fontSize = 14.sp,
@@ -46,7 +61,7 @@ fun ItemMovieCast(modifier: Modifier = Modifier, actor: Actor) {
         )
 
         Text(
-            modifier = Modifier.width(77.dp),
+            modifier = Modifier.widthIn(max = 90.dp),
             text = actor.character ?: "Unknown character",
             style = MaterialTheme.typography.h4,
             fontSize = 12.sp,

diff --git a/app-desktop/src/main/kotlin/ui/components/ItemNowPlaying.kt b/app-desktop/src/main/kotlin/ui/components/ItemNowPlaying.kt
@@ -1,34 +1,28 @@
 package ui.components
 
 import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.onPointerEvent
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.vickikbt.shared.domain.models.Movie
-import utils.AsyncImage
+import io.kamel.image.KamelImage
+import io.kamel.image.lazyPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import utils.loadImage
-import utils.loadImageBitmap
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -41,24 +35,28 @@ fun ItemNowPlayingMovies(
 
     val boxWidth by animateDpAsState(targetValue = if (isHovered) 400.dp else 200.dp)
 
-    val imageUrl = (if (isHovered) movie.backdropPath else movie.posterPath)?.loadImage()
+    val imageUrl = movie.posterPath?.loadImage()
+
+    val painterResource = lazyPainterResource(imageUrl ?: "") {
+        coroutineContext = Job() + Dispatchers.IO
+    }
 
     Box(
         modifier = modifier.width(boxWidth)
             .clickable { onItemClick(movie) }
             .onPointerEvent(PointerEventType.Enter) { isHovered = true }
             .onPointerEvent(PointerEventType.Exit) { isHovered = false },
     ) {
-        AsyncImage(
+        KamelImage(
             modifier = Modifier.fillMaxSize(),
-            load = { loadImageBitmap(imageUrl) },
-            painterFor = { remember { BitmapPainter(it) } },
+            resource = painterResource,
             contentDescription = "Movie Backdrop Poster",
-            contentScale = ContentScale.Crop
+            contentScale = ContentScale.Crop,
+            animationSpec = tween()
         )
 
         //region Movie Title
-        if (isHovered) {
+        /*if (isHovered) {
             Text(
                 modifier = Modifier.padding(horizontal = 8.dp, vertical = 16.dp)
                     .align(Alignment.BottomStart),
@@ -70,7 +68,7 @@ fun ItemNowPlayingMovies(
                 textAlign = TextAlign.Start,
                 color = MaterialTheme.colors.onSurface
             )
-        }
+        }*/
         //endregion
     }
 }
diff --git a/app-desktop/src/main/kotlin/ui/components/ItemPopularMovies.kt b/app-desktop/src/main/kotlin/ui/components/ItemPopularMovies.kt
@@ -1,5 +1,6 @@
 package ui.components
 
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -17,17 +18,18 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vickikbt.shared.domain.models.Movie
-import utils.AsyncImage
+import io.kamel.image.KamelImage
+import io.kamel.image.lazyPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import utils.loadImage
-import utils.loadImageBitmap
 
 @Composable
 fun ItemPopularMovies(
@@ -43,29 +45,26 @@ fun ItemPopularMovies(
 
     val imageUrl = movie.backdropPath?.loadImage()
 
-    // var cardAspectRatio by remember { mutableStateOf(1F) }
+    val painterResource = lazyPainterResource(imageUrl ?: "") {
+        coroutineContext = Job() + Dispatchers.IO
+    }
 
     Card(
         modifier = modifier
             .width(480.dp)
             .height(320.dp)
-            .clickable { onClickItem(movie) }
-        /*.onPointerEvent(PointerEventType.Enter) {
-            cardAspectRatio = 1.5f
-        }.onPointerEvent(PointerEventType.Exit) {
-            cardAspectRatio = 1f
-        }*/,
+            .clickable { onClickItem(movie) },
         elevation = 8.dp,
         shape = RoundedCornerShape(4.dp)
     ) {
         Box(modifier = Modifier.fillMaxSize()) {
             //region Movie Cover
-            AsyncImage(
+            KamelImage(
                 modifier = Modifier.fillMaxSize(),
-                load = { loadImageBitmap(imageUrl) },
-                painterFor = { remember { BitmapPainter(it) } },
+                resource = painterResource,
                 contentDescription = "Movie backdrop poster",
-                contentScale = ContentScale.Crop
+                contentScale = ContentScale.Crop,
+                animationSpec = tween()
             )
             //endregion
 

diff --git a/app-desktop/src/main/kotlin/ui/components/ItemSimilarMovies.kt b/app-desktop/src/main/kotlin/ui/components/ItemSimilarMovies.kt
@@ -9,34 +9,37 @@ import androidx.compose.material.Card
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vickikbt.shared.domain.models.Movie
-import utils.AsyncImage
+import io.kamel.image.KamelImage
+import io.kamel.image.lazyPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import utils.loadImage
-import utils.loadImageBitmap
 
 @Composable
 fun ItemSimilarMovies(movie: Movie) {
     val imageUrl = movie.posterPath?.loadImage()
 
+    val painterResource = lazyPainterResource(imageUrl ?: "") {
+        coroutineContext = Job() + Dispatchers.IO
+    }
+
     Column {
         Card(
             modifier = Modifier
                 .width(150.dp)
                 .height(220.dp),
             shape = RoundedCornerShape(4.dp)
         ) {
-            AsyncImage(
+            KamelImage(
                 modifier = Modifier.fillMaxSize(),
-                load = { loadImageBitmap(imageUrl) },
-                painterFor = { remember { BitmapPainter(it) } },
+                resource = painterResource,
                 contentDescription = "Movie poster",
                 contentScale = ContentScale.Crop
             )

diff --git a/app-desktop/src/main/kotlin/ui/components/ItemTrendingMovies.kt b/app-desktop/src/main/kotlin/ui/components/ItemTrendingMovies.kt
@@ -1,5 +1,6 @@
 package ui.components
 
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -12,19 +13,19 @@ import androidx.compose.material.Card
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vickikbt.shared.domain.models.Movie
-import utils.AsyncImage
+import io.kamel.image.KamelImage
+import io.kamel.image.lazyPainterResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import utils.loadImage
-import utils.loadImageBitmap
 
 @Composable
 fun ItemTrendingMovies(
@@ -34,6 +35,10 @@ fun ItemTrendingMovies(
 ) {
     val imageUrl = movie.posterPath?.loadImage()
 
+    val painterResource = lazyPainterResource(imageUrl ?: "") {
+        coroutineContext = Job() + Dispatchers.IO
+    }
+
     Column {
         Card(
             modifier = modifier
@@ -43,12 +48,12 @@ fun ItemTrendingMovies(
             elevation = 8.dp,
             shape = RoundedCornerShape(4.dp)
         ) {
-            AsyncImage(
+            KamelImage(
                 modifier = Modifier.fillMaxSize(),
-                load = { loadImageBitmap(imageUrl) },
-                painterFor = { remember { BitmapPainter(it) } },
+                resource = painterResource,
                 contentDescription = "Movie poster",
-                contentScale = ContentScale.Crop
+                contentScale = ContentScale.Crop,
+                animationSpec = tween()
             )
         }