From c2bba32e506f9ddf7a079590abb22540d455d239 Mon Sep 17 00:00:00 2001
From: MateMurcielago <galaxyuslol@gmail.com>
Date: Fri, 4 Nov 2022 19:33:15 -0300
Subject: [PATCH] =?UTF-8?q?Actualizaci=C3=B3n=204/11/2022?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +
 .idea/misc.xml                                |  9 +-
 .idea/vcs.xml                                 |  6 ++
 .../mdgz/dam/labdam2022/BusquedaFragment.java | 39 +++++++-
 .../com/mdgz/dam/labdam2022/MainActivity.java | 29 ++++++
 .../dam/labdam2022/repo/CiudadRepository.java |  8 ++
 app/src/main/res/layout/activity_main.xml     |  7 +-
 app/src/main/res/layout/fragment_busqueda.xml | 97 ++++++++++++++++++-
 .../layout/fragment_resultado_busqueda.xml    | 45 ++++++++-
 app/src/main/res/values-night/themes.xml      |  2 +-
 10 files changed, 231 insertions(+), 13 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a9f4e522..a0de2a15 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 847ae4b0..6d31a517 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,13 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/drawable/favoritos_background.xml" value="0.1945" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/drawable/favoritos_foreground.xml" value="0.1945" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/drawable/settings.xml" value="0.1945" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/activity_main.xml" value="0.33" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/fragment_busqueda.xml" value="0.33" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/fragment_resultado_busqueda.xml" value="0.33" />
+        <entry key="..\:/Users/ASUS/AndroidStudioProjects/LabDam2022/app/src/main/res/menu/toolbar_menu.xml" value="0.33" />
         <entry key="..\:/Users/HP/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/activity_main.xml" value="0.3625" />
         <entry key="..\:/Users/HP/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/fragment_busqueda.xml" value="0.3484375" />
         <entry key="..\:/Users/HP/AndroidStudioProjects/LabDam2022/app/src/main/res/layout/fragment_detalle_alojamiento.xml" value="0.3569230769230769" />
