@@ -11,8 +11,6 @@ package com.nextcloud.talk.chat
1111
1212import android.content.Context
1313import android.text.format.DateFormat
14- import androidx.compose.foundation.background
15- import androidx.compose.foundation.clickable
1614import androidx.compose.foundation.layout.Arrangement
1715import androidx.compose.foundation.layout.BoxWithConstraints
1816import androidx.compose.foundation.layout.Column
@@ -248,14 +246,14 @@ class ScheduleMessageCompose(
248246 val context = LocalContext .current
249247 Row (
250248 modifier = Modifier
251- .padding(INT_8 .dp)
249+ .padding(start = 16 .dp, end = 6 .dp, top = 6 .dp, bottom = 8 .dp)
252250 .fillMaxWidth()
253251 ) {
254252 Text (stringResource(R .string.nc_schedule_message_title), modifier = Modifier .weight(HALF_WEIGHT ))
255253
256254 val timeText = timeState.value.format(DateTimeFormatter .ofPattern(fullPattern(context)))
257255
258- Spacer (modifier = Modifier .width(60 .dp))
256+ Spacer (modifier = Modifier .width(72 .dp))
259257
260258 Text (
261259 timeText,
@@ -363,24 +361,28 @@ class ScheduleMessageCompose(
363361
364362 @Composable
365363 private fun TimeOption (label : String , timeString : String , selected : Boolean , onClick : () -> Unit ) {
366- Row (
364+ Surface (
365+ onClick = onClick,
367366 modifier = Modifier
368- .fillMaxWidth()
369- .padding(INT_8 .dp)
370- .background(
371- if (selected) {
372- MaterialTheme .colorScheme.primary
373- } else {
374- Color
375- .Transparent
376- },
377- RoundedCornerShape (4 .dp)
378- )
379- .clickable { onClick() }
367+ .fillMaxWidth(),
368+ color = if (selected) {
369+ MaterialTheme .colorScheme.inversePrimary
370+ } else {
371+ Color .Transparent
372+ },
373+ shape = RoundedCornerShape (10 .dp)
380374 ) {
381- Text (label, modifier = Modifier .weight(HALF_WEIGHT ))
382- Spacer (modifier = Modifier .width(60 .dp))
383- Text (timeString, modifier = Modifier .weight(HALF_WEIGHT ))
375+ Row (
376+ modifier = Modifier
377+ .fillMaxWidth()
378+ .padding(start = 16 .dp, end = 6 .dp, top = 6 .dp, bottom = 8 .dp),
379+ verticalAlignment = Alignment .CenterVertically ,
380+ horizontalArrangement = Arrangement .SpaceBetween
381+ ) {
382+ Text (text = label, modifier = Modifier .weight(HALF_WEIGHT ))
383+ Spacer (modifier = Modifier .width(72 .dp))
384+ Text (text = timeString, modifier = Modifier .weight(HALF_WEIGHT ))
385+ }
384386 }
385387 }
386388
0 commit comments