code clean / icons for screens

.github/workflows/build-gradle-project.yml

@@ -0,0 +1,75 @@
+name: Build Gradle project
+# on settings
+on:
+  push:
+    branches:
+      - main
+# jobs
+jobs:
+  build-gradle-project:
+    runs-on: ubuntu-latest
+#permissions
+    permissions:
+      contents: write
+      deployments: write
+      pages: write
+# job steps
+    steps:
+      - name: Checkout project sources
+        id: checkout_project
+        uses: actions/checkout@v3
+# setup jdk 17
+      - name: Set up JDK 17
+        id: setup_java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+# setup gradle
+      - name: Setup Gradle
+        id: setup_gradle
+        uses: gradle/gradle-build-action@v2
+# be sure it is executable
+      - name: Grant execute permission for gradlew
+        id: grant_gradle
+        run: chmod +x gradlew
+# generate version number to env
+      - name: Prepare Version Number
+        id: prepare_version
+        run: |
+          export GRADLE_PATH="./config/version.properties";
+          export GRADLE_FIELD_VMAJ="majorVersion"
+          export GRADLE_FIELD_VMIN="minorVersion"
+          export GRADLE_FIELD_VPAT="patchVersion"
+          export VERSION_VMAJ_TMP=$(grep $GRADLE_FIELD_VMAJ $GRADLE_PATH | cat $2)
+          export VERSION_VMIN_TMP=$(grep $GRADLE_FIELD_VMIN $GRADLE_PATH | cat $2)
+          export VERSION_VMPAT_TMP=$(grep $GRADLE_FIELD_VPAT $GRADLE_PATH | cat $2)
+          export VERSION_MAJOR=$(echo $VERSION_VMAJ_TMP | sed -e 's/^majorVersion=//'  -e 's/"$//')
+          export VERSION_MINOR=$(echo $VERSION_VMIN_TMP | sed -e 's/^minorVersion=//'  -e 's/"$//')
+          export VERSION_PATCH=$(echo $VERSION_VMPAT_TMP | sed -e 's/^patchVersion=//'  -e 's/"$//')
+          export APP_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+          echo "Release Version : $APP_VERSION"
+          echo "GITHUB_APP_VERSION_NAME=$(echo $APP_VERSION)" >> $GITHUB_ENV
+# build apk for release
+      - name: Build Release APK
+        id: build_release_apk
+        run: ./gradlew assembleRelease
+# publish github release
+      - name: Create Release
+        id: release
+        uses: ncipollo/release-action@v1
+        with:
+          name: Release v ${{ env.GITHUB_APP_VERSION_NAME }}
+          allowUpdates: true
+          token: ${{ secrets.TOKEN }}
+          tag: release-${{ env.GITHUB_APP_VERSION_NAME }}
+          artifacts: './app/build/outputs/apk/release/app-release.apk, ./release-notes.txt'
+# update wiki pages
+      - name: Update wiki pages
+        id: update_wiki_pages
+        uses: OrlovM/Wiki-Action@v1
+        with:
+          path: 'wiki'
+          token: ${{ secrets.TOKEN }}
+# done

.gitignore

@@ -0,0 +1,33 @@
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Sun Jun 25 22:54:27 CEST 2023
+gradle.version=8.0

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/.name

@@ -0,0 +1 @@
+TvApp

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>

.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

.idea/kotlinc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

app/build.gradle.kts

