Skip to content

Commit 40c39a7

Browse files
committed
adjust padding and color schedule message set options
Signed-off-by: sowjanyakch <[email protected]>
1 parent 08fd991 commit 40c39a7

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

app/src/main/java/com/nextcloud/talk/chat/ScheduleMessageCompose.kt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ package com.nextcloud.talk.chat
1111

1212
import android.content.Context
1313
import android.text.format.DateFormat
14-
import androidx.compose.foundation.background
15-
import androidx.compose.foundation.clickable
1614
import androidx.compose.foundation.layout.Arrangement
1715
import androidx.compose.foundation.layout.BoxWithConstraints
1816
import 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

app/src/main/java/com/nextcloud/talk/chat/ScheduledMessagesActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ class ScheduledMessagesActivity : BaseActivity() {
741741
Icon(
742742
imageVector = Icons.Outlined.Edit,
743743
contentDescription = null,
744-
modifier = Modifier.size(20.dp),
744+
modifier = Modifier.size(20.dp)
745745
)
746746
Spacer(Modifier.width(8.dp))
747747
Text(

0 commit comments

Comments
 (0)