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

Fixes after merge

Browse source
This commit is contained in:
Damontecres 2026-01-02 17:15:59 -05:00
parent cf73239c46
commit 6050b38d77
No known key found for this signature in database
5 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,9 +106,6 @@ class MainActivity : AppCompatActivity() {
@Inject @Inject
lateinit var refreshRateService: RefreshRateService lateinit var refreshRateService: RefreshRateService
@Inject
lateinit var datePlayedInvalidationService: DatePlayedInvalidationService
@Inject @Inject
lateinit var userSwitchListener: UserSwitchListener lateinit var userSwitchListener: UserSwitchListener

1
app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt
View file

@ -245,7 +245,6 @@ fun ExpandableFaButton(
), ),
contentPadding = DefaultButtonPadding, contentPadding = DefaultButtonPadding,
interactionSource = interactionSource, interactionSource = interactionSource,
enabled = enabled,
) { ) {
Box( Box(
modifier = modifier =

2
app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt
View file

@ -155,7 +155,7 @@ class DiscoverMovieViewModel
?.filter { it.type == RelatedVideo.Type.TRAILER } ?.filter { it.type == RelatedVideo.Type.TRAILER }
?.filter { it.name.isNotNullOrBlank() && it.url.isNotNullOrBlank() } ?.filter { it.name.isNotNullOrBlank() && it.url.isNotNullOrBlank() }
?.map { ?.map {
RemoteTrailer(it.name!!, it.url!!) RemoteTrailer(it.name!!, it.url!!, null)
}.orEmpty() }.orEmpty()
this@DiscoverMovieViewModel.trailers.setValueOnMain(trailers) this@DiscoverMovieViewModel.trailers.setValueOnMain(trailers)
} }

1
app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
View file

@ -61,7 +61,6 @@ import com.github.damontecres.wholphin.ui.components.LoadingPage
import com.github.damontecres.wholphin.ui.components.OverviewText import com.github.damontecres.wholphin.ui.components.OverviewText
import com.github.damontecres.wholphin.ui.data.ItemDetailsDialog import com.github.damontecres.wholphin.ui.data.ItemDetailsDialog
import com.github.damontecres.wholphin.ui.data.ItemDetailsDialogInfo import com.github.damontecres.wholphin.ui.data.ItemDetailsDialogInfo
import com.github.damontecres.wholphin.ui.detail.movie.TrailerRow
import com.github.damontecres.wholphin.ui.letNotEmpty import com.github.damontecres.wholphin.ui.letNotEmpty
import com.github.damontecres.wholphin.ui.nav.Destination import com.github.damontecres.wholphin.ui.nav.Destination
import com.github.damontecres.wholphin.ui.rememberInt import com.github.damontecres.wholphin.ui.rememberInt

21
app/src/main/java/com/github/damontecres/wholphin/ui/seerr/SeerrDiscoverPage.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@ -161,14 +162,14 @@ fun SeerrDiscoverPage(
onClick = onClick, onClick = onClick,
onLongClick = onLongClick, onLongClick = onLongClick,
showOverlay = false, showOverlay = false,
modifier = mod, modifier =
) mod.onFocusChanged {
}, if (it.isFocused) {
cardOnFocus = { isFocused, index ->
if (isFocused) {
position = RowColumn(0, index) position = RowColumn(0, index)
} }
}, },
)
},
modifier = Modifier.focusRequester(focusRequester), modifier = Modifier.focusRequester(focusRequester),
) )
ItemRow( ItemRow(
@ -193,15 +194,15 @@ fun SeerrDiscoverPage(
onClick = onClick, onClick = onClick,
onLongClick = onLongClick, onLongClick = onLongClick,
showOverlay = false, showOverlay = false,
modifier = mod, modifier =
) mod.onFocusChanged {
}, if (it.isFocused) {
cardOnFocus = { isFocused, index ->
if (isFocused) {
position = RowColumn(1, index) position = RowColumn(1, index)
} }
}, },
) )
},
)
} }
} }
} }