diff --git a/.github/dependabot.yml b/.github/dependabot.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
old mode 100755
new mode 100644
diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/.idea/.gitignore b/.idea/.gitignore
old mode 100755
new mode 100644
diff --git a/.idea/.name b/.idea/.name
old mode 100755
new mode 100644
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
old mode 100755
new mode 100644
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100755
index 7643783..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100755
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
old mode 100755
new mode 100644
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
old mode 100755
new mode 100644
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
old mode 100755
new mode 100644
index cb865f6..0897082
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
old mode 100755
new mode 100644
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
old mode 100755
new mode 100644
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
old mode 100755
new mode 100644
diff --git a/.idea/misc.xml b/.idea/misc.xml
old mode 100755
new mode 100644
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
old mode 100755
new mode 100644
index 35eb1dd..94a25f7
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/app/.gitignore b/app/.gitignore
old mode 100755
new mode 100644
diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs
old mode 100755
new mode 100644
diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs
old mode 100755
new mode 100644
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
old mode 100755
new mode 100644
diff --git a/app/src/androidTest/java/org/coderic/protective/mobile/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/coderic/protective/mobile/ExampleInstrumentedTest.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100755
new mode 100644
index 2e2373d..212de4e
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="org.coderic.protective.mobile.MainActivity" android:exported="true" />
+        <activity android:name="org.coderic.protective.mobile.MainActivity" android:exported="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/MainActivity.kt b/app/src/main/java/org/coderic/protective/mobile/MainActivity.kt
old mode 100755
new mode 100644
index 403472c..91305d5
--- a/app/src/main/java/org/coderic/protective/mobile/MainActivity.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/MainActivity.kt
@@ -14,17 +14,15 @@ import org.coderic.protective.mobile.model.Routes
 import org.coderic.protective.mobile.presentation.DashBoardScreen
 import org.coderic.protective.mobile.presentation.DeviceScreen
 import org.coderic.protective.mobile.presentation.LoadingScreen
-import org.coderic.protective.mobile.presentation.UpdatePetScreen
-import org.coderic.protective.mobile.presentation.components.MyBottomBar
+import org.coderic.protective.mobile.presentation.pet.PetScreen
 import org.coderic.protective.mobile.presentation.pet.PetViewModel
+import org.coderic.protective.mobile.presentation.components.BottomBar
 import org.coderic.protective.mobile.ui.theme.CocoAppTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val petViewModel = PetViewModel( this@MainActivity )
