mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 23:51:21 +02:00
Minor UI changes (#75)
* Revert transparent cards from #61 * Don't show queue during playback if playing the final item * Fix nav drawer collection page from showing everything recursively * Immediately hide the skip intro button when pressed
This commit is contained in:
parent
89b9364807
commit
1a7684b458
4 changed files with 4 additions and 4 deletions
|
|
@ -24,7 +24,7 @@ class Playlist(
|
||||||
|
|
||||||
fun hasPrevious(): Boolean = index > 0
|
fun hasPrevious(): Boolean = index > 0
|
||||||
|
|
||||||
fun hasNext(): Boolean = index < items.size
|
fun hasNext(): Boolean = (index + 1) < items.size
|
||||||
|
|
||||||
fun getPreviousAndReverse(): BaseItem = items[--index]
|
fun getPreviousAndReverse(): BaseItem = items[--index]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.graphics.RectangleShape
|
import androidx.compose.ui.graphics.RectangleShape
|
||||||
import androidx.compose.ui.layout.ContentScale
|
import androidx.compose.ui.layout.ContentScale
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
|
|
@ -62,7 +61,7 @@ fun BannerCard(
|
||||||
interactionSource = interactionSource,
|
interactionSource = interactionSource,
|
||||||
colors =
|
colors =
|
||||||
CardDefaults.colors(
|
CardDefaults.colors(
|
||||||
containerColor = Color.Transparent,
|
// containerColor = Color.Transparent,
|
||||||
),
|
),
|
||||||
) {
|
) {
|
||||||
Box(
|
Box(
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@ fun DestinationContent(
|
||||||
preferences,
|
preferences,
|
||||||
destination.itemId,
|
destination.itemId,
|
||||||
destination.item,
|
destination.item,
|
||||||
true,
|
false,
|
||||||
modifier,
|
modifier,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -392,6 +392,7 @@ fun PlaybackPage(
|
||||||
}
|
}
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = {
|
||||||
|
segmentCancelled = true
|
||||||
player.seekTo(segment.endTicks.ticks.inWholeMilliseconds)
|
player.seekTo(segment.endTicks.ticks.inWholeMilliseconds)
|
||||||
},
|
},
|
||||||
modifier = Modifier.focusRequester(focusRequester),
|
modifier = Modifier.focusRequester(focusRequester),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue