From 288b88cec9a6c791fe7d719662d362566a3e4eea Mon Sep 17 00:00:00 2001
From: Guillerius5 <guillerhamel@gmail.com>
Date: Tue, 11 Nov 2025 14:12:35 +0100
Subject: [PATCH 1/3] primer commit

---
 .idea/gradle.xml                              |   1 +
 .idea/inspectionProfiles/Project_Default.xml  |  61 ++++++++++
 .idea/misc.xml                                |   1 -
 app/build.gradle.kts                          |   2 +
 .../myapplication/ui/navigation/AppNavHost.kt |   4 +
 .../myapplication/ui/navigation/Routes.kt     |   2 +
 .../screens/editprofile/EditProfileScreen.kt  | 106 +++++++++++++++++-
 .../ui/screens/home/HomeScreen.kt             |  67 +++++++++++
 .../ui/screens/viewprofile/ProfileScreen.kt   |  45 ++++++--
 gradle/libs.versions.toml                     |   6 +
 10 files changed, 285 insertions(+), 10 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..7061a0d
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,61 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8cf3119..021e60e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,6 +48,8 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.graphics)
     implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.material3)
     val composeBom = platform("androidx.compose:compose-bom:2025.10.01")
     val room_version = "2.8.3"
     val nav_version = "2.9.6"
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
index a47203b..ad2db00 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
@@ -12,5 +12,9 @@ import es.fpsumma.dam2.myapplication.ui.screens.viewprofile.ViewProfileScreen
 fun AppNavHost(navController: NavHostController) {
     NavHost(navController = navController, startDestination = Routes.HOME) {
         composable(Routes.HOME) { HomeScreen(navController) }
+        composable(Routes.PROFILE) { ViewProfileScreen(navController) }
+        composable(Routes.EDITPROFILE) { EditProfileScreen(navController) }
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/Routes.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/Routes.kt
index 9204b64..ee50859 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/Routes.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/Routes.kt
@@ -2,4 +2,6 @@ package es.fpsumma.dam2.myapplication.ui.navigation
 
 object Routes {
     const val HOME = "home"
+    const val PROFILE= "profile"
+    const val EDITPROFILE="editprofile"
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
index fdc822c..1f30fb9 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
@@ -1,11 +1,115 @@
 package es.fpsumma.dam2.myapplication.ui.screens.editprofile
 
+import android.R
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.modifier.modifierLocalOf
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import es.fpsumma.dam2.myapplication.state.ProfileState.correo
+import es.fpsumma.dam2.myapplication.state.ProfileState.formacion
+import es.fpsumma.dam2.myapplication.state.ProfileState.nombre
+import es.fpsumma.dam2.myapplication.state.ProfileState.profesion
+import es.fpsumma.dam2.myapplication.state.ProfileState.telefono
+import es.fpsumma.dam2.myapplication.state.ProfileState.ubicacion
+import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EditProfileScreen(navController: NavController) {
 
-}
\ No newline at end of file
+    var variableTexto by rememberSaveable { mutableStateOf("") }
+
+
+
+        Column(
+
+
+        ) {
+            OutlinedTextField(
+                value = nombre,
+                onValueChange = { nuevoTexto -> nombre = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("Nombre Completo")
+                }
+
+            )
+            OutlinedTextField(
+                value = profesion,
+                onValueChange = { nuevoTexto -> profesion = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("Profesion")
+                }
+
+            )
+            OutlinedTextField(
+                value = correo,
+                onValueChange = { nuevoTexto -> correo = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("Correo electronico")
+                }
+
+            )
+
+            OutlinedTextField(
+                value = telefono,
+                onValueChange = { nuevoTexto -> telefono = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("telefono")
+                }
+
+            )
+
+            OutlinedTextField(
+                value =  ubicacion,
+                onValueChange = { nuevoTexto -> ubicacion = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("ubicacion")
+                },
+                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
+
+            )
+
+            OutlinedTextField(
+                value = formacion,
+                onValueChange = { nuevoTexto -> formacion = nuevoTexto },
+                modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+                label = {
+                    Text("Formacion academica")
+                }
+
+            )
+
+            Button(
+                onClick = {navController.navigate(Routes.PROFILE)},
+                modifier = Modifier.padding(start = 300.dp).padding(top = 30.dp)
+            ){
+                Text("Guardar")
+            }
+
+        }
+    }
+
+
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
index e81b8c0..eb671fb 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
@@ -1,12 +1,79 @@
 package es.fpsumma.dam2.myapplication.ui.screens.home
 
+
+import android.R
+import android.R.attr.enabled
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.Label
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.internal.isLiveLiteralsEnabled
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 
 // ui/screens/home/HomeScreen.kt
 
+
+
 @Composable
 fun HomeScreen(navController: NavController) {
 
+    Column {
+
+       Text(
+           text="Hola,usuario!",
+           fontWeight = FontWeight.Bold,
+           fontSize = 40.sp,
+           modifier =Modifier.padding(top = 50.dp).padding(start=20.dp).padding(end = 20.dp)
+       )
+
+        Text(
+
+            text=("Esta es tu pantalla de inicio.Desde aqui puedes acceder a diferentes acciones"),
+            modifier =Modifier.padding(top = 50.dp).padding(start=20.dp).padding(end = 20.dp)
+        )
+
+
+        Card(modifier = Modifier.padding(start=20.dp).padding(end=20.dp).padding(top = 50.dp))
+
+        {
+
+            Text(
+                text="¿Sabias que ...?",
+                fontWeight = FontWeight.Bold
+            )
+            Text("Puedes navegar entre pantallas usando el NavController en compose.¡Explora abajo!")
+
+        }
+
+        Button(
+            onClick={ navController.navigate(Routes.PROFILE) },
+            modifier= Modifier.fillMaxWidth().padding(top=30.dp).padding(start=20.dp).padding(end = 20.dp)
+
+            ) {
+            Text("Ver Perfil")
+
+        }
+
+        Button(
+            onClick = {navController.navigate(Routes.EDITPROFILE)},
+            modifier= Modifier.fillMaxWidth().padding(top=30.dp).padding(start=20.dp).padding(end = 20.dp)
+        ){
+            Text("Configuracion")
+        }
+
+
+
+
+
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
index 9ec0743..31ac3d6 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
@@ -1,23 +1,52 @@
 package es.fpsumma.dam2.myapplication.ui.screens.viewprofile
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.R
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
+import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 import es.fpsumma.dam2.myapplication.ui.theme.MyApplicationTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ViewProfileScreen(navController: NavController) {
 
-}
+    Column {
 
-@Preview(showBackground = true)
-@Composable
-fun ProfileScreenPreview() {
-    val navController = rememberNavController()
-    MyApplicationTheme {
-        ViewProfileScreen(navController)
+        Image(
+            // 💡 Aquí usas R.drawable.avatar
+            painter = painterResource(id = R.drawable.avatar),
+            contentDescription = "Foto de perfil de Juan Pérez",
+            modifier = Modifier
+                .size(120.dp)
+                .clip(CircleShape)
+            // Puedes añadir .border si quieres el anillo
+        )
+
+        Button(
+            onClick = { navController.navigate(Routes.EDITPROFILE) },
+            modifier = Modifier.fillMaxWidth().padding(top = 60.dp).padding(start = 60.dp)
+                .padding(end = 60.dp)
+
+        ) {
+            Text("editar perfil")
+        }
+    }
     }
-}
\ No newline at end of file
+
+
+
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 53c8f83..ab61a96 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,9 @@ lifecycleRuntimeKtx = "2.9.4"
 activityCompose = "1.11.0"
 composeBom = "2024.09.00"
 navigationCompose = "2.9.5"
+runtime = "1.9.4"
+navigationComposeVersion = "2.9.6"
+material3 = "1.4.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -32,6 +35,9 @@ androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-
 androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "runtime" }
+navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationComposeVersion" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

From 3a485421375bd6bd6d7ba8285b5e122aa620d6a6 Mon Sep 17 00:00:00 2001
From: Guillerius5 <guillerhamel@gmail.com>
Date: Tue, 11 Nov 2025 23:40:09 +0100
Subject: [PATCH 2/3] commit en casa1

---
 .../dam2/myapplication/MainActivity.kt        |  2 +-
 .../myapplication/ui/navigation/AppNavHost.kt |  6 ++-
 .../screens/editprofile/EditProfileScreen.kt  |  2 +-
 .../ui/screens/home/HomeScreen.kt             |  2 +-
 .../ui/screens/viewprofile/ProfileScreen.kt   | 43 +++++++++++++------
 .../dam2/myapplication/ui/theme/Theme.kt      |  2 +-
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/MainActivity.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/MainActivity.kt
index 11e1476..b363e4c 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/MainActivity.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/MainActivity.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.compose.rememberNavController
 import es.fpsumma.dam2.myapplication.ui.navigation.AppNavHost
 import es.fpsumma.dam2.myapplication.ui.theme.MyApplicationTheme
-
+import es.fpsumma.dam2.myapplication.R
 class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
index ad2db00..ae5c8f1 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
@@ -1,6 +1,7 @@
 package es.fpsumma.dam2.myapplication.ui.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -10,9 +11,12 @@ import es.fpsumma.dam2.myapplication.ui.screens.viewprofile.ViewProfileScreen
 
 @Composable
 fun AppNavHost(navController: NavHostController) {
+
+    val nombreState=remember{ mutableStateOf("") }
+
     NavHost(navController = navController, startDestination = Routes.HOME) {
         composable(Routes.HOME) { HomeScreen(navController) }
-        composable(Routes.PROFILE) { ViewProfileScreen(navController) }
+        composable(Routes.PROFILE) { ViewProfileScreen(navController ) }
         composable(Routes.EDITPROFILE) { EditProfileScreen(navController) }
 
 
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
index 1f30fb9..36795ae 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
@@ -35,7 +35,7 @@ import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 @Composable
 fun EditProfileScreen(navController: NavController) {
 
-    var variableTexto by rememberSaveable { mutableStateOf("") }
+    var nombreState by rememberSaveable { mutableStateOf("") }
 
 
 
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
index eb671fb..4ef5590 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 
-// ui/screens/home/HomeScreen.kt
+
 
 
 
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
index 31ac3d6..612d0d6 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
@@ -1,39 +1,52 @@
 package es.fpsumma.dam2.myapplication.ui.screens.viewprofile
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.R
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
+import es.fpsumma.dam2.myapplication.R
 import es.fpsumma.dam2.myapplication.ui.navigation.Routes
-import es.fpsumma.dam2.myapplication.ui.theme.MyApplicationTheme
+import es.fpsumma.dam2.myapplication.ui.theme.Pink40
 
+
+val avatarId = R.drawable.avatar
+val rosa=Pink40
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
+
+
 fun ViewProfileScreen(navController: NavController) {
 
-    Column {
+    Column(
+        modifier= Modifier
+            .fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {6
+
 
         Image(
-            // 💡 Aquí usas R.drawable.avatar
-            painter = painterResource(id = R.drawable.avatar),
-            contentDescription = "Foto de perfil de Juan Pérez",
-            modifier = Modifier
+            painter = painterResource(id=R.drawable.avatar),
+            contentDescription = ("Avatar de usuario"),
+            contentScale = ContentScale.Crop,
+            modifier=Modifier
                 .size(120.dp)
-                .clip(CircleShape)
-            // Puedes añadir .border si quieres el anillo
+        )
+
+        Text(
+            text = (nombre),
+            color =rosa
         )
 
         Button(
@@ -44,8 +57,12 @@ fun ViewProfileScreen(navController: NavController) {
         ) {
             Text("editar perfil")
         }
+
+        }
+
+
     }
-    }
+
 
 
 
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/theme/Theme.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/theme/Theme.kt
index 17d1017..2f809c7 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/theme/Theme.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/theme/Theme.kt
@@ -10,7 +10,7 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-
+import es.fpsumma.dam2.myapplication.R
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
     secondary = PurpleGrey80,

From f49c9d8d8374ae0aa6cde780be2a22f223b910b2 Mon Sep 17 00:00:00 2001
From: Guillerius5 <guillerhamel@gmail.com>
Date: Thu, 13 Nov 2025 10:16:12 +0100
Subject: [PATCH 3/3] trabajo terminado

---
 .../myapplication/ui/navigation/AppNavHost.kt |   2 +-
 .../screens/editprofile/EditProfileScreen.kt  | 123 +++++++++++++++---
 .../ui/screens/home/HomeScreen.kt             |   6 -
 .../ui/screens/viewprofile/ProfileScreen.kt   | 101 +++++++++++++-
 4 files changed, 198 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
index ae5c8f1..0cf5ad6 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/navigation/AppNavHost.kt
@@ -12,7 +12,7 @@ import es.fpsumma.dam2.myapplication.ui.screens.viewprofile.ViewProfileScreen
 @Composable
 fun AppNavHost(navController: NavHostController) {
 
-    val nombreState=remember{ mutableStateOf("") }
+
 
     NavHost(navController = navController, startDestination = Routes.HOME) {
         composable(Routes.HOME) { HomeScreen(navController) }
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
index 36795ae..3822be7 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/editprofile/EditProfileScreen.kt
@@ -1,25 +1,18 @@
 package es.fpsumma.dam2.myapplication.ui.screens.editprofile
 
-import android.R
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState // Importar para el scroll
+import androidx.compose.foundation.verticalScroll // Importar para el scroll
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TopAppBar
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.* // Usar * para TopAppBar, Scaffold, Icon, IconButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
+// ... (Otros imports que ya tenías)
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.modifier.modifierLocalOf
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
@@ -31,85 +24,173 @@ import es.fpsumma.dam2.myapplication.state.ProfileState.telefono
 import es.fpsumma.dam2.myapplication.state.ProfileState.ubicacion
 import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 
+
+
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EditProfileScreen(navController: NavController) {
 
-    var nombreState by rememberSaveable { mutableStateOf("") }
-
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text("Editar Perfil") },
+                // Botón de Volver Atrás
+                navigationIcon = {
+                    IconButton(onClick = { navController.popBackStack() }) {
+                        Icon(
+                            imageVector = Icons.Filled.ArrowBack,
+                            contentDescription = "Volver Atrás"
+                        )
+                    }
+                }
+            )
+        }
+    ) { paddingValues ->
 
 
         Column(
 
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState()),
+            horizontalAlignment = Alignment.CenterHorizontally
+        )  {
 
-        ) {
             OutlinedTextField(
+
                 value = nombre,
+
                 onValueChange = { nuevoTexto -> nombre = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("Nombre Completo")
+
                 }
 
+
+
             )
+
             OutlinedTextField(
+
                 value = profesion,
+
                 onValueChange = { nuevoTexto -> profesion = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("Profesion")
+
                 }
 
+
+
             )
+
             OutlinedTextField(
+
                 value = correo,
+
                 onValueChange = { nuevoTexto -> correo = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("Correo electronico")
+
                 }
 
+
+
             )
 
+
+
             OutlinedTextField(
+
                 value = telefono,
+
                 onValueChange = { nuevoTexto -> telefono = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("telefono")
+
                 }
 
+
+
             )
 
+
+
             OutlinedTextField(
-                value =  ubicacion,
+
+                value = ubicacion,
+
                 onValueChange = { nuevoTexto -> ubicacion = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("ubicacion")
+
                 },
-                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
+
+                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email)
+
+
 
             )
 
+
+
             OutlinedTextField(
+
                 value = formacion,
+
                 onValueChange = { nuevoTexto -> formacion = nuevoTexto },
+
                 modifier = Modifier.fillMaxWidth().padding(top =30.dp ).padding(start =20.dp).padding(end =20.dp ),
+
                 label = {
+
                     Text("Formacion academica")
+
                 }
 
+
+
             )
 
+
+
             Button(
+
                 onClick = {navController.navigate(Routes.PROFILE)},
+
                 modifier = Modifier.padding(start = 300.dp).padding(top = 30.dp)
+
             ){
+
                 Text("Guardar")
+
             }
 
-        }
-    }
 
 
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
index 4ef5590..5db8b72 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/home/HomeScreen.kt
@@ -1,8 +1,6 @@
 package es.fpsumma.dam2.myapplication.ui.screens.home
 
 
-import android.R
-import android.R.attr.enabled
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -11,7 +9,6 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.Label
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.internal.isLiveLiteralsEnabled
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -21,8 +18,6 @@ import es.fpsumma.dam2.myapplication.ui.navigation.Routes
 
 
 
-
-
 @Composable
 fun HomeScreen(navController: NavController) {
 
@@ -45,7 +40,6 @@ fun HomeScreen(navController: NavController) {
         Card(modifier = Modifier.padding(start=20.dp).padding(end=20.dp).padding(top = 50.dp))
 
         {
-
             Text(
                 text="¿Sabias que ...?",
                 fontWeight = FontWeight.Bold
diff --git a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
index 612d0d6..dc5a69a 100644
--- a/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
+++ b/app/src/main/java/es/fpsumma/dam2/myapplication/ui/screens/viewprofile/ProfileScreen.kt
@@ -2,11 +2,16 @@ package es.fpsumma.dam2.myapplication.ui.screens.viewprofile
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -14,15 +19,23 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import es.fpsumma.dam2.myapplication.R
+import es.fpsumma.dam2.myapplication.state.ProfileState.correo
+import es.fpsumma.dam2.myapplication.state.ProfileState.formacion
+import es.fpsumma.dam2.myapplication.state.ProfileState.nombre
+import es.fpsumma.dam2.myapplication.state.ProfileState.profesion
+import es.fpsumma.dam2.myapplication.state.ProfileState.telefono
+import es.fpsumma.dam2.myapplication.state.ProfileState.ubicacion
 import es.fpsumma.dam2.myapplication.ui.navigation.Routes
-import es.fpsumma.dam2.myapplication.ui.theme.Pink40
+import es.fpsumma.dam2.myapplication.ui.theme.Pink80
 
 
 val avatarId = R.drawable.avatar
-val rosa=Pink40
+val rosa= Pink80
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 
@@ -46,22 +59,98 @@ fun ViewProfileScreen(navController: NavController) {
 
         Text(
             text = (nombre),
-            color =rosa
+            color =rosa,
+            fontWeight = FontWeight.Bold,
+            fontSize = 30.sp
+
         )
 
+        Text(
+            text=(profesion),
+            )
+
+        Column(
+            modifier = Modifier.padding(start = 10.dp).padding(end = 10.dp)
+        ) {
+
+            Row()
+
+            {
+                Text(
+                    text = ("correo")
+                )
+                Spacer(modifier = Modifier.width(120.dp))
+                Text(
+                    text = (correo)
+                )
+            }
+
+            Row(
+
+            )
+
+            {
+                Text(
+                    text = ("telefono")
+                )
+                Spacer(modifier = Modifier.width(120.dp))
+                Text(
+                    text = (telefono)
+                )
+            }
+
+            Row()
+
+            {
+                Text(
+                    text = ("ubicacion")
+                )
+                Spacer(modifier = Modifier.width(120.dp))
+                Text(
+                    text = (ubicacion)
+                )
+            }
+
+            Row()
+
+            {
+                Text(
+                    text = ("formacion")
+                )
+                Spacer(modifier = Modifier.width(120.dp))
+                Text(
+                    text = (formacion)
+                )
+            }
+
+
+
+
+        }
+
+
+
         Button(
             onClick = { navController.navigate(Routes.EDITPROFILE) },
-            modifier = Modifier.fillMaxWidth().padding(top = 60.dp).padding(start = 60.dp)
-                .padding(end = 60.dp)
+            modifier = Modifier.fillMaxWidth().padding(top = 60.dp).padding(start = 120.dp)
+                .padding(end = 120.dp)
 
         ) {
             Text("editar perfil")
         }
 
+    }
+
+
+
+
+
+
+
         }
 
 
-    }
+