add AlertContent, add RouteNavigator

2026-07-26 20:25:05 +03:00
parent 38a93ed95e
commit 30b1acd3ff
39 changed files with 398 additions and 395 deletions
@@ -18,18 +18,14 @@ import androiddev.libs.updater.updater_client.generated.resources.updater_title_
 import androiddev.libs.updater.updater_client.generated.resources.updater_title_permission
 import androiddev.libs.updater.updater_client.generated.resources.updater_title_ready
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -38,10 +34,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.DialogProperties
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
+import ru.shadowsparky.ui.components.AlertContent
 import ru.shadowsparky.ui.components.Loading
 import ru.shadowsparky.updater.domain.UpdateState

@@ -55,50 +51,50 @@ fun UpdateDialog(
    val canDismiss = remember(state) { !component.isForceUpdate }
    val isVisible = remember(state) { state !is UpdateState.Idle }
    if (isVisible) {
-        BasicAlertDialog(
+        AlertContent(
            modifier = modifier,
            onDismissRequest = { component.reset() },
-            properties = DialogProperties(
-                canDismiss,
-                canDismiss,
-            ),
+            canDismiss = canDismiss,
            content = {
-                Surface(shape = MaterialTheme.shapes.extraLarge) {
-                    Box(modifier = Modifier.padding(16.dp)) {
-                        when (val currentState = state) {
-                            is UpdateState.Checking -> UpdateCheckingContent()
-                            is UpdateState.UpdateAvailable -> UpdateAvailableContent(
-                                versionName = currentState.versionName,
-                                changeLog = currentState.changeLog,
-                                onDownloadClick = { component.downloadUpdate(currentState.url) }
-                            )
-                            is UpdateState.InstallPermissionRequired -> UpdatePermissionContent(
-                                onGrantClick = { component.requestPermission() }
-                            )
-                            is UpdateState.Downloading -> UpdateDownloadingContent(
-                                progress = currentState.progress,
-                                downloadedBytes = currentState.downloadedBytes,
-                                totalBytes = currentState.totalBytes
-                            )
-                            is UpdateState.ReadyToInstall -> UpdateReadyContent(
-                                onInstallClick = { component.installApk(currentState.filePath) }
-                            )
-                            is UpdateState.Error -> UpdateErrorContent(
-                                message = currentState.message,
-                                onRetryClick = { component.checkUpdates() }
-                            )
-                            is UpdateState.UpToDate -> {
-                                UpdateFinishedContent(onSkip = { component.reset() })
-                            }
-                            is UpdateState.Completed -> {
-                                UpdateFinishedContent(
-                                    Res.string.updater_title_completed,
-                                    onSkip = { component.reset() }
-                                )
-                            }
-                            else -> Unit
-                        }
+                when (val currentState = state) {
+                    is UpdateState.Checking -> UpdateCheckingContent()
+                    is UpdateState.UpdateAvailable -> UpdateAvailableContent(
+                        versionName = currentState.versionName,
+                        changeLog = currentState.changeLog,
+                        onDownloadClick = { component.downloadUpdate(currentState.url) }
+                    )
+
+                    is UpdateState.InstallPermissionRequired -> UpdatePermissionContent(
+                        onGrantClick = { component.requestPermission() }
+                    )
+
+                    is UpdateState.Downloading -> UpdateDownloadingContent(
+                        progress = currentState.progress,
+                        downloadedBytes = currentState.downloadedBytes,
+                        totalBytes = currentState.totalBytes
+                    )
+
+                    is UpdateState.ReadyToInstall -> UpdateReadyContent(
+                        onInstallClick = { component.installApk(currentState.filePath) }
+                    )
+
+                    is UpdateState.Error -> UpdateErrorContent(
+                        message = currentState.message,
+                        onRetryClick = { component.checkUpdates() }
+                    )
+
+                    is UpdateState.UpToDate -> {
+                        UpdateFinishedContent(onSkip = { component.reset() })
                    }
+
+                    is UpdateState.Completed -> {
+                        UpdateFinishedContent(
+                            Res.string.updater_title_completed,
+                            onSkip = { component.reset() }
+                        )
+                    }
+
+                    else -> Unit
                }
            }
        )
@@ -138,7 +134,10 @@ private fun UpdateAvailableContent(
            )
        }
        Button(onClick = onDownloadClick, modifier = Modifier.fillMaxWidth()) {
-            Text(stringResource(Res.string.updater_btn_download), style = MaterialTheme.typography.labelLarge)
+            Text(
+                stringResource(Res.string.updater_btn_download),
+                style = MaterialTheme.typography.labelLarge
+            )
        }
    }
 }
@@ -153,10 +152,19 @@ private fun UpdatePermissionContent(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.spacedBy(16.dp)
    ) {
-        Text(text = stringResource(Res.string.updater_title_permission), style = MaterialTheme.typography.titleLarge)
-        Text(text = stringResource(Res.string.updater_desc_permission), style = MaterialTheme.typography.bodyMedium)
+        Text(
+            text = stringResource(Res.string.updater_title_permission),
+            style = MaterialTheme.typography.titleLarge
+        )
+        Text(
+            text = stringResource(Res.string.updater_desc_permission),
+            style = MaterialTheme.typography.bodyMedium
+        )
        Button(onClick = onGrantClick, modifier = Modifier.fillMaxWidth()) {
-            Text(stringResource(Res.string.updater_btn_grant), style = MaterialTheme.typography.labelLarge)
+            Text(
+                stringResource(Res.string.updater_btn_grant),
+                style = MaterialTheme.typography.labelLarge
+            )
        }
    }
 }
@@ -173,14 +181,21 @@ private fun UpdateDownloadingContent(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.spacedBy(16.dp)
    ) {
-        Text(text = stringResource(Res.string.updater_title_downloading), style = MaterialTheme.typography.titleMedium)
+        Text(
+            text = stringResource(Res.string.updater_title_downloading),
+            style = MaterialTheme.typography.titleMedium
+        )
        LinearProgressIndicator(progress = { progress }, modifier = Modifier.fillMaxWidth())

        val downloadedMb = ((downloadedBytes / (1024f * 1024f)) * 10).toInt() / 10.0
        val totalMb = ((totalBytes / (1024f * 1024f)) * 10).toInt() / 10.0

        Text(
-            text = stringResource(Res.string.updater_download_progress, downloadedMb.toString(), totalMb.toString()),
+            text = stringResource(
+                Res.string.updater_download_progress,
+                downloadedMb.toString(),
+                totalMb.toString()
+            ),
            style = MaterialTheme.typography.bodySmall
        )
    }
@@ -196,9 +211,15 @@ private fun UpdateReadyContent(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.spacedBy(16.dp)
    ) {
-        Text(text = stringResource(Res.string.updater_title_ready), style = MaterialTheme.typography.titleLarge)
+        Text(
+            text = stringResource(Res.string.updater_title_ready),
+            style = MaterialTheme.typography.titleLarge
+        )
        Button(onClick = onInstallClick, modifier = Modifier.fillMaxWidth()) {
-            Text(stringResource(Res.string.updater_btn_install), style = MaterialTheme.typography.labelLarge)
+            Text(
+                stringResource(Res.string.updater_btn_install),
+                style = MaterialTheme.typography.labelLarge
+            )
        }
    }
 }
