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

UI tweaks

Browse source
This commit is contained in:
Damontecres 2026-03-21 15:53:34 -04:00
parent 99bddea295
commit 803780894c
No known key found for this signature in database
5 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -430,7 +430,7 @@ fun AlbumDetailsPage(
itemsIndexed(state.songs) { index, song ->
Box(
modifier = Modifier.fillMaxWidth(),
contentAlignment = Alignment.TopStart,
contentAlignment = Alignment.Center,
) {
SongListItem(
song = song,

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

@ -23,6 +23,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
@ -463,6 +464,7 @@ fun ArtistDetailsPage(
isQueued = song != null && song.id in currentMusic.queuedIds,
modifier =
Modifier
.align(Alignment.Center)
.fillMaxWidth(.75f)
.ifElse(
position.row == SONG_ROW && position.column == index,

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

@ -101,7 +101,7 @@ fun LyricsContent(
if (index == currentLyricPosition || currentLyricPosition == null) {
MaterialTheme.colorScheme.onSurface
} else {
MaterialTheme.colorScheme.onSurface.copy(alpha = .5f)
MaterialTheme.colorScheme.onSurface.copy(alpha = .4f)
},
animationSpec = tween(durationMillis = 500, easing = LinearEasing),
)

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

@ -73,6 +73,7 @@ fun NowPlayingOverlay(
onMoveQueue: (Int, MoveDirection) -> Unit,
onClickMoreItem: (Int, AudioItem) -> Unit,
onClickStop: () -> Unit,
lyricsFocusRequester: FocusRequester,
modifier: Modifier = Modifier,
) {
val scope = rememberCoroutineScope()
@ -116,6 +117,7 @@ fun NowPlayingOverlay(
seekForward = Duration.ZERO,
modifier =
Modifier
.align(Alignment.CenterHorizontally)
.padding(top = 8.dp)
.fillMaxWidth(.95f),
)

27
app/src/main/java/com/github/damontecres/wholphin/ui/detail/music/NowPlayingPage.kt
View file

@ -41,7 +41,9 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
@ -66,6 +68,7 @@ import com.github.damontecres.wholphin.ui.nav.Backdrop
import com.github.damontecres.wholphin.ui.playback.BottomDialog
import com.github.damontecres.wholphin.ui.playback.BottomDialogItem
import com.github.damontecres.wholphin.ui.playback.PlaybackKeyHandler
import com.github.damontecres.wholphin.ui.playback.isUp
import com.github.damontecres.wholphin.ui.tryRequestFocus
import com.github.damontecres.wholphin.util.LoadingState
import org.jellyfin.sdk.model.extensions.ticks
@ -142,6 +145,8 @@ fun NowPlayingPage(
val focusRequester = remember { FocusRequester() }
LaunchedEffect(Unit) { focusRequester.tryRequestFocus() }
val lyricsFocusRequester = remember { FocusRequester() }
val hasLyrics = musicPrefs.showLyrics && state.hasLyrics
LaunchedEffect(lyricsHaveFocus) {
if (lyricsHaveFocus) {
@ -174,8 +179,18 @@ fun NowPlayingPage(
modifier =
Modifier
.fillMaxSize()
.onPreviewKeyEvent(keyHandler::onKeyEvent)
.focusRequester(focusRequester)
.onPreviewKeyEvent { key ->
if (!controllerViewState.controlsVisible &&
key.type == KeyEventType.KeyUp &&
isUp(key) &&
hasLyrics
) {
lyricsFocusRequester.tryRequestFocus()
true
} else {
keyHandler.onKeyEvent(key)
}
}.focusRequester(focusRequester)
.focusable(),
)
Row(
@ -212,7 +227,7 @@ fun NowPlayingPage(
model = current?.imageUrl,
modifier =
Modifier
.size(320.dp)
.size(240.dp)
.clip(RoundedCornerShape(16.dp)),
)
current?.title?.let {
@ -260,7 +275,9 @@ fun NowPlayingPage(
visible = musicPrefs.showLyrics && state.hasLyrics,
enter = expandHorizontally(expandFrom = Alignment.End),
exit = shrinkHorizontally(shrinkTowards = Alignment.End),
modifier = Modifier,
modifier =
Modifier
.focusRequester(lyricsFocusRequester),
) {
Box(
contentAlignment = Alignment.Center,
@ -330,8 +347,10 @@ fun NowPlayingPage(
onClickMoreItem = { index, song -> showContextForItem.invoke(false, index, song) },
onLongClickSong = { index, song -> showContextForItem.invoke(true, index, song) },
onClickStop = { viewModel.stop() },
lyricsFocusRequester = lyricsFocusRequester,
modifier =
Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter)
.drawBehind {
drawRect(