@@ -273,7 +273,7 @@ fun SyncStatusView(
273
273
horizontalArrangement = Arrangement .SpaceBetween ,
274
274
modifier = Modifier .weight(1f ),
275
275
) {
276
- Column (modifier = Modifier .weight( 1f )) {
276
+ Column (modifier = Modifier .fillMaxWidth( )) {
277
277
if (! minimized) {
278
278
SyncStatusTitle (
279
279
text =
@@ -309,39 +309,45 @@ fun SyncStatusView(
309
309
)
310
310
}
311
311
}
312
+ }
313
+ }
314
+
315
+ Row (
316
+ verticalAlignment = Alignment .CenterVertically ,
317
+ modifier = Modifier .padding(start = 16 .dp)
318
+ ) {
319
+ if (currentSyncJobStatus is CurrentSyncJobStatus .Running ) {
312
320
LineSpinFadeLoaderProgressIndicator (
313
321
color = Color .White ,
314
- modifier = Modifier .padding(18 .dp),
315
322
lineLength = 8f ,
316
323
innerRadius = 12f ,
317
324
)
318
325
}
319
- }
320
-
321
- if (
322
- (currentSyncJobStatus is CurrentSyncJobStatus .Failed ||
323
- currentSyncJobStatus is CurrentSyncJobStatus .Running ) && ! minimized
324
- ) {
325
- Text (
326
- text =
327
- stringResource(
328
- if (currentSyncJobStatus is CurrentSyncJobStatus .Failed ) {
329
- org.smartregister.fhircore.engine.R .string.retry
330
- } else {
331
- org.smartregister.fhircore.engine.R .string.cancel
326
+ if (
327
+ (currentSyncJobStatus is CurrentSyncJobStatus .Failed ||
328
+ currentSyncJobStatus is CurrentSyncJobStatus .Running ) && ! minimized
329
+ ) {
330
+ Text (
331
+ text =
332
+ stringResource(
333
+ if (currentSyncJobStatus is CurrentSyncJobStatus .Failed ) {
334
+ org.smartregister.fhircore.engine.R .string.retry
335
+ } else {
336
+ org.smartregister.fhircore.engine.R .string.cancel
337
+ },
338
+ ),
339
+ modifier =
340
+ Modifier .padding(start = 16 .dp).clickable {
341
+ if (currentSyncJobStatus is CurrentSyncJobStatus .Failed ) {
342
+ onRetry()
343
+ } else {
344
+ onCancel()
345
+ }
332
346
},
333
- ),
334
- modifier =
335
- Modifier .padding(start = 16 .dp).clickable {
336
- if (currentSyncJobStatus is CurrentSyncJobStatus .Failed ) {
337
- onRetry()
338
- } else {
339
- onCancel()
340
- }
341
- },
342
- color = MaterialTheme .colors.primary,
343
- fontWeight = FontWeight .SemiBold ,
344
- )
347
+ color = MaterialTheme .colors.primary,
348
+ fontWeight = FontWeight .SemiBold ,
349
+ )
350
+ }
345
351
}
346
352
}
347
353
}
0 commit comments