Skip to content

Wear UI tweaks #400

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
BoD merged 2 commits into from
Mar 23, 2026
Merged

Wear UI tweaks #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1674fc0
Wear session details UI tweaks
BoD Mar 22, 2026
13fc1fa
Reload bookmarks when pull to refresh
BoD Mar 22, 2026
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
15 changes: 14 additions & 1 deletion shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,41 @@ import com.androidmakers.ui.model.Lce
import com.androidmakers.ui.model.UISession
import fr.androidmakers.domain.interactor.ApplyForAppClinicUseCase
import fr.androidmakers.domain.interactor.GetAgendaUseCase
import fr.androidmakers.domain.interactor.MergeBookmarksUseCase
import fr.androidmakers.domain.interactor.SetSessionBookmarkUseCase
import fr.androidmakers.domain.model.Room
import fr.androidmakers.domain.repo.BookmarksRepository
import fr.androidmakers.domain.repo.UserRepository
import fr.androidmakers.domain.utils.UrlOpener
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.emitAll
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch

class AgendaViewModel(
getAgendaUseCase: GetAgendaUseCase,
mergeBookmarksUseCase: MergeBookmarksUseCase,
private val setSessionBookmarkUseCase: SetSessionBookmarkUseCase,
bookmarksRepository: BookmarksRepository,
userRepository: UserRepository,
private val applyForAppClinicUseCase: ApplyForAppClinicUseCase,
) : LceViewModel<AgendaState>(
produce = { refresh ->
getAgendaUseCase(refresh)
.combine(bookmarksRepository.favoriteSessions) { agendaResult, favoriteSessions ->
.combine(
flow {
userRepository.currentUser?.let {
mergeBookmarksUseCase(it.id)
}
emitAll(bookmarksRepository.favoriteSessions)
}
) { agendaResult, favoriteSessions ->
agendaResult.map { agenda ->
AgendaState(
days = agendaToDays(agenda, favoriteSessions),
Expand Down
104 changes: 57 additions & 47 deletions wearApp/src/main/java/fr/paug/androidmakers/wear/ui/session/details/SessionDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private fun Session(session: UISession, onBookmarkToggle: (Boolean) -> Unit) {
.padding(horizontal = 8.dp)
.padding(top = 8.dp),
text = session.session.title,
textAlign = TextAlign.Start,
textAlign = TextAlign.Center,
style = MaterialTheme.typography.title2.copy(
fontWeight = FontWeight.Bold,
),
Expand Down Expand Up @@ -158,31 +158,36 @@ private fun SessionMetadataPills(
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.Center,
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
Text(
text = formattedDuration,
style = MaterialTheme.typography.caption1,
color = amGreen,
Row(
modifier = Modifier
.background(
color = amGreenLight,
color = MaterialTheme.colors.primary,
shape = RoundedCornerShape(50)
)
.padding(horizontal = 10.dp, vertical = 4.dp),
)
verticalAlignment = Alignment.CenterVertically,
) {
if (isOngoing) {
PulsatingRedDot()
Spacer(modifier = Modifier.width(4.dp))
}

if (isOngoing) {
PulsatingRedDot()
Text(
text = formattedDuration,
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onPrimary,
)
}
}

languageWithFlag(language)?.let { langText ->
Spacer(modifier = Modifier.width(8.dp))
Text(
text = langText,
style = MaterialTheme.typography.caption1,
Expand All @@ -203,42 +208,48 @@ private fun SessionTimeRoomRow(
startsAt: LocalDateTime,
roomName: String,
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start,
FlowRow(
horizontalArrangement = Arrangement.spacedBy(space = 6.dp, alignment = Alignment.CenterHorizontally),
verticalArrangement = Arrangement.spacedBy(6.dp),
modifier = Modifier
.fillMaxWidth()
.padding(top = 4.dp),
) {
Icon(
imageVector = Icons.Rounded.Schedule,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colors.onSurfaceVariant,
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = startsAt.time.toString(),
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onSurfaceVariant,
)
Text(
text = " \u2022 ",
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onSurfaceVariant,
)
Icon(
imageVector = Icons.Rounded.Place,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colors.onSurfaceVariant,
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = roomName,
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onSurfaceVariant,
)
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Icon(
imageVector = Icons.Rounded.Schedule,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colors.onSurfaceVariant,
)
Text(
text = startsAt.time.toString(),
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onSurfaceVariant,
)
}

Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Icon(
imageVector = Icons.Rounded.Place,
contentDescription = null,
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colors.onSurfaceVariant,
)
Text(
text = roomName,
style = MaterialTheme.typography.caption1,
color = MaterialTheme.colors.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
}
}

Expand Down Expand Up @@ -307,7 +318,7 @@ private fun ScalingLazyListScope.sessionDescriptionSection(description: String)
.fillMaxWidth()
.padding(horizontal = 8.dp),
text = description,
style = MaterialTheme.typography.body2.copy(
style = MaterialTheme.typography.body1.copy(
hyphens = Hyphens.Auto,
lineBreak = LineBreak.Paragraph,
),
Expand Down Expand Up @@ -347,6 +358,7 @@ private fun ScalingLazyListScope.sessionSpeakersSection(
)
},
onClick = {},
enabled = false,
) {
Column {
if (!speaker.company.isNullOrBlank()) {
Expand All @@ -361,8 +373,6 @@ private fun ScalingLazyListScope.sessionSpeakersSection(
text = bio,
style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onSurfaceVariant,
maxLines = 4,
overflow = TextOverflow.Ellipsis,
)
}
}
Expand Down Expand Up @@ -410,7 +420,7 @@ private fun languageWithFlag(language: String): String? {
"french", "français" -> "\uD83C\uDDEB\uD83C\uDDF7"
else -> null
}
return if (flag != null) "$language $flag" else language
return if (flag != null) flag else language
}

@WearPreviewDevices
Expand Down
Loading