Skip to content
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
Expand Up @@ -63,6 +63,7 @@ import androidx.compose.ui.graphics.drawscope.DrawScope
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.lerp
import androidx.compose.ui.platform.LocalLocale
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.LiveRegionMode
Expand Down Expand Up @@ -315,7 +316,7 @@ private fun PresetChips(selected: Deadline.Preset?, reducedMotion: Boolean, onCh
*/
@Composable
private fun DayGrid(sheet: TimeToPay, reducedMotion: Boolean, onChoose: (LocalDate) -> Unit) {
val locale = Locale.getDefault()
val locale = LocalLocale.current.platformLocale
val days = remember(sheet.today) { TimeToPay.grid(sheet.today, WeekFields.of(locale).firstDayOfWeek) }
val monthLabel = remember { DateTimeFormatter.ofPattern("MMM", locale) }
val fullDate = remember { DateTimeFormatter.ofPattern(bestPattern("EEEEMMMMd"), locale) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ internal fun MessengerScreen(viewModel: ChatViewModel) {

// Before the deck is read, so requests already held are there on the first frame.
val deckChat = state.chatId.takeIf { state.chatType == ChatType.GROUP }
remember(deckChat) { deckChat?.let(requestsViewModel::attach) }
remember(deckChat) { deckChat?.also(requestsViewModel::attach) }
val deck by requestsViewModel.deck.collectAsStateWithLifecycle()
val deckExpanded by requestsViewModel.expanded.collectAsStateWithLifecycle()
val deckNow by requestsViewModel.now.collectAsStateWithLifecycle()
Expand Down
Loading