From c6f0b4cf83fbe0a491bbe8da29ffefb6f9d329ba Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 15 Sep 2025 13:20:29 -0300 Subject: [PATCH] Remove frequency row. --- .../remote/RemoteBackupsSettingsFragment.kt | 36 +++---------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt index 805d336878..1f97f3017f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt @@ -16,6 +16,7 @@ import androidx.compose.animation.core.tween import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement.spacedBy import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -94,7 +95,6 @@ import org.thoughtcrime.securesms.backup.DeletionState import org.thoughtcrime.securesms.backup.RestoreState import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState.RestoreStatus -import org.thoughtcrime.securesms.backup.v2.BackupFrequency import org.thoughtcrime.securesms.backup.v2.MessageBackupTier import org.thoughtcrime.securesms.backup.v2.ui.BackupAlert import org.thoughtcrime.securesms.backup.v2.ui.BackupAlertBottomSheet @@ -894,6 +894,7 @@ private fun LazyListScope.appendBackupDetailsItems( LastBackupRow( lastBackupTimestamp = state.lastBackupTimestamp, enabled = !state.isOutOfStorageSpace, + onRowClick = contentCallbacks::onBackupFrequencyClick, onBackupNowClick = contentCallbacks::onBackupNowClick ) } @@ -933,26 +934,6 @@ private fun LazyListScope.appendBackupDetailsItems( } } - item { - Rows.TextRow( - text = { - Column { - Text( - text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_frequency), - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurface - ) - Text( - text = stringResource(id = R.string.RemoteBackupsSettingsFragment__daily), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - } - }, - onClick = contentCallbacks::onBackupFrequencyClick - ) - } - item { Rows.ToggleRow( checked = state.canBackUpUsingCellular, @@ -1508,10 +1489,12 @@ private fun IncludeDebuglogRow( private fun LastBackupRow( lastBackupTimestamp: Long, enabled: Boolean, + onRowClick: () -> Unit, onBackupNowClick: () -> Unit ) { Row( modifier = Modifier + .clickable(onClick = onRowClick) .padding(horizontal = dimensionResource(id = CoreUiR.dimen.gutter)) .padding(top = 16.dp, bottom = 14.dp) ) { @@ -1705,16 +1688,6 @@ private fun BackupReadyToDownloadRow( } } -@Composable -private fun getTextForFrequency(backupsFrequency: BackupFrequency): String { - return when (backupsFrequency) { - BackupFrequency.DAILY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__daily) - BackupFrequency.WEEKLY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__weekly) - BackupFrequency.MONTHLY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__monthly) - BackupFrequency.MANUAL -> stringResource(id = R.string.RemoteBackupsSettingsFragment__manually_back_up) - } -} - @SignalPreview @Composable private fun RemoteBackupsSettingsContentPreview() { @@ -1965,6 +1938,7 @@ private fun LastBackupRowPreview() { LastBackupRow( lastBackupTimestamp = -1, enabled = true, + onRowClick = {}, onBackupNowClick = {} ) }