Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/values/strings.xml
This commit is contained in:
sebastiancc27 2024-04-20 15:08:52 -06:00
commit e72b9a70b0
7 changed files with 195 additions and 7 deletions

View File

@ -15,6 +15,12 @@
<activity
android:name=".IniciarSesionActivity"
android:exported="false" />
<activity
android:name=".EliminarActivity"
android:exported="false" />
<activity
android:name=".AgregarActivity"
android:exported="false" />
<activity
android:name=".ModificarActivity"
android:exported="false" />

View File

@ -0,0 +1,15 @@
package com.terratenientes.medicalhealth
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
class AgregarActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_agregar_paciente)
}
}

View File

@ -0,0 +1,15 @@
package com.terratenientes.medicalhealth
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
class EliminarActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_eliminar_paciente)
}
}

View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".AgregarActivity">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textSize="32dp"
android:textStyle="bold"
android:textColor="@color/tv_titulo"
android:text="@string/tv_agregar_paciente_titulo"
android:gravity="center"
/>
<ImageView
android:layout_width="200dp"
android:layout_height="150dp"
android:layout_marginTop="25dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/image_area"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:orientation="horizontal"
tools:ignore="ExtraText">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:text="@string/et_modificar_edad"/>
<EditText
android:layout_width="51dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="30dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:text="@string/et_modificar_sexo" />
<Spinner
android:layout_width="109dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="50dp" />
</LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:hint="@string/ht_nombre"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:hint="@string/ht_apellido_paterno"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:hint="@string/ht_apellido_materno"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:hint="@string/ht_domicilio"/>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="50dp"
android:text="@string/bt_agregar" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bt_cancelar"
android:layout_marginTop="5dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"/>
</LinearLayout>

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".EliminarActivity">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textSize="32dp"
android:textStyle="bold"
android:textColor="@color/tv_titulo"
android:text="@string/eliminar_paciente_titulo"
android:gravity="center"
/>
<ListView
android:layout_width="match_parent"
android:layout_height="195dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="5dp" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="50dp"
android:text="@string/bt_eliminar" />
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bt_cancelar"
android:layout_marginTop="5dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"/>
</LinearLayout>

View File

@ -36,6 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="65dp"
android:text="@string/et_modificar_edad"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@ -9,11 +9,9 @@
<string name="ht_apellido_materno">Apellido Materno</string>
<string name="ht_domicilio">Domicilio</string>
<string name="bt_modificar">Modificar</string>
<!--Activity Main -> Iniciar Sesión-->
<string name="activity_iniciar_sesion_titulo">Iniciar Sesión</string>
<string name="et_usuario">Usuario</string>
<string name="et_contrasena">Contraseña</string>
<string name="txt_registrarme">Registrarme</string>
<string name="btn_iniciar_sesion">Iniciar Sesión</string>
<string name="tv_agregar_paciente_titulo">Agrega un paciente</string>
<string name="bt_agregar">Confirmar</string>
<string name="bt_cancelar">Cancelar</string>
<string name="eliminar_paciente_titulo">Elimina a un paciente</string>
<string name="bt_eliminar">Confirmar</string>
</resources>