Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/example/pantallacompra/MainActivity.kt

app/src/main/java/com/example/pantallacompra/ChairList.kt

@@ -19,7 +19,7 @@ class ChairList : AppCompatActivity() {
     private lateinit var dbreference : DatabaseReference
     private lateinit var recycleView: RecyclerView
     private lateinit var eventList : ArrayList<Asiento>
-    private lateinit var seleccionados : ArrayList<String>
+    public lateinit var seleccionados : ArrayList<String>
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
@@ -73,6 +73,7 @@ class ChairList : AppCompatActivity() {
 
                     adapter.setOnItemClickListener(object : ChairAdapter.onItemClickListener{
                         override fun onItemClick(position: Int) {
+                            Toast.makeText(this@ChairList,"No deja",Toast.LENGTH_SHORT).show()
                             adapter.toggleSelection(position)
                         }
 

app/src/main/java/com/example/pantallacompra/MainActivity.kt

@@ -22,14 +22,15 @@ class MainActivity : AppCompatActivity() {
         salasReference= FirebaseDatabase.getInstance().getReference("Salas")
         asientosReference= FirebaseDatabase.getInstance().getReference("Asientos")
 
-        setContentView(R.layout.pantalla_sala)
+        setContentView(R.layout.activity_main)
+        cargarAsientos(asientosReference)
 
-       // val boton = findViewById<Button>(R.id.nextBtn)
+        val boton = findViewById<Button>(R.id.nextBtn)
 
-        //boton.setOnClickListener{
+        boton.setOnClickListener{
-         //   val intent = Intent(this, EventList::class.java)
+            val intent = Intent(this, EventList::class.java)
-           // startActivity(intent)
+            startActivity(intent)
-      //  }
+        }
     }
 
     fun insertData(eventosReference: DatabaseReference, salasReference: DatabaseReference, asientosReference: DatabaseReference){
@@ -70,9 +71,15 @@ class MainActivity : AppCompatActivity() {
         val asientoA1=Asiento("A1",10,"Chafa","Libre",1)
         val asientoA2=Asiento("A2",10,"Chafa","Libre",1)
         val asientoA3=Asiento("A3",10,"Chafa","Libre",1)
+        val asientoB1=Asiento("B1",10,"Regular","Libre",1)
+        val asientoB2=Asiento("B2",10,"Regular","Libre",1)
+        val asientoB3=Asiento("B3",10,"Regular","Libre",1)
 
         database.child(asientoA1.noAsiento.toString()).setValue(asientoA1)
         database.child(asientoA2.noAsiento.toString()).setValue(asientoA2)
         database.child(asientoA3.noAsiento.toString()).setValue(asientoA3)
+        database.child(asientoB1.noAsiento.toString()).setValue(asientoB1)
+        database.child(asientoB2.noAsiento.toString()).setValue(asientoB2)
+        database.child(asientoB3.noAsiento.toString()).setValue(asientoB3)
     }
 }

app/src/main/java/com/example/pantallacompra/compra.kt

@@ -30,7 +30,7 @@ class compra: AppCompatActivity() {
          }
 
          btnCancelar.setOnClickListener {
-             val intent = Intent(this, EventList::class.java)
+             val intent = Intent(this, ChairList::class.java)
              startActivity(intent)
          }
     }

app/src/main/res/layout/activity_chair_list.xml

@@ -14,9 +14,10 @@
         android:background="#08404F"
         android:gravity="center"
         android:text="Playpal"
+        android:fontFamily="@font/cinepolis"
         android:textAlignment="gravity"
         android:textColor="@color/white"
-        android:textSize="34sp"
+        android:textSize="50sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -33,11 +34,11 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/chairRecycleView"
-        android:layout_width="374dp"
+        android:layout_width="375dp"
-        android:layout_height="499dp"
+        android:layout_height="299dp"
-        android:layout_marginTop="60dp"
+        android:layout_marginTop="76dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.567"
+        app:layout_constraintHorizontal_bias="0.444"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/eventTextTitle" />
 
@@ -59,35 +60,43 @@
         android:id="@+id/eventoText"
         android:layout_width="292dp"
         android:layout_height="59dp"
+        android:layout_marginBottom="20dp"
+        android:fontFamily="@font/cinepolis"
+        android:gravity="center"
         android:text="Los Caligaris"
+
         android:textAlignment="center"
         android:textSize="30sp"
         app:layout_constraintBottom_toTopOf="@+id/chairRecycleView"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/noSalaText"
-        app:layout_constraintTop_toBottomOf="@+id/eventTextTitle" />
+        app:layout_constraintTop_toBottomOf="@+id/eventTextTitle"
+        app:layout_constraintVertical_bias="0.0" />
 
     <LinearLayout
-        android:layout_width="409dp"
+        android:id="@+id/linearLayout"
-        android:layout_height="81dp"
+        android:layout_width="366dp"
-        android:layout_marginTop="502dp"
+        android:layout_height="77dp"
+        android:layout_marginTop="28dp"
         android:layout_marginEnd="2dp"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.511"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/chairRecycleView">
+        app:layout_constraintTop_toBottomOf="@+id/textView8">
 
         <Button
             android:id="@+id/btncancelar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_marginTop="15dp"
             android:layout_weight="1"
             android:backgroundTint="#D9D9D9"
-            android:text="Cancelar"
             android:fontFamily="@font/cinepolis"
+            android:text="Cancelar"
             android:textColor="#000000"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="4dp"
             android:textSize="18dp" />
 
         <Button
@@ -105,4 +114,20 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="match_parent"
+        android:layout_height="130dp"
+        android:layout_marginTop="16dp"
+        android:background="#612020"
+        android:fontFamily="@font/cinepolis"
+        android:gravity="center"
+        android:text="Escenario"
+        android:textColor="@color/white"
+        android:textSize="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chairRecycleView" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/pantallacompra.xml

@@ -97,8 +97,8 @@
             android:id="@+id/textView3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="4dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="16dp"
             android:gravity="center"
             android:text="DETALLES DE LA VENTA"
             android:textColor="#FFFFFF"
@@ -207,20 +207,6 @@
             app:layout_constraintStart_toStartOf="@id/textView7"
             app:layout_constraintTop_toBottomOf="@id/editTextNombre" />
 
-        <Button
-            android:id="@+id/buttonComprar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="8dp"
-            android:backgroundTint="#D9D9D9"
-            android:text="Comprar"
-            android:textColor="#000000"
-            android:textSize="10sp"
-            app:layout_constraintEnd_toStartOf="@id/buttonCancelar"
-            app:layout_constraintStart_toStartOf="@id/editTextNombre"
-            app:layout_constraintTop_toBottomOf="@id/editTextTelefono" />
-
         <Button
             android:id="@+id/buttonCancelar"
             android:layout_width="0dp"
@@ -229,11 +215,27 @@
             android:layout_marginTop="16dp"
             android:backgroundTint="#D9D9D9"
             android:text="Cancelar"
+            android:fontFamily="@font/cinepolis"
             android:textColor="#000000"
-            android:textSize="10sp"
+            android:textSize="18sp"
-            app:layout_constraintEnd_toEndOf="@id/editTextTelefono"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/buttonComprar"
             app:layout_constraintTop_toBottomOf="@id/editTextTelefono" />
+        <Button
+            android:id="@+id/buttonComprar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:backgroundTint="#D9D9D9"
+            android:text="Comprar"
+            android:fontFamily="@font/cinepolis"
+            android:textColor="#000000"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toStartOf="@id/buttonCancelar"
+            app:layout_constraintStart_toStartOf="@id/editTextNombre"
+            app:layout_constraintTop_toBottomOf="@id/editTextTelefono" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>