+
Skip to content

Fix bottom bar size by using surface #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2022
Merged

Fix bottom bar size by using surface #446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 48 additions & 44 deletions app/src/main/java/me/vanpetegem/accentor/ui/player/BottomBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ package me.vanpetegem.accentor.ui.player

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
Expand All @@ -33,59 +35,61 @@ fun ControlBar(playerViewModel: PlayerViewModel = viewModel()) {
val currentTrack by playerViewModel.currentTrack.observeAsState()
val currentAlbum by playerViewModel.currentAlbum.observeAsState()
val isPlaying by playerViewModel.playing.observeAsState()
BottomAppBar(contentPadding = PaddingValues(end = 8.dp)) {
AsyncImage(
model = currentAlbum?.image500,
placeholder = painterResource(R.drawable.ic_album),
fallback = painterResource(R.drawable.ic_album),
contentDescription = stringResource(R.string.album_cover_of_current_track),
modifier = Modifier.fillMaxHeight().aspectRatio(1f).background(MaterialTheme.colorScheme.surface),
contentScale = ContentScale.Crop,
)
Column(modifier = Modifier.padding(start = 8.dp).weight(1f)) {
Text(
currentTrack?.title ?: "",
style = MaterialTheme.typography.titleLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
Surface(modifier = Modifier.height(64.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
AsyncImage(
model = currentAlbum?.image500,
placeholder = painterResource(R.drawable.ic_album),
fallback = painterResource(R.drawable.ic_album),
contentDescription = stringResource(R.string.album_cover_of_current_track),
modifier = Modifier.fillMaxHeight().aspectRatio(1f).background(MaterialTheme.colorScheme.surface),
contentScale = ContentScale.Crop,
)
Text(
currentTrack?.stringifyTrackArtists() ?: "",
maxLines = 1,
style = MaterialTheme.typography.titleMedium,
overflow = TextOverflow.Ellipsis,
)
}
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.previous() }
},
) {
Icon(painterResource(R.drawable.ic_previous), contentDescription = stringResource(R.string.previous))
}
if (isPlaying ?: false) {
Column(modifier = Modifier.padding(start = 8.dp).weight(1f)) {
Text(
currentTrack?.title ?: "",
style = MaterialTheme.typography.titleLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
currentTrack?.stringifyTrackArtists() ?: "",
maxLines = 1,
style = MaterialTheme.typography.titleMedium,
overflow = TextOverflow.Ellipsis,
)
}
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.pause() }
scope.launch(IO) { playerViewModel.previous() }
},
) {
Icon(painterResource(R.drawable.ic_pause), contentDescription = stringResource(R.string.pause))
Icon(painterResource(R.drawable.ic_previous), contentDescription = stringResource(R.string.previous))
}
if (isPlaying ?: false) {
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.pause() }
},
) {
Icon(painterResource(R.drawable.ic_pause), contentDescription = stringResource(R.string.pause))
}
} else {
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.play() }
},
) {
Icon(painterResource(R.drawable.ic_play), contentDescription = stringResource(R.string.play))
}
}
} else {
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.play() }
scope.launch(IO) { playerViewModel.next() }
},
) {
Icon(painterResource(R.drawable.ic_play), contentDescription = stringResource(R.string.play))
Icon(painterResource(R.drawable.ic_next), contentDescription = stringResource(R.string.next))
}
}
IconButton(
onClick = {
scope.launch(IO) { playerViewModel.next() }
},
) {
Icon(painterResource(R.drawable.ic_next), contentDescription = stringResource(R.string.next))
}
}
}
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载