Skip to content
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.

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

Play Screen Preview Improvements #210

Merged
merged 1 commit into from
Jun 8, 2022
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@
* limitations under the License.
*/

@file:OptIn(ExperimentalHorologistMediaUiApi::class)
@file:OptIn(ExperimentalHorologistMediaUiApi::class, ExperimentalHorologistComposeToolsApi::class)

package com.google.android.horologist.media.ui.screens

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.VolumeUp
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -31,17 +29,20 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.wear.compose.material.Button
import androidx.wear.compose.material.ButtonDefaults
import androidx.wear.compose.material.CircularProgressIndicator
import androidx.wear.compose.material.Icon
import androidx.wear.compose.material.MaterialTheme
import androidx.wear.compose.material.Scaffold
import androidx.wear.compose.material.Text
import androidx.wear.compose.material.TimeText
import com.google.android.horologist.audio.VolumeState
import com.google.android.horologist.audio.ui.components.SettingsButtons
import com.google.android.horologist.compose.tools.ExperimentalHorologistComposeToolsApi
import com.google.android.horologist.compose.tools.WearPreviewDevices
import com.google.android.horologist.compose.tools.WearPreviewFontSizes
import com.google.android.horologist.media.ui.ExperimentalHorologistMediaUiApi
import com.google.android.horologist.media.ui.components.MediaControlButtons
import com.google.android.horologist.media.ui.components.TextMediaDisplay
import com.google.android.horologist.media.ui.components.background.RadialBackground

@Preview(
group = "Large Round",
Expand Down Expand Up @@ -90,7 +91,13 @@ fun PlayerScreenPreview() {
seekToPreviousButtonEnabled = true,
)
},
buttons = {},
buttons = {
SettingsButtons(
volumeState = VolumeState(5, 10),
onVolumeClick = { },
onOutputClick = { }
)
},
)
}
}
Expand Down Expand Up @@ -147,13 +154,11 @@ fun PlayerScreenPreviewCustomMediaDisplay() {
)
},
buttons = {
Button(
onClick = { },
colors = ButtonDefaults.iconButtonColors(),
modifier = Modifier.size(ButtonDefaults.SmallButtonSize),
) {
Icon(imageVector = Icons.Default.VolumeUp, contentDescription = "Set Volume")
}
SettingsButtons(
volumeState = VolumeState(5, 10),
onVolumeClick = { },
onOutputClick = { }
)
},
)
}
Expand Down Expand Up @@ -208,7 +213,13 @@ fun PlayerScreenPreviewCustomBackground() {
seekToPreviousButtonEnabled = true,
)
},
buttons = {},
buttons = {
SettingsButtons(
volumeState = VolumeState(5, 10),
onVolumeClick = { },
onOutputClick = { }
)
},
background = {
Box(modifier = Modifier.fillMaxSize()) {
CircularProgressIndicator(
Expand Down Expand Up @@ -238,4 +249,46 @@ fun PlayerScreenPreviewCustomBackground() {
}
}

@WearPreviewDevices
@WearPreviewFontSizes
@Composable
fun PlayerScreenPreviewDevices() {
Scaffold(
modifier = Modifier.fillMaxSize(),
timeText = { TimeText() }
) {
PlayerScreen(
mediaDisplay = {
TextMediaDisplay(
artist = "Journey",
title = "Don't Stop Believin'"
)
},
controlButtons = {
MediaControlButtons(
onPlayButtonClick = {},
onPauseButtonClick = {},
playPauseButtonEnabled = true,
playing = true,
percent = 0.25F,
onSeekToNextButtonClick = {},
seekToNextButtonEnabled = true,
onSeekToPreviousButtonClick = {},
seekToPreviousButtonEnabled = true,
)
},
buttons = {
SettingsButtons(
volumeState = VolumeState(5, 10),
onVolumeClick = { },
onOutputClick = { }
)
},
background = {
RadialBackground(color = Color.Yellow)
}
)
}
}

private const val BACKGROUND_COLOR = 0xFF313234