@@ -50,7 +50,7 @@ android {
     }
 
     defaultConfig {
-        applicationId = "org.mjdev.tvapp.tvcomposeintroduction"
+        applicationId = "org.mjdev.tvapp"
 
         minSdk = 21
         targetSdk = 33
@@ -127,7 +127,7 @@ dependencies {
     implementation(kotlin("reflect", "1.8.21"))
     // compose base libs
     implementation(
-        platform("androidx.compose:compose-bom:2023.06.00")
+        platform("androidx.compose:compose-bom:2023.06.01")
     )
     implementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.activity:activity-compose:1.7.2")

app/src/main/kotlin/org/mjdev/tvapp/activity/MainActivity.kt

@@ -15,11 +15,13 @@ import org.mjdev.tvapp.ui.screens.AboutScreen
 import org.mjdev.tvapp.ui.screens.DetailScreen
 import org.mjdev.tvapp.ui.screens.MainScreen
 import org.mjdev.tvapp.ui.screens.PlayerScreen
+import org.mjdev.tvapp.ui.screens.SplashScreen
 import org.mjdev.tvapp.ui.screens.SubscriptionScreen
 
 @AndroidEntryPoint
 class MainActivity : ComposableActivity ({
 
+    screen(route = SplashScreen()) // todo start screen
     screen(route = MainScreen(), isHomeScreen = true)
     screen(route = DetailScreen())
     screen(route = PlayerScreen())

app/src/main/kotlin/org/mjdev/tvapp/api/MovieAPI.kt

@@ -8,8 +8,8 @@
 
 package org.mjdev.tvapp.api
 
-import org.mjdev.tvapp.base.helpers.Option
-import org.mjdev.tvapp.base.helpers.Option.Companion.unwrapOr
+import org.mjdev.tvapp.base.helpers.Result
+import org.mjdev.tvapp.base.helpers.Result.Companion.unwrapOr
 import org.mjdev.tvapp.data.Category
 import org.mjdev.tvapp.data.Movie
 import org.mjdev.tvapp.mock.MovieList
@@ -17,8 +17,8 @@ import org.mjdev.tvapp.mock.MovieList
 @Suppress("RedundantSuspendModifier")
 class MovieAPI {
 
-    suspend fun loadCategoryList(): Option<List<Category>> {
-        return Option.Some(MovieList.categories.map { name ->
+    suspend fun loadCategoryList(): Result<List<Category>> {
+        return Result.Success(MovieList.categories.map { name ->
             Category(
                 name = name,
                 movieList = getMovieListByCategory(name).unwrapOr(emptyList())
@@ -26,22 +26,22 @@ class MovieAPI {
         })
     }
 
-    suspend fun loadFeaturedMovieList(): Option<List<Movie>> {
-        return Option.Some(MovieList.featured)
+    suspend fun loadFeaturedMovieList(): Result<List<Movie>> {
+        return Result.Success(MovieList.featured)
     }
 
     suspend fun getMovieListByCategory(
         category: String
-    ): Option<List<Movie>> {
-        return Option.Some(MovieList.getByCategory(category))
+    ): Result<List<Movie>> {
+        return Result.Success(MovieList.getByCategory(category))
     }
 
     suspend fun findMovieById(
         id: Long
-    ): Option<Movie> {
+    ): Result<Movie> {
         return MovieList.findById(id).let { movie ->
-            if (movie == null) Option.None
-            else Option.Some(movie)
+            if (movie == null) Result.Empty
+            else Result.Success(movie)
         }
     }
 

app/src/main/kotlin/org/mjdev/tvapp/base/helpers/Option.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Milan Jurkulák 2023.
- * Contact:
- * e: mimoccc@gmail.com
- * e: mj@mjdev.org
- * w: https://mjdev.org
- */
-
-package org.mjdev.tvapp.base.helpers
-
-sealed class Option<out T> {
-
-    object None : Option<Nothing>()
-
-    data class Some<T>(val value: T) : Option<T>()
-
-    companion object {
-
-        fun <T> Option<T>.unwrapOr(defaultValue: T): T {
-            return (this as? Some)?.value ?: defaultValue
-        }
-
-    }
-
-}

app/src/main/kotlin/org/mjdev/tvapp/base/helpers/Result.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Milan Jurkulák 2023.
+ * Contact:
+ * e: mimoccc@gmail.com
+ * e: mj@mjdev.org
+ * w: https://mjdev.org
+ */
+
+package org.mjdev.tvapp.base.helpers
+
+sealed class Result<out T> {
+
+    object Empty : Result<Nothing>()
+
+    data class Success<T>(val value: T) : Result<T>()
+
+    companion object {
+
+        fun <T> Result<T>.unwrapOr(defaultValue: T): T {
+            return (this as? Success)?.value ?: defaultValue
+        }
+
+    }
+
+}

app/src/main/kotlin/org/mjdev/tvapp/base/helpers/StateContextWrapper.kt

@@ -19,6 +19,7 @@ import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryController
 import androidx.savedstate.SavedStateRegistryOwner
 
+// todo
 class StateContextWrapper(
     baseContext: Context
 ) : ContextWrapper(baseContext) , LifecycleOwner, ViewModelStoreOwner, SavedStateRegistryOwner {

app/src/main/kotlin/org/mjdev/tvapp/base/navigation/Screen.kt

@@ -102,7 +102,7 @@ open class Screen {
 
     /**
      * Compose function for compose screen.
-     * This should be only a method overriden in super classes.
+     * This should be only a method overridden in super classes.
      *
      * @param navController Nav controller
      * @param backStackEntry Back stack entry

app/src/main/kotlin/org/mjdev/tvapp/base/network/ConectivityCallback.kt → app/src/main/kotlin/org/mjdev/tvapp/base/network/ConnectivityCallback.kt

@@ -11,7 +11,7 @@ package org.mjdev.tvapp.base.network
 import android.net.ConnectivityManager
 import android.net.Network
 
-class ConectivityCallback(
+class ConnectivityCallback(
     val trySend: (data: NetworkStatus) -> Unit
 ) : ConnectivityManager.NetworkCallback() {
 

app/src/main/kotlin/org/mjdev/tvapp/base/network/NetworkConnectivityServiceImpl.kt

@@ -27,7 +27,7 @@ class NetworkConnectivityServiceImpl constructor(
         .getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
     override val networkStatus: Flow<NetworkStatus> = callbackFlow {
-        val connectivityCallback = ConectivityCallback { status ->
+        val connectivityCallback = ConnectivityCallback { status ->
             trySend(status)
         }
         val request = NetworkRequest.Builder()

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/ListWithPreview.kt

@@ -1,83 +1,83 @@
-/*
- * Copyright (c) Milan Jurkulák 2023.
- * Contact:
- * e: mimoccc@gmail.com
- * e: mj@mjdev.org
- * w: https://mjdev.org
- */
-
-package org.mjdev.tvapp.base.ui.components.complex
-
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.width
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
-import androidx.tv.material3.ImmersiveList
-import org.mjdev.tvapp.base.interfaces.ItemWithImage
-import org.mjdev.tvapp.base.ui.components.image.ImageAny
-import timber.log.Timber
-
-// todo
-@OptIn(ExperimentalTvMaterial3Api::class)
-@Preview
-@Composable
-fun <T> ListWithPreview(
-    modifier: Modifier = Modifier,
-    items: List<T> = listOf(),
-    immersiveListHeight: Dp = 300.dp,
-    cardSpacing: Dp = 10.dp,
-    cardWidth: Dp = 200.dp,
-    cardHeight: Dp = 150.dp
-) {
-    val itemBackground: (index: Int) -> Any? = { index ->
-        (if (items.size > index)
-            (items[index] as? ItemWithImage?)?.backgroundImageUrl
-        else null) ?: Color.Transparent
-    }
-    ImmersiveList(
-        modifier = modifier
-            .height(immersiveListHeight + cardHeight / 2)
-            .fillMaxWidth(),
-        background = { index, _ ->
-            ImageAny(
-                modifier = Modifier
-                    .height(immersiveListHeight)
-                    .fillMaxWidth(),
-                src = itemBackground.invoke(index)
-            )
-        }
-    ) {
-        Row(horizontalArrangement = Arrangement.spacedBy(cardSpacing)) {
-            items.forEachIndexed { index, item ->
-                val isFocused = remember { mutableStateOf(false) }
-                ImageAny(
-                    modifier = Modifier
-                        .width(cardWidth)
-                        .height(cardHeight)
-                        .border(5.dp, Color.White.copy(alpha = if (isFocused.value) 1f else 0.3f))
-                        .onFocusChanged { focusState ->
-                            isFocused.value = focusState.isFocused
-                        }
-                        .immersiveListItem(index)
-                        .clickable {
-                            Timber.tag("ImmersiveList: Item $index was clicked")
-                        },
-                    src = itemBackground.invoke(index)
-                )
-            }
-        }
-    }
-}
+///*
+// * Copyright (c) Milan Jurkulák 2023.
+// * Contact:
+// * e: mimoccc@gmail.com
+// * e: mj@mjdev.org
+// * w: https://mjdev.org
+// */
+//
+//package org.mjdev.tvapp.base.ui.components.complex
+//
+//import androidx.compose.foundation.border
+//import androidx.compose.foundation.clickable
+//import androidx.compose.foundation.layout.Arrangement
+//import androidx.compose.foundation.layout.Row
+//import androidx.compose.foundation.layout.fillMaxWidth
+//import androidx.compose.foundation.layout.height
+//import androidx.compose.foundation.layout.width
+//import androidx.compose.runtime.Composable
+//import androidx.compose.runtime.mutableStateOf
+//import androidx.compose.runtime.remember
+//import androidx.compose.ui.Modifier
+//import androidx.compose.ui.focus.onFocusChanged
+//import androidx.compose.ui.graphics.Color
+//import androidx.compose.ui.tooling.preview.Preview
+//import androidx.compose.ui.unit.Dp
+//import androidx.compose.ui.unit.dp
+//import androidx.tv.material3.ExperimentalTvMaterial3Api
+//import androidx.tv.material3.ImmersiveList
+//import org.mjdev.tvapp.base.interfaces.ItemWithImage
+//import org.mjdev.tvapp.base.ui.components.image.ImageAny
+//import timber.log.Timber
+//
+//// todo
+//@OptIn(ExperimentalTvMaterial3Api::class)
+//@Preview
+//@Composable
+//fun <T> ListWithPreview(
+//    modifier: Modifier = Modifier,
+//    items: List<T> = listOf(),
+//    immersiveListHeight: Dp = 300.dp,
+//    cardSpacing: Dp = 10.dp,
+//    cardWidth: Dp = 200.dp,
+//    cardHeight: Dp = 150.dp
+//) {
+//    val itemBackground: (index: Int) -> Any? = { index ->
+//        (if (items.size > index)
+//            (items[index] as? ItemWithImage?)?.backgroundImageUrl
+//        else null) ?: Color.Transparent
+//    }
+//    ImmersiveList(
+//        modifier = modifier
+//            .height(immersiveListHeight + cardHeight / 2)
+//            .fillMaxWidth(),
+//        background = { index, _ ->
+//            ImageAny(
+//                modifier = Modifier
+//                    .height(immersiveListHeight)
+//                    .fillMaxWidth(),
+//                src = itemBackground.invoke(index)
+//            )
+//        }
+//    ) {
+//        Row(horizontalArrangement = Arrangement.spacedBy(cardSpacing)) {
+//            items.forEachIndexed { index, item ->
+//                val isFocused = remember { mutableStateOf(false) }
+//                ImageAny(
+//                    modifier = Modifier
+//                        .width(cardWidth)
+//                        .height(cardHeight)
+//                        .border(5.dp, Color.White.copy(alpha = if (isFocused.value) 1f else 0.3f))
+//                        .onFocusChanged { focusState ->
+//                            isFocused.value = focusState.isFocused
+//                        }
+//                        .immersiveListItem(index)
+//                        .clickable {
+//                            Timber.tag("ImmersiveList: Item $index was clicked")
+//                        },
+//                    src = itemBackground.invoke(index)
+//                )
+//            }
+//        }
+//    }
+//}

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/ScreenView.kt

@@ -28,7 +28,7 @@ import org.mjdev.tvapp.base.state.ActivityViewState
 import org.mjdev.tvapp.base.state.ActivityViewState.Companion.rememberActivityViewState
 import org.mjdev.tvapp.base.ui.components.navigation.Navigation
 
-@Suppress("TrailingComma", "UNUSED_ANONYMOUS_PARAMETER")
+@Suppress("TrailingComma", "UNUSED_ANONYMOUS_PARAMETER", "unused")
 @TvPreview
 @Composable
 fun ScreenView(

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/complex/Title.kt

@@ -27,7 +27,6 @@ import org.mjdev.tvapp.R
 import org.mjdev.tvapp.base.annotations.TvPreview
 import org.mjdev.tvapp.base.ui.components.text.TextAny
 
-@Suppress("LocalVariableName")
 @TvPreview
 @Composable
 fun Title(

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/image/ImageAny.kt

@@ -24,8 +24,10 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.content.ContextCompat
 import coil.compose.AsyncImage
 import org.mjdev.tvapp.R
 import org.mjdev.tvapp.base.extensions.DrawableExt.asImageBitmap
@@ -48,10 +50,19 @@ fun ImageAny(
     modifier = modifier
 ) {
 
+    val width = constraints.maxWidth
+    val height = constraints.maxHeight
+
+    val context = LocalContext.current
+
+    val placeholderDrawable : Drawable = (placeholder?.let { ph ->
+        ContextCompat.getDrawable(context, ph)
+    } ?: ColorDrawable(0))
+
     when (src) {
 
         null -> Image(
-            ColorDrawable(0).asImageBitmap(),
+            placeholderDrawable.asImageBitmap(width, height),
             contentDescription,
             modifier,
             alignment,

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/Navigation.kt

@@ -84,7 +84,6 @@ fun Navigation(
 
                         NavigationRow(
                             id = SETTINGS_ITEM,
-                            focused = (focused.value == SETTINGS_ITEM),
                             drawerValue = state,
                             icon = Icons.Outlined.Settings,
                             text = "Settings",
@@ -110,7 +109,6 @@ fun Navigation(
 
                         NavigationRow(
                             id = SEARCH_ITEM,
-                            focused = (focused.value == SEARCH_ITEM),
                             drawerValue = state,
                             icon = Icons.Outlined.Search,
                             text = "Search",
@@ -136,7 +134,6 @@ fun Navigation(
                     items.forEachIndexed { idx, menuItem ->
                         NavigationRow(
                             id = idx,
-                            focused = (focused.value == idx),
                             drawerValue = state,
                             text = menuItem.menuText,
                             icon = menuItem.menuIcon,

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/navigation/NavigationRow.kt

@@ -30,13 +30,11 @@ import org.mjdev.tvapp.base.ui.components.complex.FocusableBox
 import org.mjdev.tvapp.base.ui.components.icon.IconAny
 import org.mjdev.tvapp.base.ui.components.text.TextAny
 
-@Suppress("LocalVariableName")
 @Preview
 @OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun NavigationRow(
     id: Int = -1,
-    focused: Boolean = false,
     drawerValue: DrawerValue = DrawerValue.Open,
     text: Any? = "test",
     icon: Any? = Icons.Default.AccountCircle,

app/src/main/kotlin/org/mjdev/tvapp/base/ui/components/text/CircleText.kt

@@ -43,7 +43,7 @@ fun CircleText(
     borderSize: Dp = 2.dp,
     text: String = "0",
     textColor: Color = Color.White,
-    textSize: TextUnit = 40.sp
+    textSize: TextUnit = 26.sp
 ) {
 
     Box(
@@ -78,7 +78,8 @@ fun CircleText(
             textAlign = TextAlign.Center,
             fontWeight = FontWeight.Bold,
             color = textColor,
-            text = text
+            text = text,
+            fontSize = textSize
         )
 
     }

app/src/main/kotlin/org/mjdev/tvapp/repository/MovieRepository.kt

@@ -15,7 +15,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.mjdev.tvapp.api.MovieAPI
-import org.mjdev.tvapp.base.helpers.Option.Companion.unwrapOr
+import org.mjdev.tvapp.base.helpers.Result.Companion.unwrapOr
 import org.mjdev.tvapp.data.Category
 import org.mjdev.tvapp.data.Movie
 import java.lang.Integer.max
@@ -39,7 +39,7 @@ class MovieRepository @Inject constructor(
     private val categoryListMutex = Mutex()
 
     override suspend fun getFeaturedMovieList(): List<Movie> {
-        val movieList = dataSource.loadFeaturedMovieList().unwrapOr(listOf<Movie>())
+        val movieList = dataSource.loadFeaturedMovieList().unwrapOr(listOf())
         updateCache(movieList)
         return movieList
     }
@@ -76,7 +76,7 @@ class MovieRepository @Inject constructor(
         if (force || !categoryMovieListMap.contains(category)) {
             updateCache(
                 category = category,
-                movieList = dataSource.getMovieListByCategory(category.name).unwrapOr(listOf<Movie>())
+                movieList = dataSource.getMovieListByCategory(category.name).unwrapOr(listOf())
             )
         }
     }

app/src/main/kotlin/org/mjdev/tvapp/ui/components/MyComposeView.kt

@@ -1,95 +1,97 @@
-/*
- * Copyright (c) Milan Jurkulák 2023.
- * Contact:
- * e: mimoccc@gmail.com
- * e: mj@mjdev.org
- * w: https://mjdev.org
- */
-
-package org.mjdev.tvapp.ui.components;
-
-import android.content.Context
-import android.graphics.PixelFormat
-import android.view.Gravity
-import android.view.View
-import android.view.WindowManager
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.AbstractComposeView
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewModelStore
-import androidx.lifecycle.ViewModelStoreOwner
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.lifecycle.setViewTreeViewModelStoreOwner
-import androidx.savedstate.SavedStateRegistry
-import androidx.savedstate.SavedStateRegistryController
-import androidx.savedstate.SavedStateRegistryOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
-
-class MyComposeView(val composeView: View) : AbstractComposeView(
-    composeView.context
-), LifecycleOwner, ViewModelStoreOwner, SavedStateRegistryOwner {
-
-    private val savedStateRegistryController by lazy {
-        SavedStateRegistryController.create(this)
-    }
-
-    override val lifecycle: Lifecycle by lazy {
-        LifecycleRegistry(this)
-    }
-
-    override val viewModelStore: ViewModelStore by lazy {
-        ViewModelStore()
-    }
-
-    override val savedStateRegistry: SavedStateRegistry
-        get() = savedStateRegistryController.savedStateRegistry
-
-
-    private var viewShowing:Boolean = false
-
-    private fun handleLifecycleEvent(event: Lifecycle.Event) =
-        (lifecycle as LifecycleRegistry).handleLifecycleEvent(event)
-
-
-    private val windowManager by lazy {
-        composeView.context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-    }
-
-    private var params: WindowManager.LayoutParams = WindowManager.LayoutParams()
-        .apply {
-            gravity = Gravity.TOP
-            type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
-            token = composeView.applicationWindowToken
-            width = WindowManager.LayoutParams.WRAP_CONTENT
-            height = WindowManager.LayoutParams.WRAP_CONTENT
-            format = PixelFormat.TRANSLUCENT
-            flags = flags or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-        }
-
-    init {
-        composeView.setViewTreeLifecycleOwner(this)
-        composeView.setViewTreeViewModelStoreOwner(this)
-        composeView.setViewTreeSavedStateRegistryOwner(this)
-    }
-
-    @Composable
-    override fun Content() {
-        // Some Compose Drawing Function
-    }
-
-    fun show() {
-        if (viewShowing) dismiss()
-        windowManager.addView(this, params)
-        viewShowing = true
-    }
-
-    fun dismiss() {
-        if (!viewShowing) return
-        disposeComposition()
-        windowManager.removeViewImmediate(this)
-        viewShowing = false
-    }
-
-}
+///*
+// * Copyright (c) Milan Jurkulák 2023.
+// * Contact:
+// * e: mimoccc@gmail.com
+// * e: mj@mjdev.org
+// * w: https://mjdev.org
+// */
+//
+//package org.mjdev.tvapp.ui.components
+//
+//import android.content.Context
+//import android.graphics.PixelFormat
+//import android.view.Gravity
+//import android.view.View
+//import android.view.WindowManager
+//import androidx.compose.runtime.Composable
+//import androidx.compose.ui.platform.AbstractComposeView
+//import androidx.lifecycle.Lifecycle
+//import androidx.lifecycle.LifecycleOwner
+//import androidx.lifecycle.LifecycleRegistry
+//import androidx.lifecycle.ViewModelStore
+//import androidx.lifecycle.ViewModelStoreOwner
+//import androidx.lifecycle.setViewTreeLifecycleOwner
+//import androidx.lifecycle.setViewTreeViewModelStoreOwner
+//import androidx.savedstate.SavedStateRegistry
+//import androidx.savedstate.SavedStateRegistryController
+//import androidx.savedstate.SavedStateRegistryOwner
+//import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+//
+//class MyComposeView(
+//    val composeView: View
+//) : AbstractComposeView(
+//    composeView.context
+//), LifecycleOwner, ViewModelStoreOwner, SavedStateRegistryOwner {
+//
+//    private val savedStateRegistryController by lazy {
+//        SavedStateRegistryController.create(this)
+//    }
+//
+//    override val lifecycle: Lifecycle by lazy {
+//        LifecycleRegistry(this)
+//    }
+//
+//    override val viewModelStore: ViewModelStore by lazy {
+//        ViewModelStore()
+//    }
+//
+//    override val savedStateRegistry: SavedStateRegistry
+//        get() = savedStateRegistryController.savedStateRegistry
+//
+//
+//    private var viewShowing: Boolean = false
+//
+//    private fun handleLifecycleEvent(event: Lifecycle.Event) =
+//        (lifecycle as LifecycleRegistry).handleLifecycleEvent(event)
+//
+//
+//    private val windowManager by lazy {
+//        composeView.context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+//    }
+//
+//    private var params: WindowManager.LayoutParams = WindowManager.LayoutParams()
+//        .apply {
+//            gravity = Gravity.TOP
+//            type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+//            token = composeView.applicationWindowToken
+//            width = WindowManager.LayoutParams.WRAP_CONTENT
+//            height = WindowManager.LayoutParams.WRAP_CONTENT
+//            format = PixelFormat.TRANSLUCENT
+//            flags = flags or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+//        }
+//
+//    init {
+//        composeView.setViewTreeLifecycleOwner(this)
+//        composeView.setViewTreeViewModelStoreOwner(this)
+//        composeView.setViewTreeSavedStateRegistryOwner(this)
+//    }
+//
+//    @Composable
+//    override fun Content() {
+//        // Some Compose Drawing Function
+//    }
+//
+//    fun show() {
+//        if (viewShowing) dismiss()
+//        windowManager.addView(this, params)
+//        viewShowing = true
+//    }
+//
+//    fun dismiss() {
+//        if (!viewShowing) return
+//        disposeComposition()
+//        windowManager.removeViewImmediate(this)
+//        viewShowing = false
+//    }
+//
+//}

app/src/main/kotlin/org/mjdev/tvapp/ui/screens/DetailScreen.kt

@@ -9,7 +9,7 @@
 package org.mjdev.tvapp.ui.screens
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Info
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
@@ -44,7 +44,7 @@ class DetailScreen : Screen() {
 
     override val menuTitleResId: Int = -1
 
-    override val menuIcon: ImageVector get() = Icons.Filled.ArrowBack
+    override val menuIcon: ImageVector get() = Icons.Filled.Info
 
     @TvPreview
     @Composable

app/src/main/kotlin/org/mjdev/tvapp/ui/screens/PlayerScreen.kt

@@ -62,13 +62,11 @@ class PlayerScreen : Screen() {
 
         val viewModel = appViewModel<DetailViewModel>()
         val movieId: Long? = remember { args[movieId] as Long? }
-        val movieState = remember {
-            viewModel?.detailsLoadingState(movieId)
-        }?.collectAsState()
+        val movieState = remember { viewModel.detailsLoadingState(movieId) }.collectAsState()
 
-        fun postError(error: String) = viewModel?.postError(error.asException())
+        fun postError(error: String) = viewModel.postError(error.asException())
 
-        when (movieState?.value) {
+        when (movieState.value) {
             is DetailsLoadingState.Ready -> MediaPlayer(
                 modifier = Modifier.fillMaxSize(),
                 movie = (movieState.value as DetailsLoadingState.Ready).movie

app/src/main/kotlin/org/mjdev/tvapp/ui/screens/SplashScreen.kt

@@ -8,8 +8,37 @@
 
 package org.mjdev.tvapp.ui.screens
 
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavHostController
+import org.mjdev.tvapp.R
+import org.mjdev.tvapp.base.annotations.TvPreview
+import org.mjdev.tvapp.base.navigation.MenuItem
 import org.mjdev.tvapp.base.navigation.Screen
 
 class SplashScreen : Screen() {
 
+    override val titleResId = R.string.app_name
+
+    override val menuTitleResId: Int = R.string.app_name
+
+    override val menuIcon: ImageVector get() = Icons.Filled.Home
+
+    @TvPreview
+    @Composable
+    override fun Compose() = super.Compose()
+
+    @Composable
+    override fun Compose(
+        navController: NavHostController?,
+        backStackEntry: NavBackStackEntry?,
+        menuItems: List<MenuItem>,
+        args: Map<String, Any?>
+    ) {
+
+    }
+
 }

app/src/main/kotlin/org/mjdev/tvapp/ui/screens/SubscriptionScreen.kt

@@ -9,7 +9,7 @@
 package org.mjdev.tvapp.ui.screens
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.ShoppingCart
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.NavBackStackEntry
@@ -25,7 +25,7 @@ class SubscriptionScreen : Screen() {
 
     override val menuTitleResId: Int = R.string.title_subscription
 
-    override val menuIcon: ImageVector get() = Icons.Filled.ArrowBack
+    override val menuIcon: ImageVector get() = Icons.Filled.ShoppingCart
 
     @TvPreview
     @Composable

buildSrc/build/kotlin/buildSrcjar-classes.txt

@@ -0,0 +1 @@
+/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/extensions/DependencyHandlerKt.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/helper/CustomEventLogger.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/plugin/MainAppPlugin$Companion.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/plugin/MainAppPlugin$apply$1.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/plugin/MainAppPlugin$apply$3.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/plugin/MainAppPlugin$apply$4.class:/home/mimo/AndroidStudioProjects/tvapp/buildSrc/build/classes/kotlin/main/org/mjdev/gradle/plugin/MainAppPlugin.class