justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Merge branch 'main' into develop/customize-home

Browse source
This commit is contained in:
Damontecres 2026-02-11 21:14:10 -05:00
commit 561b12fe87
No known key found for this signature in database
7 changed files with 244 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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>,
) {
viewModelScope.launch(Dispatchers.IO) {
): Deferred<HomeRowLoadingState> =
viewModelScope.async(Dispatchers.IO) {
val titleStr = context.getString(title)
val row =
try {
@ -115,7 +116,6 @@ abstract class RecommendedViewModel(
}
update(title, row)
}
}
}
@Composable

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

@ -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,8 +219,17 @@ 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) {
loading.setValueOnMain(LoadingState.Success)
for (i in 0..<jobs.size) {
val result = jobs[i].await()
if (result.completed) {
Timber.v("First success")
loading.setValueOnMain(LoadingState.Success)
}
break
}
}
}
}
@ -225,10 +237,11 @@ class RecommendedMovieViewModel
override fun update(
@StringRes title: Int,
row: HomeRowLoadingState,
) {
): HomeRowLoadingState {
rows.update { current ->
current.toMutableList().apply { set(rowTitles[title]!!, row) }
}
return row
}
companion object {

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

@ -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,7 +267,14 @@ class RecommendedTvShowViewModel
}
if (loading.value == LoadingState.Loading || loading.value == LoadingState.Pending) {
loading.setValueOnMain(LoadingState.Success)
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
}
}
}
}
@ -272,10 +282,11 @@ class RecommendedTvShowViewModel
override fun update(
@StringRes title: Int,
row: HomeRowLoadingState,
) {
): HomeRowLoadingState {
rows.update { current ->
current.toMutableList().apply { set(rowTitles[title]!!, row) }
}
return row
}
companion object {

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

@ -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,28 +255,41 @@ fun SeerrDiscoverPage(
.padding(top = 24.dp, bottom = 16.dp, start = 32.dp)
.fillMaxHeight(.25f),
)
LazyColumn(
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 40.dp),
modifier =
Modifier
.focusRestorer()
.fillMaxSize(),
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),
) {
itemsIndexed(rows) { rowIndex, row ->
DiscoverRow(
row = row,
onClickItem = { index, item ->
position = RowColumn(rowIndex, index)
viewModel.navigationManager.navigateTo(item.destination)
},
onLongClickItem = { index, item -> },
onCardFocus = { index -> position = RowColumn(rowIndex, index) },
focusRequester = focusRequesters[rowIndex],
modifier =
Modifier
.fillMaxWidth(),
)
LazyColumn(
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 40.dp),
modifier =
Modifier
.focusRestorer()
.fillMaxSize(),
) {
itemsIndexed(rows) { rowIndex, row ->
CompositionLocalProvider(LocalBringIntoViewSpec provides defaultBringIntoViewSpec) {
DiscoverRow(
row = row,
onClickItem = { index, item ->
position = RowColumn(rowIndex, index)
viewModel.navigationManager.navigateTo(item.destination)
},
onLongClickItem = { index, item -> },
onCardFocus = { index -> position = RowColumn(rowIndex, index) },
focusRequester = focusRequesters[rowIndex],
modifier =
Modifier
.fillMaxWidth(),
)
}
}
}
}
}

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

