Merge branch 'main' into develop/customize-home

app/src/main/java/com/github/damontecres/wholphin/ui/components/RecommendedContent.kt

@@ -37,9 +37,10 @@ import com.github.damontecres.wholphin.ui.nav.Destination
 import com.github.damontecres.wholphin.util.ApiRequestPager
 import com.github.damontecres.wholphin.util.HomeRowLoadingState
 import com.github.damontecres.wholphin.util.LoadingState
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
 import org.jellyfin.sdk.model.api.MediaType
 import java.util.UUID
 
@@ -99,13 +100,13 @@ abstract class RecommendedViewModel(
     abstract fun update(
         @StringRes title: Int,
         row: HomeRowLoadingState,
-    )
+    ): HomeRowLoadingState
 
     fun update(
         @StringRes title: Int,
         block: suspend () -> List<BaseItem>,
-    ) {
+    ): Deferred<HomeRowLoadingState> =
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.async(Dispatchers.IO) {
             val titleStr = context.getString(title)
             val row =
                 try {
@@ -116,7 +117,6 @@ abstract class RecommendedViewModel(
             update(title, row)
         }
 }
-}
 
 @Composable
 fun RecommendedContent(

app/src/main/java/com/github/damontecres/wholphin/ui/components/RecommendedMovie.kt

@@ -32,6 +32,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.firstOrNull
@@ -123,6 +124,8 @@ class RecommendedMovieViewModel
                     }
                 }
 
+                val jobs = mutableListOf<Deferred<HomeRowLoadingState>>()
+
                 update(R.string.recently_released) {
                     val request =
                         GetItemsRequest(
@@ -138,7 +141,7 @@ class RecommendedMovieViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, false)
-                }
+                }.also(jobs::add)
 
                 update(R.string.recently_added) {
                     val request =
@@ -155,7 +158,7 @@ class RecommendedMovieViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, false)
-                }
+                }.also(jobs::add)
 
                 update(R.string.top_unwatched) {
                     val request =
@@ -173,7 +176,7 @@ class RecommendedMovieViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, false)
-                }
+                }.also(jobs::add)
 
                 viewModelScope.launch(Dispatchers.IO) {
                     try {
@@ -216,19 +219,29 @@ class RecommendedMovieViewModel
                     }
                 }
 
+                // If the continue watching row is empty, then wait until the first successful row
+                // is loaded before telling the UI that the page is loaded
                 if (loading.value == LoadingState.Loading || loading.value == LoadingState.Pending) {
+                    for (i in 0..<jobs.size) {
+                        val result = jobs[i].await()
+                        if (result.completed) {
+                            Timber.v("First success")
                             loading.setValueOnMain(LoadingState.Success)
                         }
+                        break
+                    }
+                }
             }
         }
 
         override fun update(
             @StringRes title: Int,
             row: HomeRowLoadingState,
-        ) {
+        ): HomeRowLoadingState {
             rows.update { current ->
                 current.toMutableList().apply { set(rowTitles[title]!!, row) }
             }
+            return row
         }
 
         companion object {

app/src/main/java/com/github/damontecres/wholphin/ui/components/RecommendedTvShow.kt

@@ -33,6 +33,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -170,6 +171,8 @@ class RecommendedTvShowViewModel
                     }
                 }
 
+                val jobs = mutableListOf<Deferred<HomeRowLoadingState>>()
+
                 update(R.string.recently_released) {
                     val request =
                         GetItemsRequest(
@@ -185,7 +188,7 @@ class RecommendedTvShowViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, true)
-                }
+                }.also(jobs::add)
 
                 update(R.string.recently_added) {
                     val request =
@@ -202,7 +205,7 @@ class RecommendedTvShowViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, true)
-                }
+                }.also(jobs::add)
 
                 update(R.string.top_unwatched) {
                     val request =
@@ -220,7 +223,7 @@ class RecommendedTvShowViewModel
                             enableTotalRecordCount = false,
                         )
                     GetItemsRequestHandler.execute(api, request).toBaseItems(api, true)
