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

Wear app: Scroll to next session #234

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
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
@@ -0,0 +1,47 @@
package fr.paug.androidmakers.wear.ui.common

import androidx.compose.animation.core.RepeatMode
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.unit.dp
import fr.paug.androidmakers.wear.ui.theme.amRed

@Composable
fun Pulsating(content: @Composable () -> Unit) {
val infiniteTransition = rememberInfiniteTransition(label = "pulse")

val scale by infiniteTransition.animateFloat(
label = "pulse",
initialValue = 1f,
targetValue = 0f,
animationSpec = infiniteRepeatable(
animation = tween(500),
repeatMode = RepeatMode.Reverse
)
)

Box(modifier = Modifier.alpha(scale)) {
content()
}
}

@Composable
fun PulsatingRedDot() {
Pulsating {
Box(
modifier = Modifier
.size(8.dp)
.background(color = amRed, shape = CircleShape)
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,27 @@ package fr.paug.androidmakers.wear.ui.session
import fr.androidmakers.domain.model.Room
import fr.androidmakers.domain.model.Session
import fr.androidmakers.domain.model.Speaker
import kotlinx.datetime.Clock
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime

data class UISession(
val session: Session,
val speakers: List<Speaker>,
val room: Room,
val isBookmarked: Boolean,
val session: Session,
val speakers: List<Speaker>,
val room: Room,
val isBookmarked: Boolean,
) {
val formattedDuration: String = session.duration.inWholeMinutes.toString() + " min"

val isOver: Boolean
get() {
val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
return session.endsAt < now
}

val isOngoing: Boolean
get() {
val now = Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
return session.startsAt <= now && now <= session.endsAt
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
import com.google.android.horologist.compose.layout.ScreenScaffold
import com.google.android.horologist.compose.layout.rememberResponsiveColumnState
import fr.paug.androidmakers.wear.ui.common.Loading
import fr.paug.androidmakers.wear.ui.common.PulsatingRedDot
import fr.paug.androidmakers.wear.ui.session.UISession
import fr.paug.androidmakers.wear.ui.session.uiSession1
import fr.paug.androidmakers.wear.ui.theme.amRed
Expand Down Expand Up @@ -86,6 +87,10 @@ private fun Session(session: UISession) {

Spacer(modifier = Modifier.width(16.dp))

if (session.isOngoing) {
PulsatingRedDot()
Spacer(modifier = Modifier.width(2.dp))
}
Text(
text = session.formattedDuration,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Bookmark
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.Hyphens
import androidx.compose.ui.text.style.LineBreak
Expand All @@ -39,6 +42,7 @@ import com.google.android.horologist.compose.material.ListHeaderDefaults
import com.google.android.horologist.compose.material.ResponsiveListHeader
import fr.paug.androidmakers.wear.R
import fr.paug.androidmakers.wear.ui.common.Loading
import fr.paug.androidmakers.wear.ui.common.PulsatingRedDot
import fr.paug.androidmakers.wear.ui.session.UISession
import fr.paug.androidmakers.wear.ui.session.uiSessions
import fr.paug.androidmakers.wear.ui.theme.amRed
Expand Down Expand Up @@ -72,6 +76,22 @@ private fun SessionList(
last = ScalingLazyColumnDefaults.ItemType.Card,
)
)

// Approximation of about half the height of a card, so the card is centered when scrolling to it.
// Maybe there's a way to get the actual height?
val scrollOffset = with(LocalDensity.current) { 80.dp.roundToPx() }

val nextSessionIndex = sessions.nextSessionIndex()
if (nextSessionIndex > 0) {
LaunchedEffect(Unit) {
columnState.state.scrollToItem(
// Add 1 to the index to account for the title
index = nextSessionIndex + 1,
scrollOffset = scrollOffset,
)
}
}

ScreenScaffold(scrollState = columnState) {
ScalingLazyColumn(
columnState = columnState,
Expand Down Expand Up @@ -103,13 +123,25 @@ private fun SessionList(
}
}

private fun List<UISession>.nextSessionIndex(): Int {
return indexOfFirst { !it.isOver }
}

@Composable
private fun SessionItem(
session: UISession,
onSessionClick: (String) -> Unit,
) {
TitleCard(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier
.fillMaxWidth()
.let {
if (session.isOver) {
it.alpha(.7F)
} else {
it
}
},
title = {
Column(
modifier = Modifier.fillMaxWidth(),
Expand Down Expand Up @@ -138,6 +170,10 @@ private fun SessionItem(
text = session.session.startsAt.time.toString(),
)

if (session.isOngoing) {
PulsatingRedDot()
Spacer(modifier = Modifier.width(2.dp))
}
Text(
text = session.formattedDuration,
)
Expand Down
1 change: 1 addition & 0 deletions wearApp/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
<item name="postSplashScreenTheme">@android:style/Theme.DeviceDefault</item>
<item name="android:windowSplashScreenBehavior" tools:targetApi="33">icon_preferred</item>
<item name="android:windowBackground">@android:color/transparent</item>
</style>
</resources>
Loading