@@ -216,7 +237,10 @@ private fun UpdateFinishedContent(
    ) {
        Text(text = stringResource(text), style = MaterialTheme.typography.titleLarge)
        Button(onClick = onSkip, modifier = Modifier.fillMaxWidth()) {
-            Text(stringResource(Res.string.updater_btn_close), style = MaterialTheme.typography.labelLarge)
+            Text(
+                stringResource(Res.string.updater_btn_close),
+                style = MaterialTheme.typography.labelLarge
+            )
        }
    }
 }
@@ -232,10 +256,17 @@ private fun UpdateErrorContent(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.spacedBy(16.dp)
    ) {
-        Text(text = stringResource(Res.string.updater_title_error), style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.error)
+        Text(
+            text = stringResource(Res.string.updater_title_error),
+            style = MaterialTheme.typography.titleLarge,
+            color = MaterialTheme.colorScheme.error
+        )
        Text(text = message, style = MaterialTheme.typography.bodyMedium)
        Button(onClick = onRetryClick, modifier = Modifier.fillMaxWidth()) {
-            Text(stringResource(Res.string.updater_btn_retry), style = MaterialTheme.typography.labelLarge)
+            Text(
+                stringResource(Res.string.updater_btn_retry),
+                style = MaterialTheme.typography.labelLarge
+            )
        }
    }
 }