-
         setContent {
 
             CocoAppTheme {
@@ -35,7 +33,7 @@ class MainActivity : ComponentActivity() {
                         .fillMaxSize(),
                     contentColor = MaterialTheme.colorScheme.background,
                     bottomBar = {
-                        MyBottomBar( navController )
+                        BottomBar( navController )
                     }
                 ) { paddingValues ->
                     NavHost(
@@ -46,11 +44,7 @@ class MainActivity : ComponentActivity() {
                             DashBoardScreen(paddingValues = paddingValues, navController )
                         }
                         composable( Routes.MyPetScreen.route) {
-                            // PetScreen( paddingValues = paddingValues, petViewModel )
-                            UpdatePetScreen( petViewModel, paddingValues )
-                        }
-                        composable(Routes.MyUpdatePetScreen.route ) {
-                            UpdatePetScreen( petViewModel, paddingValues )
+                            PetScreen( paddingValues = paddingValues, PetViewModel() )
                         }
                         composable( Routes.ExploreScreen.route ) {
                             LoadingScreen(paddingValues = paddingValues )
diff --git a/app/src/main/java/org/coderic/protective/mobile/StartActivity.kt b/app/src/main/java/org/coderic/protective/mobile/StartActivity.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/data/Almacenamiento.kt b/app/src/main/java/org/coderic/protective/mobile/data/Almacenamiento.kt
deleted file mode 100755
index 9722a17..0000000
--- a/app/src/main/java/org/coderic/protective/mobile/data/Almacenamiento.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.coderic.protective.mobile.data
-
-import org.coderic.protective.mobile.model.datos.Device
-import org.coderic.protective.mobile.model.datos.Pet
-
-interface Almacenamiento {
-    fun savePet( pet: Pet )
-    fun saveDevice( device: Device )
-    fun getPet( id: Long ) : Pet?
-    fun getDevice() : Device
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/data/MacronutrientPreferences.kt b/app/src/main/java/org/coderic/protective/mobile/data/MacronutrientPreferences.kt
deleted file mode 100755
index 798bedd..0000000
--- a/app/src/main/java/org/coderic/protective/mobile/data/MacronutrientPreferences.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.coderic.protective.mobile.data
-
-import android.content.Context
-import android.content.SharedPreferences
-import org.coderic.protective.mobile.model.datos.Device
-import org.coderic.protective.mobile.model.datos.Gender
-import org.coderic.protective.mobile.model.datos.Pet
-import org.json.JSONObject
-
-const val ARCHIVE_PREFERENCE = "almacenamiento"
-class MacronutrientPreferences (context: Context ) : Almacenamiento {
-
-    private val preferences: SharedPreferences = context.getSharedPreferences( ARCHIVE_PREFERENCE, Context.MODE_PRIVATE )
-    override fun savePet( pet: Pet ) {
-        val editor = preferences.edit()
-        val petJson = JSONObject()
-            .put("name", pet.name)
-            .put("typePet", pet.typePet )
-            .put("age", pet.age )
-            .put("weight", pet.weight )
-            .put("height", pet.height )
-            .put("color", pet.color )
-            .put("description", pet.description )
-            .put("image", pet.image )
-            .put("id", pet.id )
-            .put("gender", pet.gender.type )
-        editor.putString("pet${pet.id}", petJson.toString() )
-        editor.apply()
-    }
-
-    override fun saveDevice( device: Device ) {
-        TODO("Not yet implemented")
-    }
-
-    override fun getPet(id: Long): Pet? {
-        val petString = preferences.getString("pet$id", "")
-        if (petString.equals("")) return null;
-        val petJSON = JSONObject(petString)
-
-        return Pet(
-            name = petJSON.getString("name"),
-            gender = if (petJSON.getInt("gender") == 0) Gender.MAN else Gender.FEMALE,
-            typePet = petJSON.getString("typePet"),
-            age = petJSON.getInt("age"),
-            weight = petJSON.getDouble("weight"),
-            height = petJSON.getInt("height"),
-            color = petJSON.getString("color"),
-            description = petJSON.getString("description"),
-            image = petJSON.getString("image"),
-            id = petJSON.getLong("id")
-        )
-    }
-
-    override fun getDevice(): Device {
-        return Device(
-            preferences.getString("device_name", "")!!,
-            false,
-            0
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/domain/CasosUsoMascota.kt b/app/src/main/java/org/coderic/protective/mobile/domain/CasosUsoMascota.kt
deleted file mode 100755
index 3529aab..0000000
--- a/app/src/main/java/org/coderic/protective/mobile/domain/CasosUsoMascota.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.coderic.protective.mobile.domain
-
-import android.content.Context
-import org.coderic.protective.mobile.data.Almacenamiento
-import org.coderic.protective.mobile.data.MacronutrientPreferences
-import org.coderic.protective.mobile.model.datos.Gender
-import org.coderic.protective.mobile.model.datos.Pet
-
-class CasosUsoMascota( context: Context ) {
-    val almacenamiento : Almacenamiento = MacronutrientPreferences( context )
-    fun guardarMascota( pet: Pet ) {
-        almacenamiento.savePet( pet )
-    }
-    fun getMascota( id: Long ) : Pet? {
-        val pet = almacenamiento.getPet( id )
-        return pet
-        /*if( pet == null ) {
-            return Pet(
-                name = "Bella",
-                typePet = "Border Collie",
-                gender = Gender.MAN,
-                age = 11,
-                weight = 7.5,
-                height = 54,
-                color = "Black",
-                description = "My first dog which was gifted by my mother for my 20th birthday."
-            )
-        }
-        else {
-            return pet
-        }*/
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/model/Routes.kt b/app/src/main/java/org/coderic/protective/mobile/model/Routes.kt
old mode 100755
new mode 100644
index f0ecb30..022360f
--- a/app/src/main/java/org/coderic/protective/mobile/model/Routes.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/model/Routes.kt
@@ -1,13 +1,12 @@
 package org.coderic.protective.mobile.model
 
 sealed class Routes( val route : String ) {
-    // Ruts de Start Activity
-    data object InicioSesion: Routes("inicio/inicio_sesion")
-    data object GetStarted: Routes("inicio/get_started")
-    // Ruts de MainActivity
-    data object MainScreen: Routes("main/home")
-    data object MyPetScreen: Routes("main/profile")
-    data object MyUpdatePetScreen : Routes("main/profile/update")
-    data object ExploreScreen: Routes("main/explore")
-    data object ManageScreen: Routes("main/manage")
+    // Rutas de Start Activity
+    object InicioSesion: Routes("inicio/inicio_sesion")
+    object GetStarted: Routes("inicio/get_started")
+    // Rutas de MainActivity
+    object MainScreen: Routes("main/home")
+    object MyPetScreen: Routes("main/profile")
+    object ExploreScreen: Routes("main/explore")
+    object ManageScreen: Routes("main/manage")
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/model/datos/Device.kt b/app/src/main/java/org/coderic/protective/mobile/model/datos/Device.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/model/datos/GeoPunto.kt b/app/src/main/java/org/coderic/protective/mobile/model/datos/GeoPunto.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/model/datos/Pet.kt b/app/src/main/java/org/coderic/protective/mobile/model/datos/Pet.kt
old mode 100755
new mode 100644
index 0234b3b..870c5cd
--- a/app/src/main/java/org/coderic/protective/mobile/model/datos/Pet.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/model/datos/Pet.kt
@@ -20,12 +20,11 @@ data class Pet(
     val gender: Gender = Gender.FEMALE,
     val typePet: String = "",
     var age : Int = 0,
-    var weight: Double = 0.0,
+    var weight: Float = 0f,
     var height: Int = 0,
     val color: String = "",
     var description: String = "",
-    var image: String = "",
-    val id: Long = System.currentTimeMillis()
+    var image: String = ""
 )
 /** Gender.
  * @author José Ricardo
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/DashBoardScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/DashBoardScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/DeviceScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/DeviceScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/HomeScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/HomeScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/LoadingScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/LoadingScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/UpdatePetScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/UpdatePetScreen.kt
deleted file mode 100755
index 810aea2..0000000
--- a/app/src/main/java/org/coderic/protective/mobile/presentation/UpdatePetScreen.kt
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.coderic.protective.mobile.presentation
-
-import android.widget.Toast
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.sharp.KeyboardArrowRight
-import androidx.compose.material3.Button
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import org.coderic.protective.mobile.R
-import org.coderic.protective.mobile.presentation.pet.PetViewModel
-import org.coderic.protective.mobile.ui.theme.PetCareContentText
-import org.coderic.protective.mobile.ui.theme.PetCareNumberField
-import org.coderic.protective.mobile.ui.theme.PetCareTextField
-import org.coderic.protective.mobile.ui.theme.PetCareTitleText
-import org.coderic.protective.mobile.ui.theme.seed
-
-@Composable
-fun UpdatePetScreen(petViewModel: PetViewModel, paddingValues: PaddingValues) {
-
-    var name by rememberSaveable { mutableStateOf("") }
-    val context = LocalContext.current
-
-    // TODO: Agregar Subida de imagenes.
-    var imageRoute by rememberSaveable { mutableStateOf("") }
-
-    Column(
-        modifier = Modifier
-            .padding(paddingValues)
-            .verticalScroll(rememberScrollState()),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        PetCareTitleText(text = "Registra tu perro", size = 36)
-        SectionFormName( text = stringResource(id = R.string.nameForm), name, R.string.nameFormPlaceholder ) {
-            name = it
-        }
-        SectionFormDescription()
-        SectionFormGender()
-        SectionFormData()
-        
-        Button(
-            modifier = Modifier.fillMaxSize(),
-            onClick = { Toast.makeText( context, "Hola $name", Toast.LENGTH_SHORT ).show() }
-        ) {
-            Text(text = "Guardar")
-        }
-    }
-}
-@Composable
-fun SectionFormGender() {
-    var selected by rememberSaveable { mutableIntStateOf(1) }
-    Card(
-        elevation = CardDefaults.cardElevation( 8.dp ),
-        modifier = Modifier
-            .padding(16.dp)
-            .fillMaxSize(),
-        colors = CardDefaults.cardColors(
-            containerColor = seed
-        )
-    ) {
-        Column(
-            modifier = Modifier.padding(8.dp)
-        ) {
-            PetCareTitleText(text = stringResource(id = R.string.genderForm), size = 24 )
-            Row( verticalAlignment = Alignment.CenterVertically ) {
-                RadioButton(selected = selected == 1, onClick = { selected = 1 } )
-                PetCareContentText(text = stringResource(id = R.string.man), size = 16)
-            }
-            Row( verticalAlignment = Alignment.CenterVertically ) {
-                RadioButton(selected = selected == 2, onClick = { selected = 2 } )
-                PetCareContentText(text = stringResource(id = R.string.female), size = 16)
-            }
-
-        }
-    }
-}
-@Composable
-fun SectionFormName(text: String, value: String, placeholder: Int, onChange: (String) -> Unit ) {
-    Card(
-        elevation = CardDefaults.cardElevation( 8.dp ),
-        modifier = Modifier.padding(16.dp)
-    ) {
-        Column(
-            modifier = Modifier.padding(8.dp)
-        ) {
-            PetCareTitleText(text = text, size = 24 )
-            Spacer(modifier = Modifier.height(8.dp))
-            PetCareTextField(value = value, placeholder = placeholder, imageVector = Icons.Filled.AccountCircle ) {
-                onChange( it )
-            }
-        }
-    }
-}
-@Composable
-fun SectionFormData() {
-
-    var age by rememberSaveable { mutableStateOf("") }
-    var height by rememberSaveable { mutableStateOf("") }
-    var weight by rememberSaveable { mutableStateOf("") }
-    var color by rememberSaveable { mutableStateOf("") }
-    var type by rememberSaveable { mutableStateOf("") }
-
-    Card(
-        elevation = CardDefaults.cardElevation( 8.dp ),
-        modifier = Modifier.padding(16.dp),
-        colors = CardDefaults.cardColors(
-            containerColor = MaterialTheme.colorScheme.secondaryContainer
-        )
-    ) {
-        Column(
-            modifier = Modifier.padding(8.dp)
-        ) {
-            PetCareTitleText(text = stringResource(id = R.string.titleForm), size = 24 )
-            Spacer(modifier = Modifier.height(8.dp))
-            Row(
-                verticalAlignment = Alignment.CenterVertically
-            ){
-                PetCareContentText(text = stringResource(id = R.string.ageForm), size = 16 )
-                PetCareNumberField(value = age, imageVector = Icons.Sharp.KeyboardArrowRight ) {
-                    age = it
-                }
-            }
-            Spacer(modifier = Modifier.height(8.dp))
-            Row (
-                verticalAlignment = Alignment.CenterVertically
-            ){
-                PetCareContentText(text = stringResource(id = R.string.weightForm), size = 16 )
-                PetCareNumberField(value = weight, imageVector = Icons.Sharp.KeyboardArrowRight ) {
-                    weight = it
-                }
-            }
-            Spacer(modifier = Modifier.height(8.dp))
-            Row (
-                verticalAlignment = Alignment.CenterVertically
-            ){
-                PetCareContentText(text = stringResource(id = R.string.heightForm), size = 16 )
-                PetCareNumberField(value = height, imageVector = Icons.Sharp.KeyboardArrowRight ) {
-                    height = it
-                }
-            }
-            Spacer(modifier = Modifier.height(8.dp))
-            Row (
-                verticalAlignment = Alignment.CenterVertically
-            ){
-                PetCareContentText(text = stringResource(id = R.string.colorForm), size = 16 )
-                PetCareTextField(value = color, imageVector = Icons.Sharp.KeyboardArrowRight ) {
-                    color = it
-                }
-            }
-            Spacer(modifier = Modifier.height(8.dp))
-            Row (
-                verticalAlignment = Alignment.CenterVertically
-            ){
-                PetCareContentText(text = stringResource(id = R.string.typeForm ), size = 16 )
-                PetCareTextField(value = type, imageVector = Icons.Sharp.KeyboardArrowRight ) {
-                    type = it
-                }
-            }
-        }
-    }
-}
-@Composable
-fun SectionFormDescription() {
-    var desc by rememberSaveable { mutableStateOf("") }
-    Card(
-        elevation = CardDefaults.cardElevation( 8.dp ),
-        modifier = Modifier.padding(16.dp)
-    ) {
-        Column(
-            modifier = Modifier.padding(8.dp)
-        ) {
-            PetCareTitleText(text = stringResource(id = R.string.descriptionForm), size = 24 )
-            Spacer(modifier = Modifier.height(8.dp))
-            PetCareTextField(value = desc, imageVector = Icons.Filled.Info ) {
-                desc = it
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/components/MyBottomBar.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/components/NavBar.kt
old mode 100755
new mode 100644
similarity index 98%
rename from app/src/main/java/org/coderic/protective/mobile/presentation/components/MyBottomBar.kt
rename to app/src/main/java/org/coderic/protective/mobile/presentation/components/NavBar.kt
index a3680ea..3cd3d81
--- a/app/src/main/java/org/coderic/protective/mobile/presentation/components/MyBottomBar.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/presentation/components/NavBar.kt
@@ -24,7 +24,7 @@ import org.coderic.protective.mobile.ui.theme.navColor
 import org.coderic.protective.mobile.ui.theme.selectedIconColor
 
 @Composable
-fun MyBottomBar( navController: NavHostController) {
+fun BottomBar( navController: NavHostController) {
     var screen by remember { mutableStateOf( 1 ) }
     NavigationBar (
         containerColor = navColor
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/getStarted/GetStartedScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/getStarted/GetStartedScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/getStarted/GetStartedViewModel.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/getStarted/GetStartedViewModel.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginScreen.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginViewModel.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginViewModel.kt
old mode 100755
new mode 100644
index 84fbdc0..51e975c
--- a/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginViewModel.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/presentation/login/LoginViewModel.kt
@@ -1,6 +1,5 @@
 package org.coderic.protective.mobile.presentation.login
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetScreen.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetScreen.kt
old mode 100755
new mode 100644
index 8232232..62f6f48
--- a/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetScreen.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material3.Button
@@ -27,6 +26,7 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -35,11 +35,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import org.coderic.protective.mobile.R
 import org.coderic.protective.mobile.ui.theme.PetCareContentText
 import org.coderic.protective.mobile.ui.theme.PetCareTitleText
+import org.coderic.protective.mobile.ui.theme.fredoka
 import org.coderic.protective.mobile.ui.theme.rosa
 import org.coderic.protective.mobile.ui.theme.seed
 import org.coderic.protective.mobile.ui.theme.text_desc_color
@@ -51,40 +54,8 @@ fun PetScreen( paddingValues: PaddingValues, petViewModel: PetViewModel) {
             .fillMaxSize()
             .padding(paddingValues)
     ) {
-        if( petViewModel.myPet != null ) {
-            ImageBanner()
-            BodyPetScreen(Modifier.align(Alignment.BottomCenter), petViewModel )
-        }
-        else {
-            NoPetScreen( paddingValues, petViewModel )
-        }
-    }
-}
-@Composable
-fun NoPetScreen(paddingValues: PaddingValues, petViewModel: PetViewModel) {
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(paddingValues),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center
-    ) {
-        Icon(painter = painterResource(id = R.drawable.sound_dog_icon), contentDescription = "Pet", Modifier.size(80.dp), tint = Color.Black)
-        PetCareTitleText(text = stringResource(id = R.string.addPet), 24)
-        Spacer(modifier = Modifier.height(16.dp))
-        Button(
-            modifier = Modifier
-                .fillMaxWidth(0.8f),
-            onClick = { petViewModel.btnAddPet() },
-            shape = RoundedCornerShape(10.dp),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = seed,
-                contentColor = Color.White
-            )
-        )  {
-            Icon( imageVector = Icons.Filled.Add, contentDescription = "Add" )
-            PetCareTitleText(text = stringResource(id = R.string.addBtn), 16, Color.White )
-        }
+        ImageBanner()
+        BodyPetScreen(Modifier.align(Alignment.BottomCenter), petViewModel )
     }
 }
 
@@ -117,12 +88,12 @@ fun BodyPetScreen( modifier: Modifier, petViewModel: PetViewModel ) {
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Column {
-                    PetCareTitleText( text = petViewModel.myPet!!.name, 24 )
+                    PetCareTitleText( text = petViewModel.myPet.name, 24 )
                     Spacer(modifier = Modifier.height(8.dp))
                     PetCareContentText (text = petViewModel.myPet.typePet, 16, text_desc_color )
                 }
                 Icon(
-                    painter = painterResource( id = petViewModel.myPet!!.gender.image ),
+                    painter = painterResource( id = petViewModel.myPet.gender.image ),
                     contentDescription = "Gender",
                     tint = Color.White,
                     modifier = Modifier
@@ -141,20 +112,20 @@ fun BodyPetScreen( modifier: Modifier, petViewModel: PetViewModel ) {
                 tint = Color.Black
             )
             Spacer(modifier = Modifier.width(8.dp))
-            PetCareTitleText(text = "About ${petViewModel.myPet!!.name}", size = 20)
+            PetCareTitleText(text = "About ${petViewModel.myPet.name}", size = 20)
         }
         Spacer(modifier = Modifier.height(16.dp))
         Row(
             Modifier.fillMaxWidth(),
             horizontalArrangement = Arrangement.SpaceBetween
         ) {
-            PetData(stringResource(id = R.string.date_age), "${petViewModel.myPet!!.age.toString()} days" )
-            PetData(stringResource(id = R.string.date_weight), "${petViewModel.myPet!!.weight.toString()} Kg")
-            PetData(stringResource(id = R.string.date_height), "${petViewModel.myPet!!.height.toString()} cm" )
-            PetData(stringResource(id = R.string.date_color), petViewModel.myPet!!.color )
+            PetData(stringResource(id = R.string.date_age), "${petViewModel.myPet.age.toString()} days" )
+            PetData(stringResource(id = R.string.date_weight), "${petViewModel.myPet.weight.toString()} Kg")
+            PetData(stringResource(id = R.string.date_height), "${petViewModel.myPet.height.toString()} cm" )
+            PetData(stringResource(id = R.string.date_color), petViewModel.myPet.color )
         }
         Spacer(modifier = Modifier.height(16.dp))
-        PetCareContentText(text = petViewModel.myPet!!.description, size = 16, color = Color.Gray, align = TextAlign.Start )
+        PetCareContentText(text = petViewModel.myPet.description, size = 16, color = Color.Gray, align = TextAlign.Start )
         Spacer(modifier = Modifier.height(24.dp))
         Row {
             Icon(
diff --git a/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetViewModel.kt b/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetViewModel.kt
old mode 100755
new mode 100644
index b24a7d8..414f895
--- a/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetViewModel.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/presentation/pet/PetViewModel.kt
@@ -1,16 +1,18 @@
 package org.coderic.protective.mobile.presentation.pet
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
-import org.coderic.protective.mobile.domain.CasosUsoMascota
 import org.coderic.protective.mobile.model.datos.Gender
 import org.coderic.protective.mobile.model.datos.Pet
 
-class PetViewModel( context: Context) : ViewModel() {
-    val casosUsoMascota = CasosUsoMascota( context )
-    val myPet = casosUsoMascota.getMascota( 1231 )
-
-    fun btnAddPet() {
-
-    }
+class PetViewModel : ViewModel() {
+    val myPet = Pet(
+        name = "Bella",
+        typePet = "Border Collie",
+        gender = Gender.MAN,
+        age = 11,
+        weight = 7.5f,
+        height = 54,
+        color = "Black",
+        description = "My first dog which was gifted by my mother for my 20th birthday."
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/coderic/protective/mobile/ui/theme/Color.kt b/app/src/main/java/org/coderic/protective/mobile/ui/theme/Color.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/ui/theme/Theme.kt b/app/src/main/java/org/coderic/protective/mobile/ui/theme/Theme.kt
old mode 100755
new mode 100644
diff --git a/app/src/main/java/org/coderic/protective/mobile/ui/theme/Type.kt b/app/src/main/java/org/coderic/protective/mobile/ui/theme/Type.kt
old mode 100755
new mode 100644
index 11032d5..f43811d
--- a/app/src/main/java/org/coderic/protective/mobile/ui/theme/Type.kt
+++ b/app/src/main/java/org/coderic/protective/mobile/ui/theme/Type.kt
@@ -2,10 +2,8 @@ package org.coderic.protective.mobile.ui.theme
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
@@ -20,7 +18,6 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -114,7 +111,7 @@ fun PetCareContentText( text: String, size: Int, color: Color, modifier: Modifie
     )
 }
 @Composable
-fun PetCareTextField(value: String, placeholder: Int = 0, imageVector: ImageVector, onValueChange: (String) -> Unit ) {
+fun PetCareTextField(value: String, placeholder: Int, imageVector: ImageVector, onValueChange: (String) -> Unit ) {
     TextField(
         modifier = Modifier
             .fillMaxWidth()
@@ -125,7 +122,7 @@ fun PetCareTextField(value: String, placeholder: Int = 0, imageVector: ImageVect
             Icon(imageVector = imageVector, contentDescription = "Email")
         },
         placeholder = {
-            PetCareContentText( text = if( placeholder != 0 ) stringResource(id = placeholder) else "", 16, color = Color.Gray )
+            PetCareContentText( text = stringResource(id = placeholder), 16, color = Color.Gray )
         },
         colors = TextFieldDefaults.colors(
             unfocusedIndicatorColor = Color.Transparent,
@@ -134,26 +131,4 @@ fun PetCareTextField(value: String, placeholder: Int = 0, imageVector: ImageVect
             unfocusedLeadingIconColor = Color.Gray
         )
     )
-}
-@Composable
-fun PetCareNumberField( value: String, imageVector: ImageVector, onValueChange: (String) -> Unit ) {
-    OutlinedTextField(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(10.dp)),
-        value = value,
-        onValueChange = { onValueChange(it) },
-        leadingIcon = {
-            Icon(imageVector = imageVector, contentDescription = "Email")
-        },
-        colors = TextFieldDefaults.colors(
-            unfocusedIndicatorColor = Color.Transparent,
-            focusedIndicatorColor = Color.Transparent,
-            unfocusedPlaceholderColor = Color.Gray,
-            unfocusedLeadingIconColor = Color.Gray
-        ),
-        keyboardOptions = KeyboardOptions(
-            keyboardType = KeyboardType.Number
-        )
-    )
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bateria.png b/app/src/main/res/drawable/bateria.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/collar_sample.png b/app/src/main/res/drawable/collar_sample.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/devices_icon.xml b/app/src/main/res/drawable/devices_icon.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/explore_icon.xml b/app/src/main/res/drawable/explore_icon.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/female.xml b/app/src/main/res/drawable/female.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/get_started_1.png b/app/src/main/res/drawable/get_started_1.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/get_started_2.png b/app/src/main/res/drawable/get_started_2.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/get_started_3.png b/app/src/main/res/drawable/get_started_3.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/heart.xml b/app/src/main/res/drawable/heart.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/home_icon.xml b/app/src/main/res/drawable/home_icon.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_apple.png b/app/src/main/res/drawable/ic_apple.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_facebook.png b/app/src/main/res/drawable/ic_facebook.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_google.png b/app/src/main/res/drawable/ic_google.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_launcher_background.png b/app/src/main/res/drawable/ic_launcher_background.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/loading_image.png b/app/src/main/res/drawable/loading_image.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/location_icon.xml b/app/src/main/res/drawable/location_icon.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/login_background.png b/app/src/main/res/drawable/login_background.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/male.xml b/app/src/main/res/drawable/male.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/my_pet_sample1.png b/app/src/main/res/drawable/my_pet_sample1.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/my_pet_sample2.png b/app/src/main/res/drawable/my_pet_sample2.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/pet.xml b/app/src/main/res/drawable/pet.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/pet_perfil_sample.png b/app/src/main/res/drawable/pet_perfil_sample.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/pet_sample.png b/app/src/main/res/drawable/pet_sample.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/sound_dog_icon.xml b/app/src/main/res/drawable/sound_dog_icon.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/font/fredoka_bold.ttf b/app/src/main/res/font/fredoka_bold.ttf
old mode 100755
new mode 100644
diff --git a/app/src/main/res/font/fredoka_light.ttf b/app/src/main/res/font/fredoka_light.ttf
old mode 100755
new mode 100644
diff --git a/app/src/main/res/font/fredoka_medium.ttf b/app/src/main/res/font/fredoka_medium.ttf
old mode 100755
new mode 100644
diff --git a/app/src/main/res/font/fredoka_regular.ttf b/app/src/main/res/font/fredoka_regular.ttf
old mode 100755
new mode 100644
diff --git a/app/src/main/res/font/fredoka_semi_bold.ttf b/app/src/main/res/font/fredoka_semi_bold.ttf
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
old mode 100755
new mode 100644
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
old mode 100755
new mode 100644
index e507429..522f886
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,23 +55,4 @@
     <!-- Genders -->
     <string name="man"> Man </string>
     <string name="female"> Female </string>
-
-    <!-- AddPet Screen -->
-    <string name="addPet"> Add Pet </string>
-    <string name="addBtn"> Add </string>
-
-    <string name="nameForm"> Name: </string>
-    <string name="nameFormPlaceholder"> The name of your pet </string>
-
-    <string name="titleForm"> Another data of your pet. (Optional)</string>
-
-    <string name="genderForm"> Gender: </string>
-    <string name="genderFormPlaceholder"> Gender of your pet </string>
-    <string name="ageForm"> Age: </string>
-    <string name="ageFormPlaceholder"> The age of your pet </string>
-    <string name="typeForm"> Type: </string>
-    <string name="weightForm"> Weight:  </string>
-    <string name="heightForm"> Height: </string>
-    <string name="colorForm"> Color: </string>
-    <string name="descriptionForm"> Description: </string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
old mode 100755
new mode 100644
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
old mode 100755
new mode 100644
diff --git a/app/src/test/java/org/coderic/protective/mobile/ExampleUnitTest.kt b/app/src/test/java/org/coderic/protective/mobile/ExampleUnitTest.kt
old mode 100755
new mode 100644
diff --git a/build.gradle.kts b/build.gradle.kts
old mode 100755
new mode 100644
index c88d862..6aec713
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.3.1" apply false
+    id("com.android.application") version "8.3.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }
diff --git a/gradle.properties b/gradle.properties
old mode 100755
new mode 100644
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100755
new mode 100644
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
old mode 100755
new mode 100644
diff --git a/gradlew.bat b/gradlew.bat
old mode 100755
new mode 100644
diff --git a/settings.gradle.kts b/settings.gradle.kts
old mode 100755
new mode 100644