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..9b7d0ed 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 @@ -3,38 +3,40 @@ package es.fpsumma.dam2.intro.ui.screens 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 +import androidx.compose.ui.res.stringResource 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 es.fpsumma.dam2.intro.R +import androidx.compose.ui.graphics.Color @Composable fun CounterScreen() { - var count by remember { mutableStateOf(0) } - + var count by remember { mutableStateOf(5) } + var BigButton = (100 + count * 100).dp 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(text = stringResource(id = R.string.texto)) 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 +44,22 @@ fun CounterScreen() { onClick = {}, modifier = Modifier.size(48.dp) ) { - Icon(Icons.Outlined.Refresh, contentDescription = "Reiniciar contador") + Icon(Icons.Outlined.Refresh, contentDescription = "Reiniciar Contador") } + + Button( + onClick = { count = 10}, + colors = ButtonDefaults.buttonColors(containerColor = Color.Green, // Color de fondo del botón + ), + modifier = Modifier.width(BigButton).semantics() { contentDescription = "Creciente y decreciente" } + ) { Text("") } } } } + @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/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..077d0cd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,5 +1,5 @@ - + #FFBB86FC #FF6200EE #FF3700B3 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 656572b..3fb49a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ - - Intro + + Introducción + Hola mi amig@ \ No newline at end of file