From 4646b49fd3ec9f2c54ef678810ab41fb4a1708f6 Mon Sep 17 00:00:00 2001 From: Lentumunai-Mark Date: Fri, 13 Dec 2024 13:31:10 +0300 Subject: [PATCH] Harmonize sync status files. Signed-off-by: Lentumunai-Mark --- .../ui/shared/components/SyncStatusView.kt | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/SyncStatusView.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/SyncStatusView.kt index bb0f570c42..6475b2443e 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/SyncStatusView.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/SyncStatusView.kt @@ -354,48 +354,49 @@ fun SyncStatusView( fontWeight = FontWeight.SemiBold, ) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(start = 16.dp), - ) { - if (currentSyncJobStatus is CurrentSyncJobStatus.Running) { - LineSpinFadeLoaderProgressIndicator( - color = Color.White, - lineLength = 8f, - innerRadius = 12f, - ) - } - if ( - (currentSyncJobStatus is CurrentSyncJobStatus.Failed || - currentSyncJobStatus is CurrentSyncJobStatus.Running) && !minimized + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(start = 16.dp), ) { - Text( - text = - stringResource( - if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) { - org.smartregister.fhircore.engine.R.string.retry - } else { - org.smartregister.fhircore.engine.R.string.cancel + if (currentSyncJobStatus is CurrentSyncJobStatus.Running) { + LineSpinFadeLoaderProgressIndicator( + color = Color.White, + lineLength = 8f, + innerRadius = 12f, + ) + } + if ( + (currentSyncJobStatus is CurrentSyncJobStatus.Failed || + currentSyncJobStatus is CurrentSyncJobStatus.Running) && !minimized + ) { + Text( + text = + stringResource( + if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) { + org.smartregister.fhircore.engine.R.string.retry + } else { + org.smartregister.fhircore.engine.R.string.cancel + }, + ), + modifier = + Modifier.padding(start = 16.dp).clickable { + if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) { + onRetry() + } else { + onCancel() + } }, - ), - modifier = - Modifier.padding(start = 16.dp).clickable { - if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) { - onRetry() - } else { - onCancel() - } - }, - color = MaterialTheme.colors.primary, - fontWeight = FontWeight.SemiBold, - ) + color = MaterialTheme.colors.primary, + fontWeight = FontWeight.SemiBold, + ) + } } } } } @Composable -private fun SyncStatusTitle( +fun SyncStatusTitle( text: String, color: Color = Color.Unspecified, minimized: Boolean,