-                }
+                }.also(jobs::add)
 
                 viewModelScope.launch(Dispatchers.IO) {
                     try {
@@ -264,18 +267,26 @@ class RecommendedTvShowViewModel
                 }
 
                 if (loading.value == LoadingState.Loading || loading.value == LoadingState.Pending) {
+                    for (i in 0..<jobs.size) {
+                        val result = jobs[i].await()
+                        if (result is HomeRowLoadingState.Success) {
+                            Timber.v("First success")
                             loading.setValueOnMain(LoadingState.Success)
                         }
+                        break
+                    }
+                }
             }
         }
 
         override fun update(
             @StringRes title: Int,
             row: HomeRowLoadingState,
-        ) {
+        ): HomeRowLoadingState {
             rows.update { current ->
                 current.toMutableList().apply { set(rowTitles[title]!!, row) }
             }
+            return row
         }
 
         companion object {

app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrDiscoverPage.kt

@@ -1,6 +1,8 @@
 package com.github.damontecres.wholphin.ui.discover
 
 import android.content.Context
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -11,6 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -23,6 +26,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -47,6 +51,7 @@ import com.github.damontecres.wholphin.ui.listToDotString
 import com.github.damontecres.wholphin.ui.main.HomePageHeader
 import com.github.damontecres.wholphin.ui.rememberPosition
 import com.github.damontecres.wholphin.ui.tryRequestFocus
+import com.github.damontecres.wholphin.ui.util.ScrollToTopBringIntoViewSpec
 import com.github.damontecres.wholphin.util.DataLoadingState
 import com.google.common.cache.CacheBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -186,6 +191,7 @@ data class DiscoverState(
     val upcomingTv: DiscoverRowData = DiscoverRowData.EMPTY,
 )
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun SeerrDiscoverPage(
     preferences: UserPreferences,
@@ -249,6 +255,16 @@ fun SeerrDiscoverPage(
                     .padding(top = 24.dp, bottom = 16.dp, start = 32.dp)
                     .fillMaxHeight(.25f),
         )
+        val density = LocalDensity.current
+        val spaceAbovePx =
+            with(density) {
+                // The size of the row titles & spacing
+                50.dp.toPx()
+            }
+        val defaultBringIntoViewSpec = LocalBringIntoViewSpec.current
+        CompositionLocalProvider(
+            LocalBringIntoViewSpec provides ScrollToTopBringIntoViewSpec(spaceAbovePx),
+        ) {
             LazyColumn(
                 verticalArrangement = Arrangement.spacedBy(8.dp),
                 contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 40.dp),
@@ -258,6 +274,7 @@ fun SeerrDiscoverPage(
                         .fillMaxSize(),
             ) {
                 itemsIndexed(rows) { rowIndex, row ->
+                    CompositionLocalProvider(LocalBringIntoViewSpec provides defaultBringIntoViewSpec) {
                         DiscoverRow(
                             row = row,
                             onClickItem = { index, item ->
@@ -275,6 +292,8 @@ fun SeerrDiscoverPage(
                 }
             }
         }
+    }
+}
 
 @Composable
 fun DiscoverRow(

app/src/main/java/com/github/damontecres/wholphin/ui/main/HomePage.kt

@@ -1,6 +1,8 @@
 package com.github.damontecres.wholphin.ui.main
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -18,6 +20,7 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -33,6 +36,7 @@ import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
@@ -72,6 +76,7 @@ import com.github.damontecres.wholphin.ui.playback.playable
 import com.github.damontecres.wholphin.ui.playback.scale
 import com.github.damontecres.wholphin.ui.rememberPosition
 import com.github.damontecres.wholphin.ui.tryRequestFocus
+import com.github.damontecres.wholphin.ui.util.ScrollToTopBringIntoViewSpec
 import com.github.damontecres.wholphin.util.HomeRowLoadingState
 import com.github.damontecres.wholphin.util.LoadingState
 import kotlinx.coroutines.delay
@@ -184,6 +189,7 @@ fun HomePage(
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun HomePageContent(
     homeRows: List<HomeRowLoadingState>,
@@ -245,6 +251,16 @@ fun HomePageContent(
                         .padding(top = 48.dp, bottom = 32.dp, start = 8.dp)
                         .fillMaxHeight(.33f),
             )
+            val density = LocalDensity.current
+            val spaceAbovePx =
+                with(density) {
+                    // The size of the row titles & spacing
+                    50.dp.toPx()
+                }
+            val defaultBringIntoViewSpec = LocalBringIntoViewSpec.current
+            CompositionLocalProvider(
+                LocalBringIntoViewSpec provides ScrollToTopBringIntoViewSpec(spaceAbovePx),
+            ) {
                 LazyColumn(
                     state = listState,
                     verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -257,6 +273,9 @@ fun HomePageContent(
                             .focusRestorer(),
                 ) {
                     itemsIndexed(homeRows) { rowIndex, row ->
+                        CompositionLocalProvider(
+                            LocalBringIntoViewSpec provides defaultBringIntoViewSpec,
+                        ) {
                             when (val r = row) {
                                 is HomeRowLoadingState.Loading,
                                 is HomeRowLoadingState.Pending,
@@ -287,7 +306,10 @@ fun HomePageContent(
                                                 onClickItem.invoke(RowColumn(rowIndex, index), item)
                                             },
                                             onLongClickItem = { index, item ->
-                                        onLongClickItem.invoke(RowColumn(rowIndex, index), item)
+                                                onLongClickItem.invoke(
+                                                    RowColumn(rowIndex, index),
+                                                    item,
+                                                )
                                             },
                                             modifier =
                                                 Modifier
@@ -307,7 +329,8 @@ fun HomePageContent(
                                                         cardModifier
                                                             .onFocusChanged {
                                                                 if (it.isFocused) {
-                                                            position = RowColumn(rowIndex, index)
+                                                                    position =
+                                                                        RowColumn(rowIndex, index)
                                                                 }
                                                                 if (it.isFocused && onFocusPosition != null) {
                                                                     val nonEmptyRowBefore =
@@ -326,7 +349,10 @@ fun HomePageContent(
                                                             }.onKeyEvent {
                                                                 if (isPlayKeyUp(it) && item?.type?.playable == true) {
                                                                     Timber.v("Clicked play on ${item.id}")
-                                                            onClickPlay.invoke(position, item)
+                                                                    onClickPlay.invoke(
+                                                                        position,
+                                                                        item,
+                                                                    )
                                                                     return@onKeyEvent true
                                                                 }
                                                                 return@onKeyEvent false
@@ -346,6 +372,8 @@ fun HomePageContent(
                         }
                     }
                 }
+            }
+        }
         when (loadingState) {
             LoadingState.Pending,
             LoadingState.Loading,

app/src/main/java/com/github/damontecres/wholphin/ui/util/ScrollToTopBringIntoViewSpec.kt

@@ -0,0 +1,44 @@
+package com.github.damontecres.wholphin.ui.util
+
+import androidx.compose.foundation.gestures.BringIntoViewSpec
+import androidx.compose.foundation.gestures.LocalBringIntoViewSpec
+import androidx.compose.foundation.lazy.LazyColumn
+
+/**
+ * Overrides scrolling so that the item being scrolled to is at the top of the view offset by the provided pixels
+ *
+ * Note: the offset is necessary for anything that is focuseable, but has content before (eg a title) that needs to be displayed too
+ *
+ * Note: this applies to ALL scrollable composables within its scope, so a [LazyColumn] of [androidx.compose.foundation.lazy.LazyRow]s likely needs nested [LocalBringIntoViewSpec] overrides
+ *
+ * Example:
+ * ```kotlin
+ * val defaultBringIntoViewSpec = LocalBringIntoViewSpec.current
+ * CompositionLocalProvider(LocalBringIntoViewSpec provides ScrollToTopBringIntoViewSpec(spaceAbovePx)) {
+ *     LazyColumn{
+ *         items(list){
+ *             CompositionLocalProvider(LocalBringIntoViewSpec provides defaultBringIntoViewSpec) {
+ *                 // Content
+ *             }
+ *         }
+ *     }
+ * }
+ * ```
+ */
+class ScrollToTopBringIntoViewSpec(
+    val spaceAbovePx: Float = 100f,
+) : BringIntoViewSpec {
+    override fun calculateScrollDistance(
+        offset: Float,
+        size: Float,
+        containerSize: Float,
+    ): Float {
+//        Timber.v(
+//            "calculateScrollDistance: offset=%s, size=%s, containerSize=%s",
+//            offset,
+//            size,
+//            containerSize,
+//        )
+        return offset - spaceAbovePx
+    }
+}

app/src/main/java/com/github/damontecres/wholphin/util/LoadingState.kt

@@ -49,6 +49,9 @@ sealed interface RowLoadingState {
 sealed interface HomeRowLoadingState {
     val title: String
 
+    val completed: Boolean
+        get() = this is Success || this is Error
+
     data class Pending(
         override val title: String,
     ) : HomeRowLoadingState