From eb3a037eff892a17cf640fbcd91b27c4ad1e352c Mon Sep 17 00:00:00 2001 From: Marten Rebane Date: Tue, 30 Jun 2026 02:58:52 +0300 Subject: [PATCH] Move central configuration info higher --- .../fragment/screen/DiagnosticsScreen.kt | 142 +++++++++--------- 1 file changed, 73 insertions(+), 69 deletions(-) diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt index 66f0275d..182e181d 100644 --- a/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt +++ b/app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt @@ -79,6 +79,7 @@ import ee.ria.DigiDoc.ui.component.shared.StatusSnackbarHost import ee.ria.DigiDoc.ui.component.shared.TopBar import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding +import ee.ria.DigiDoc.ui.theme.Dimensions.zeroPadding import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme import ee.ria.DigiDoc.ui.theme.buttonRoundCornerShape import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType @@ -261,8 +262,12 @@ fun DiagnosticsScreen( SettingsSwitchItem( modifier = modifier - .padding(XSPadding) - .semantics { + .padding( + start = XSPadding, + end = XSPadding, + top = XSPadding, + bottom = zeroPadding, + ).semantics { testTagsAsResourceId = true }.testTag("mainDiagnosticsLogging"), checked = enableOneTimeLogGeneration, @@ -321,6 +326,72 @@ fun DiagnosticsScreen( ) } + SpannableBoldText( + modifier = modifier, + stringResource(id = R.string.main_diagnostics_central_configuration_title), + "", + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationDate"), + stringResource(id = R.string.main_diagnostics_date_title), + currentConfiguration?.metaInf?.date ?: "", + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationSerial"), + stringResource(id = R.string.main_diagnostics_serial_title), + currentConfiguration?.metaInf?.serial.toString(), + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationUrl"), + stringResource(id = R.string.main_diagnostics_url_title), + currentConfiguration?.metaInf?.url ?: "", + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationVersion"), + stringResource(id = R.string.main_diagnostics_version_title), + currentConfiguration?.metaInf?.version.toString(), + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationUpdateDate"), + stringResource(id = R.string.main_diagnostics_configuration_update_date), + diagnosticsViewModel.getConfigurationDate(currentConfiguration?.configurationUpdateDate), + ) + DiagnosticsText( + modifier = + modifier + .semantics { + testTagsAsResourceId = true + }.testTag("mainDiagnosticsCentralConfigurationLastCheck"), + stringResource(id = R.string.main_diagnostics_configuration_last_check_date), + diagnosticsViewModel.getConfigurationDate(currentConfiguration?.configurationLastUpdateCheckDate), + ) + HorizontalDivider( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = XSPadding) + .padding(top = SPadding), + ) SpannableBoldText( modifier = modifier @@ -546,73 +617,6 @@ fun DiagnosticsScreen( .padding(top = SPadding), ) } - SpannableBoldText( - modifier = modifier, - stringResource(id = R.string.main_diagnostics_central_configuration_title), - "", - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationDate"), - stringResource(id = R.string.main_diagnostics_date_title), - currentConfiguration?.metaInf?.date ?: "", - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationSerial"), - stringResource(id = R.string.main_diagnostics_serial_title), - currentConfiguration?.metaInf?.serial.toString(), - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationUrl"), - stringResource(id = R.string.main_diagnostics_url_title), - currentConfiguration?.metaInf?.url ?: "", - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationVersion"), - stringResource(id = R.string.main_diagnostics_version_title), - currentConfiguration?.metaInf?.version.toString(), - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationUpdateDate"), - stringResource(id = R.string.main_diagnostics_configuration_update_date), - diagnosticsViewModel.getConfigurationDate(currentConfiguration?.configurationUpdateDate), - ) - DiagnosticsText( - modifier = - modifier - .semantics { - testTagsAsResourceId = true - }.testTag("mainDiagnosticsCentralConfigurationLastCheck"), - stringResource(id = R.string.main_diagnostics_configuration_last_check_date), - diagnosticsViewModel.getConfigurationDate(currentConfiguration?.configurationLastUpdateCheckDate), - ) - HorizontalDivider( - modifier = - modifier - .fillMaxWidth() - .padding(horizontal = XSPadding) - .padding(top = SPadding), - ) - if (openRestartConfirmationDialog.value) { BasicAlertDialog( modifier =