From 8fda31249232cb6e89e78875c41d0afd24b9f377 Mon Sep 17 00:00:00 2001 From: "fernandotocas.23" Date: Thu, 23 Oct 2025 12:41:12 +0200 Subject: [PATCH 1/4] Avanzando hasta el paso 9, a la espera de que seguir con el InputDemoScreen --- app/src/main/AndroidManifest.xml | 2 - .../es/fpsumma/dam2/intro/MainActivity.kt | 6 +-- .../dam2/intro/ui/screens/CounterScreen.kt | 40 ++++++++++++++----- .../dam2/intro/ui/screens/InputDemoScreen.kt | 2 +- app/src/main/res/values/strings.xml | 4 +- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2db82a3..484d473 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,14 +7,12 @@ android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Intro"> diff --git a/app/src/main/java/es/fpsumma/dam2/intro/MainActivity.kt b/app/src/main/java/es/fpsumma/dam2/intro/MainActivity.kt index 0462544..227c366 100644 --- a/app/src/main/java/es/fpsumma/dam2/intro/MainActivity.kt +++ b/app/src/main/java/es/fpsumma/dam2/intro/MainActivity.kt @@ -14,14 +14,14 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - IntroTheme(){ + IntroTheme() { Surface( modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background ) { CounterScreen() } - } + } } } -} +} \ No newline at end of file diff --git a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt index 404c688..0b64944 100644 --- a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt +++ b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt @@ -1,10 +1,12 @@ package es.fpsumma.dam2.intro.ui.screens +import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.* +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -12,29 +14,30 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.graphics.Color @Composable fun CounterScreen() { - var count by remember { mutableStateOf(0) } + var count by remember { mutableStateOf(5) } Column( modifier = Modifier .fillMaxSize() - .padding(24.dp), + .padding(25.dp), horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(16.dp) + verticalArrangement = Arrangement.spacedBy(25.dp) ) { - Text("Hola mi amig@!", style = MaterialTheme.typography.headlineMedium) + Text("Buenos días", style = MaterialTheme.typography.headlineMedium) Text("Contador: $count", style = MaterialTheme.typography.titleLarge) - Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(25.dp)) { Button( - onClick = {}, + onClick = {if (count < 10) count ++}, modifier = Modifier.semantics { contentDescription = "Incrementar" } ) { Text("+1") } FilledTonalButton( - onClick = {}, + onClick = {if (count > 0) count--}, modifier = Modifier.semantics { contentDescription = "Decrementar" } ) { Text("-1") } @@ -42,14 +45,33 @@ fun CounterScreen() { onClick = {}, modifier = Modifier.size(48.dp) ) { - Icon(Icons.Outlined.Refresh, contentDescription = "Reiniciar contador") + Icon(Icons.Outlined.Refresh, contentDescription = "Reiniciar Contador") + } + + Column { + Box( + modifier = Modifier + .size(width = 75.dp, height = 30.dp) + ) { + Surface (color = Color.Green) { + Text("Saludar") + } + } } } } } +/*fun Saludar (name: saludo, modifier:modifier = Modifier + .size(width = 75.dp, height = 30.dp) + .background(Color.Green) { + Text( + text = "Hola Amig@!", + + } +*/ @Preview(showBackground = true) @Composable private fun CounterPreview() { CounterScreen() -} +} \ No newline at end of file diff --git a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/InputDemoScreen.kt b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/InputDemoScreen.kt index c11ccc9..7f00b7e 100644 --- a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/InputDemoScreen.kt +++ b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/InputDemoScreen.kt @@ -62,4 +62,4 @@ fun InputDemoScreen() { @Preview(showBackground = true) @Composable -private fun InputDemoPreview() { InputDemoScreen() } +private fun InputDemoPreview() { InputDemoScreen() } \ 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 656572b..db40430 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ - Intro + text_string \ No newline at end of file From 44399392e4a70dd6630be5249857f82d35e1bf5f Mon Sep 17 00:00:00 2001 From: "fernandotocas.23" Date: Thu, 23 Oct 2025 13:08:51 +0200 Subject: [PATCH 2/4] Commit: Nueva rama Pull Requets --- .../dam2/intro/ui/screens/CounterScreen.kt | 15 ++++++++++++--- app/src/main/res/values/strings.xml | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt index 0b64944..738c75a 100644 --- a/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt +++ b/app/src/main/java/es/fpsumma/dam2/intro/ui/screens/CounterScreen.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Refresh - import androidx.compose.material3.* import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.* @@ -15,6 +14,8 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.graphics.Color +import android.widget.Button +import android.widget.TextView @Composable @@ -47,8 +48,13 @@ fun CounterScreen() { ) { Icon(Icons.Outlined.Refresh, contentDescription = "Reiniciar Contador") } + val textView = equals(r.values.textView) + val button = equals