@@ -10,7 +17,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/mdgz/dam/labdam2022/BusquedaFragment.java b/app/src/main/java/com/mdgz/dam/labdam2022/BusquedaFragment.java
index ed4fabe6..d9502ad9 100644
--- a/app/src/main/java/com/mdgz/dam/labdam2022/BusquedaFragment.java
+++ b/app/src/main/java/com/mdgz/dam/labdam2022/BusquedaFragment.java
@@ -3,10 +3,17 @@
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+
+import com.mdgz.dam.labdam2022.repo.CiudadRepository;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -24,6 +31,9 @@ public class BusquedaFragment extends Fragment {
     private String mParam1;
     private String mParam2;
 
+    Button buttonBuscar;
+    Spinner spinner;
+
     public BusquedaFragment() {
         // Required empty public constructor
     }
@@ -59,6 +69,33 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_busqueda, container, false);
+
+        View vista = inflater.inflate(R.layout.fragment_busqueda, container, false);
+
+        buttonBuscar = vista.findViewById(R.id.buttonBuscar);
+
+        spinner = vista.findViewById(R.id.spinner2);
+
+       // ArrayAdapter adapter = ArrayAdapter.createFromResource(this,
+       //         CiudadRepository.listaCiudadesNombres(), android.R.layout.simple_spinner_dropdown_item);
+
+        ArrayAdapter adapte2 = new ArrayAdapter(getContext(), android.R.layout.simple_spinner_dropdown_item,
+                CiudadRepository.listaCiudadesNombres());
+
+        spinner.setAdapter(adapte2);
+        buttonBuscar.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+                FragmentTransaction transaction = fragmentManager.beginTransaction();
+                transaction.setReorderingAllowed(true);
+
+                transaction.replace(R.id.linearLayoutBusqueda, ResultadoBusquedaFragment.newInstance("", ""));
+
+                transaction.commit();
+            }
+        });
+
+        return vista;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mdgz/dam/labdam2022/MainActivity.java b/app/src/main/java/com/mdgz/dam/labdam2022/MainActivity.java
index bbd97bc1..01313c31 100644
--- a/app/src/main/java/com/mdgz/dam/labdam2022/MainActivity.java
+++ b/app/src/main/java/com/mdgz/dam/labdam2022/MainActivity.java
@@ -3,6 +3,10 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.appcompat.widget.Toolbar;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -10,5 +14,30 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        Toolbar t1 = (Toolbar) findViewById(R.id.materialToolbar);
+        setSupportActionBar(t1);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        getMenuInflater().inflate(R.menu.toolbar_menu,menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId())
+        {
+            case R.id.item_fav:
+                //Hacer algo cuando presionen Home
+                break;
+            case R.id.item_reservs:
+
+            default:
+                //Hacer algo cuando por default
+                break;
+        }
+        return super.onOptionsItemSelected(item);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mdgz/dam/labdam2022/repo/CiudadRepository.java b/app/src/main/java/com/mdgz/dam/labdam2022/repo/CiudadRepository.java
index 3f17ded0..da36184d 100644
--- a/app/src/main/java/com/mdgz/dam/labdam2022/repo/CiudadRepository.java
+++ b/app/src/main/java/com/mdgz/dam/labdam2022/repo/CiudadRepository.java
@@ -16,4 +16,12 @@ public class CiudadRepository {
     public List<Ciudad> listaCiudades(){
         return  _CIUDADES;
     }
+
+    public static List<String> listaCiudadesNombres() {
+        List<String> nombres = List.of();
+        for (int i = 0; i < _CIUDADES.size(); i++){
+            nombres.add(_CIUDADES.get(i).getNombre());
+        }
+        return nombres;
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7aa1a142..361781d3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,9 +11,14 @@
         android:id="@+id/materialToolbar"
         android:layout_width="409dp"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
+        android:background="#FFE500"
+        android:clickable="false"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
+        app:menu="@menu/toolbar_menu"
+        app:title="Búsqueda"
+        app:titleMargin="0dp"
+        app:titleTextColor="#3A3A3A"
         tools:layout_editor_absoluteX="1dp"
         tools:layout_editor_absoluteY="2dp" />
 
diff --git a/app/src/main/res/layout/fragment_busqueda.xml b/app/src/main/res/layout/fragment_busqueda.xml
index 40ea049a..bd6fb813 100644
--- a/app/src/main/res/layout/fragment_busqueda.xml
+++ b/app/src/main/res/layout/fragment_busqueda.xml
@@ -1,14 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linearLayoutBusqueda"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".BusquedaFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/form_busqueda" />
+        android:layout_height="46dp"
+        android:fontFamily="@font/audiowide"
+        android:lineSpacingExtra="0sp"
+        android:text="Detalles de la búsqueda"
+        android:textAlignment="center"
+        android:textColor="#303030"
+        android:textSize="20sp" />
 
-</FrameLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/checkBox"
+            android:layout_width="122dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Hoteles"
+            android:textAlignment="viewStart" />
+
+        <CheckBox
+            android:id="@+id/checkBox2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Departamentos" />
+    </LinearLayout>
+
+    <EditText
+        android:id="@+id/editTextNumber"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:hint="Capacidad de personas"
+        android:inputType="number"
+        android:minHeight="48dp"
+        android:textAlignment="center" />
+
+    <CheckBox
+        android:id="@+id/checkBox3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="¿Necesita Wifi?"
+        android:textAlignment="viewStart" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/editTextNumberDecimal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ems="10"
+            android:hint="Precio Máximo"
+            android:inputType="numberDecimal"
+            android:minHeight="48dp"
+            android:textAlignment="center" />
+
+        <EditText
+            android:id="@+id/editTextNumberDecimal2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ems="10"
+            android:hint="Precio Mínimo"
+            android:inputType="numberDecimal"
+            android:minHeight="48dp"
+            android:textAlignment="center" />
+    </LinearLayout>
+
+    <Spinner
+        android:id="@+id/spinner2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:spinnerMode="dropdown"
+        tools:ignore="SpeakableTextPresentCheck,SpeakableTextPresentCheck" />
+
+    <Button
+        android:id="@+id/buttonBuscar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="#FFE500"
+        android:text="Buscar"
+        android:textColor="#1B1B1B" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_resultado_busqueda.xml b/app/src/main/res/layout/fragment_resultado_busqueda.xml
index 4cc64b01..b2266611 100644
--- a/app/src/main/res/layout/fragment_resultado_busqueda.xml
+++ b/app/src/main/res/layout/fragment_resultado_busqueda.xml
@@ -1,14 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/frameLayoutResult"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
     tools:context=".ResultadoBusquedaFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/resultado_busqueda" />
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/audiowide"
+        android:text="Resultados de la búsqueda"
+        android:textAlignment="center"
+        android:textSize="20sp" />
 
-</FrameLayout>
\ No newline at end of file
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cardAlojamientos"
+        android:layout_width="match_parent"
+        android:layout_height="318dp"
+        card_view:cardBackgroundColor="@color"
+        card_view:cardCornerRadius="15dp"
+        card_view:cardElevation="5dp"
+        card_view:cardUseCompatPadding="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"></LinearLayout>
+        >
+    </androidx.cardview.widget.CardView>
+
+    <Button
+        android:id="@+id/buttonNuevaBusqueda"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="#FFE500"
+        android:text="Nueva búsqueda"
+        android:textColor="#1B1B1B" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="206dp"
+        android:scrollbars="@str" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0eb875aa..43af0134 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.LabDam2022" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.LabDam2022" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>