From c5a401c1e5808531beb20581ea898e7a994e2791 Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Thu, 8 Aug 2024 14:22:16 +0200 Subject: [PATCH] make it translatable and add a notice that you can't rent --- .../activity/dashboard/screen/Instances.kt | 39 +++++++++++++++---- app/src/main/res/values-pl/strings.xml | 7 +++- app/src/main/res/values/strings.xml | 3 ++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/m724/vastapp/activity/dashboard/screen/Instances.kt b/app/src/main/java/eu/m724/vastapp/activity/dashboard/screen/Instances.kt index 8b50d87..30e0d5d 100644 --- a/app/src/main/java/eu/m724/vastapp/activity/dashboard/screen/Instances.kt +++ b/app/src/main/java/eu/m724/vastapp/activity/dashboard/screen/Instances.kt @@ -2,7 +2,6 @@ package eu.m724.vastapp.activity.dashboard.screen import androidx.activity.ComponentActivity import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ContextualFlowRow import androidx.compose.foundation.layout.ExperimentalLayoutApi @@ -80,15 +79,19 @@ fun InstancesScreen(dashboardViewModel: DashboardViewModel) { ) } } else { - Box( + Column( modifier = Modifier .fillMaxWidth() .height(100.dp), - contentAlignment = Alignment.Center + verticalArrangement = Arrangement.Bottom, + horizontalAlignment = Alignment.CenterHorizontally ) { Text( text = stringResource(id = R.string.no_instances) ) + Text( + text = stringResource(id = R.string.rent_on_website) + ) } } } @@ -221,12 +224,34 @@ fun InstanceDeleteDialog( AlertDialog( onDismissRequest = { onClose() }, confirmButton = { - TextButton(onClick = { onConfirm() }) { Text("Confirm") } + TextButton( + onClick = { onConfirm() } + ) { + Text("Confirm") + } }, dismissButton = { - TextButton(onClick = { onClose() }) { Text("Dismiss") } + TextButton( + onClick = { onClose() } + ) { + Text("Dismiss") + } + }, + title = { + Text( + text = stringResource( + id = R.string.instance_confirm_delete + ) + ) + }, + text = { + Text( + text = stringResource( + id = R.string.instance_confirm_delete_text, + instance.rentalId, + instance.getName() + ) + ) }, - title = { Text("Really delete instance?") }, - text = { Text("Instance #${instance.rentalId} (${instance.getName()})") }, ) } \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7d3655a..5eaa220 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4,7 +4,7 @@ Logowanie Kokpit Płatności - Maszyny + Instancje Pomoc Bilans Witaj %1$s! @@ -27,7 +27,10 @@ Termux nie jest skonfigurowany pod działanie z innymi aplikacjami. Otwórz instrukcje na github.com Wystąpił błąd: - Nie wynajmujesz żadnych maszyn + Nie wynajmujesz żadnych instancji (kiedyś to będzie tutaj) Brakuje klienta SSH na Termux + Jeszcze nie możesz wynajmować z tej aplikacji + Potwierdź usunięcie + Instancja #%1$d (%2$s) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f66e36..a863434 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,4 +31,7 @@ (this will be a webview) You are not renting any instances Missing SSH client on Termux + You can\'t rent from this app yet + Confirm deletion + Instance #%1$d (%2$s) \ No newline at end of file