@ -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,101 +251,123 @@ fun HomePageContent(
.padding(top = 48.dp, bottom = 32.dp, start = 8.dp)
.fillMaxHeight(.33f),
)
LazyColumn(
state = listState,
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding =
PaddingValues(
bottom = Cards.height2x3,
),
modifier =
Modifier
.focusRestorer(),
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),
) {
itemsIndexed(homeRows) { rowIndex, row ->
when (val r = row) {
is HomeRowLoadingState.Loading,
is HomeRowLoadingState.Pending,
-> {
FocusableItemRow(
title = r.title,
subtitle = stringResource(R.string.loading),
modifier = Modifier.animateItem(),
)
}
LazyColumn(
state = listState,
verticalArrangement = Arrangement.spacedBy(8.dp),
contentPadding =
PaddingValues(
bottom = Cards.height2x3,
),
modifier =
Modifier
.focusRestorer(),
) {
itemsIndexed(homeRows) { rowIndex, row ->
CompositionLocalProvider(
LocalBringIntoViewSpec provides defaultBringIntoViewSpec,
) {
when (val r = row) {
is HomeRowLoadingState.Loading,
is HomeRowLoadingState.Pending,
-> {
FocusableItemRow(
title = r.title,
subtitle = stringResource(R.string.loading),
modifier = Modifier.animateItem(),
)
}
is HomeRowLoadingState.Error -> {
FocusableItemRow(
title = r.title,
subtitle = r.localizedMessage,
isError = true,
modifier = Modifier.animateItem(),
)
}
is HomeRowLoadingState.Error -> {
FocusableItemRow(
title = r.title,
subtitle = r.localizedMessage,
isError = true,
modifier = Modifier.animateItem(),
)
}
is HomeRowLoadingState.Success -> {
if (row.items.isNotEmpty()) {
val viewOptions = row.viewOptions
ItemRow(
title = row.title,
items = row.items,
onClickItem = { index, item ->
onClickItem.invoke(RowColumn(rowIndex, index), item)
},
onLongClickItem = { index, item ->
onLongClickItem.invoke(RowColumn(rowIndex, index), item)
},
modifier =
Modifier
.fillMaxWidth()
.focusGroup()
.focusRequester(rowFocusRequesters[rowIndex])
.animateItem(),
horizontalPadding = viewOptions.spacing.dp,
cardContent = { index, item, cardModifier, onClick, onLongClick ->
HomePageCardContent(
index = index,
item = item,
onClick = onClick,
onLongClick = onLongClick,
viewOptions = viewOptions,
is HomeRowLoadingState.Success -> {
if (row.items.isNotEmpty()) {
val viewOptions = row.viewOptions
ItemRow(
title = row.title,
items = row.items,
onClickItem = { index, item ->
onClickItem.invoke(RowColumn(rowIndex, index), item)
},
onLongClickItem = { index, item ->
onLongClickItem.invoke(
RowColumn(rowIndex, index),
item,
)
},
modifier =
cardModifier
.onFocusChanged {
if (it.isFocused) {
position = RowColumn(rowIndex, index)
}
if (it.isFocused && onFocusPosition != null) {
val nonEmptyRowBefore =
homeRows
.subList(0, rowIndex)
.count {
it is HomeRowLoadingState.Success && it.items.isEmpty()
}
onFocusPosition.invoke(
RowColumn(
rowIndex - nonEmptyRowBefore,
index,
),
)
}
}.onKeyEvent {
if (isPlayKeyUp(it) && item?.type?.playable == true) {
Timber.v("Clicked play on ${item.id}")
onClickPlay.invoke(position, item)
return@onKeyEvent true
}
return@onKeyEvent false
},
Modifier
.fillMaxWidth()
.focusGroup()
.focusRequester(rowFocusRequesters[rowIndex])
.animateItem(),
horizontalPadding = viewOptions.spacing.dp,
cardContent = { index, item, cardModifier, onClick, onLongClick ->
HomePageCardContent(
index = index,
item = item,
onClick = onClick,
onLongClick = onLongClick,
viewOptions = viewOptions,
modifier =
cardModifier
.onFocusChanged {
if (it.isFocused) {
position =
RowColumn(rowIndex, index)
}
if (it.isFocused && onFocusPosition != null) {
val nonEmptyRowBefore =
homeRows
.subList(0, rowIndex)
.count {
it is HomeRowLoadingState.Success && it.items.isEmpty()
}
onFocusPosition.invoke(
RowColumn(
rowIndex - nonEmptyRowBefore,
index,
),
)
}
}.onKeyEvent {
if (isPlayKeyUp(it) && item?.type?.playable == true) {
Timber.v("Clicked play on ${item.id}")
onClickPlay.invoke(
position,
item,
)
return@onKeyEvent true
}
return@onKeyEvent false
},
)
},
)
},
)
} else if (showEmptyRows) {
FocusableItemRow(
title = r.title,
subtitle = stringResource(R.string.no_results),
modifier = Modifier.animateItem(),
)
} else if (showEmptyRows) {
FocusableItemRow(
title = r.title,
subtitle = stringResource(R.string.no_results),
modifier = Modifier.animateItem(),
)
}
}
}
}
}

44
app/src/main/java/com/github/damontecres/wholphin/ui/util/ScrollToTopBringIntoViewSpec.kt Normal file
View file

@ -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
}
}

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

@ -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