diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b41ebeb5ac5ea04e1b0d0e430955cc5003bc030c..b9f5b22ef030c62768f83bbfa62f13af5e405bd3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
<activity android:name=".ListaMinijuegos" android:exported="true"/>
<activity android:name=".minijuegoInvestigacion.MinijuegoInvestigar" android:exported="true"/>
<activity android:name=".ruleta.Ruleta" android:exported="true"/>
- <activity android:name=".exploradoresDePintia.model.Resumen" android:exported="true"/>
+ <activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ellegadodepintia/AuthActivity.kt b/app/src/main/java/com/example/ellegadodepintia/AuthActivity.kt
index 1695983f68e02cfec84448e7d81c448dc1f3b5fc..50927743a5e8b5d12b62bb2016bc3c3315fdecec 100644
--- a/app/src/main/java/com/example/ellegadodepintia/AuthActivity.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/AuthActivity.kt
@@ -2,6 +2,8 @@ package com.example.ellegadodepintia
import android.content.Intent
import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
import android.widget.Button
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
@@ -47,7 +49,9 @@ class AuthActivity : AppCompatActivity() {
).addOnCompleteListener {
if (it.isSuccessful) {
RepositorioJugador.cargarJugador(textoEmail.toString())
- mostrarMapActivity()
+ Handler(Looper.getMainLooper()).postDelayed({
+ mostrarMapActivity()
+ },800)
} else {
showAlert()
}
diff --git a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt
index c6542cca4a3c5cc344e8c6e52194d4962fd0f607..8211d973c785e515894ac8c51c209965006a406c 100644
--- a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt
@@ -5,9 +5,11 @@ import android.graphics.Color
import android.os.Bundle
import android.widget.Button
import android.widget.ImageButton
+import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import com.example.ellegadodepintia.minijuego1.InicioMinijuego1
import com.example.ellegadodepintia.exploradoresDePintia.ExploradoresDePintia
+import com.example.ellegadodepintia.exploradoresDePintia.model.GameState
import com.example.ellegadodepintia.minijuego2.Minijuego2
import com.example.ellegadodepintia.minijuego3.Minijuego3
@@ -25,6 +27,8 @@ class MapActivity : AppCompatActivity() {
startActivity(intent)
}
+ GameState.jugador.monedas.toString().also { findViewById<TextView>(R.id.moneyText).text = it }
+
mapButton.setBackgroundResource(R.drawable.style_texto_border)
leaderboardButton.setBackgroundColor(Color.TRANSPARENT)
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
index bcfb8dd8d2dfd8b574a23fa5282c2fd163a7f40c..d9e365369cf31d68c616e9011fff40c08548cd40 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
@@ -61,8 +61,12 @@ class ExploradoresDePintia : AppCompatActivity() {
}
private fun iniciarJuego() {
- GameState.jugador.addObserver { LayoutUtils.actualizarEstadisticasMain() }
+ GameState.jugador.addObserver {
+ LayoutUtils.actualizarEstadisticasMain()
+ LayoutUtils.actualizarMonedas()
+ }
LayoutUtils.actualizarEstadisticasMain()
+ LayoutUtils.actualizarMonedas()
GeneradorDeEventos.generarEvento(dificultad)
GestorDeEventos.gestionar()
}
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/InventoryMain.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/InventoryMain.kt
index 19c74d8b468f43bb37fcaca44cc0a87345118202..ed2363a78b07224c65428e527f713d94c12e14d4 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/InventoryMain.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/InventoryMain.kt
@@ -45,6 +45,8 @@ class InventoryMain : DialogFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ LayoutUtils.actualizarMonedasInventario(view)
+
GameState.jugador.addObserver { LayoutUtils.actualizarEstadisticasInventario(view) }
LayoutUtils.actualizarEstadisticasInventario(view)
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Resumen.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt
similarity index 67%
rename from app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Resumen.kt
rename to app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt
index 9ee5248cef721d8f52b1b21b6b172f69126d85f4..8760a1f2189e32ced636ec6898b6057e72484f98 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Resumen.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt
@@ -1,20 +1,21 @@
-package com.example.ellegadodepintia.exploradoresDePintia.model
+package com.example.ellegadodepintia.exploradoresDePintia
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.content.Intent
-import android.graphics.Typeface
import android.os.Bundle
-import android.view.Gravity
import android.view.animation.AccelerateDecelerateInterpolator
import android.widget.Button
import android.widget.ImageView
-import android.widget.LinearLayout
import android.widget.ProgressBar
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
import com.example.ellegadodepintia.MapActivity
import com.example.ellegadodepintia.R
+import com.example.ellegadodepintia.exploradoresDePintia.model.Atributo
+import com.example.ellegadodepintia.exploradoresDePintia.model.GameState
import com.example.ellegadodepintia.exploradoresDePintia.model.objeto.ObjetoDeValor
class Resumen : AppCompatActivity() {
@@ -52,7 +53,8 @@ class Resumen : AppCompatActivity() {
private fun calcularGanancias() {
val imagenProtagonista = findViewById<ImageView>(R.id.imagenProtagonista)
val textoResumen = findViewById<TextView>(R.id.textoResumen)
- val linearLayoutObjetos = findViewById<LinearLayout>(R.id.linearLayoutObjetos)
+ val recyclerView: RecyclerView = findViewById(R.id.resumenRecyclerView)
+ recyclerView.layoutManager = LinearLayoutManager(this)
var nObjetosValor = 0
textoResumen?.text = ""
@@ -71,47 +73,26 @@ class Resumen : AppCompatActivity() {
animatorSet.playTogether(movimientoLateral, reboteVertical)
animatorSet.start()
+ val objetosDeValor: MutableList<ObjetoDeValor> = mutableListOf()
for (objeto in GameState.jugador.inventario) {
if (objeto is ObjetoDeValor) {
nObjetosValor++
+ objetosDeValor.add(objeto)
objeto.usar()
-
- val itemLayout = LinearLayout(this)
- itemLayout.orientation = LinearLayout.HORIZONTAL
- itemLayout.setPadding(25,25,25,25)
- itemLayout.gravity = Gravity.CENTER_VERTICAL
- itemLayout.setBackgroundResource(R.drawable.style_texto_border)
-
- val params = LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT,
- LinearLayout.LayoutParams.WRAP_CONTENT
- )
- params.setMargins(0, 0, 0, 30)
- itemLayout.layoutParams = params
-
- val imageView = ImageView(this)
- imageView.layoutParams = LinearLayout.LayoutParams(130, 130)
- imageView.setImageResource(objeto.imagen)
- itemLayout.addView(imageView)
-
- val textView = TextView(this)
- "${objeto.nombre}: 20 monedas".also { textView.text = it }
- textView.setTextColor(getColor(R.color.black))
- textView.textSize = 18f
- textView.setTypeface(null, Typeface.BOLD)
- textView.setPadding(10, 0, 0, 0)
- itemLayout.addView(textView)
-
- linearLayoutObjetos.addView(itemLayout)
}
}
+ println(objetosDeValor.isEmpty())
+ recyclerView.adapter = ResumenAdapter(objetosDeValor)
+
if (nObjetosValor == 0) {
"El investigador no ha conseguido ningún objeto de valor".also { textoResumen?.text = it }
} else {
- "${textoResumen.text} Enhorabuena, has conseguido ${nObjetosValor*20} monedas".also {
+ "${textoResumen.text} Enhorabuena, has conseguido ${nObjetosValor*20} monedas.".also {
textoResumen.text = it
}
+ GameState.jugador.monedas.toString()
+ .also { findViewById<TextView>(R.id.moneyText).text = it }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ResumenAdapter.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ResumenAdapter.kt
new file mode 100644
index 0000000000000000000000000000000000000000..2af6cb8ce897e4fbe403236e69f4c8f6afad5769
--- /dev/null
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ResumenAdapter.kt
@@ -0,0 +1,38 @@
+package com.example.ellegadodepintia.exploradoresDePintia
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.example.ellegadodepintia.R
+import com.example.ellegadodepintia.exploradoresDePintia.model.objeto.ObjetoDeValor
+
+class ResumenAdapter(private val resumenList: MutableList<ObjetoDeValor>) :
+ RecyclerView.Adapter<ResumenAdapter.ResumenViewHolder>() {
+
+ class ResumenViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+ val textoObjeto: TextView = itemView.findViewById(R.id.textoObjeto)
+ val textoPrecio: TextView = itemView.findViewById(R.id.textoPrecio)
+ val imagen: ImageView = itemView.findViewById(R.id.imagenObjeto)
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResumenViewHolder {
+ val view = LayoutInflater.from(parent.context)
+ .inflate(R.layout.resumen_item, parent, false)
+ return ResumenViewHolder(view)
+ }
+
+ override fun onBindViewHolder(holder: ResumenViewHolder, position: Int) {
+ val resumen = resumenList[position]
+ resumen.nombre.also { holder.textoObjeto.text = it }
+ ": 20".also { holder.textoPrecio.text = it }
+ holder.imagen.setBackgroundResource(resumen.imagen)
+ }
+
+ override fun getItemCount(): Int {
+ return resumenList.size
+ }
+}
+
+
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt
index 0aa48fdb91bcdd30afb4a20c39a89b7370bb5b67..3a849d42bc4dc0f2151d68a21d20019050445c9e 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt
@@ -7,6 +7,7 @@ import android.os.Looper
import android.widget.ImageView
import android.widget.TextView
import com.example.ellegadodepintia.R
+import com.example.ellegadodepintia.exploradoresDePintia.Resumen
import com.example.ellegadodepintia.exploradoresDePintia.model.GameState.context
import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.Efecto
import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoInvestigarEnemigo
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt
index f7132445a6cefc024db56d6d8e928b50df9d5893..e84c7c29bc9d01ad05d2cbb1f74d064a7f63d4d8 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt
@@ -10,6 +10,7 @@ import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat
import com.example.ellegadodepintia.R
+import com.example.ellegadodepintia.exploradoresDePintia.Resumen
import com.example.ellegadodepintia.exploradoresDePintia.model.GameState.context
import com.example.ellegadodepintia.exploradoresDePintia.model.eventoFactory.EventoTienda
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
index b734b4fb317fa0b63cf853612193e8bbb7c1a744..5f616128e8807a9a7ece77d8e723604990e53005 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
@@ -128,6 +128,11 @@ class Jugador {
notifyObservers()
}
+ fun actualizarMonedas(valor: Int){
+ monedas = valor
+ notifyObservers()
+ }
+
fun reset() {
observers.clear()
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
index 23cf0f90d587c3038baed7c562b037f56bbc2404..4f7f8c778784553a90d00e0d3db4ee67c49b95b0 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
@@ -111,5 +111,14 @@ object LayoutUtils {
}
}
+ fun actualizarMonedas() {
+ GameState.jugador.monedas.toString()
+ .also { context!!.findViewById<TextView>(R.id.moneyText).text = it }
+ }
+ fun actualizarMonedasInventario(view: View) {
+ GameState.jugador.monedas.toString()
+ .also { view.findViewById<TextView>(R.id.moneyText).text = it }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDetallesCompra.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDetallesCompra.kt
index 06ce196195d2a39f57a054f8ec1e7867e9bd880b..ec065f9f0b9c9872604fca01d7c0a3695255fd3d 100644
--- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDetallesCompra.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDetallesCompra.kt
@@ -50,7 +50,7 @@ class EfectoDetallesCompra(private val coste : Int,private val objeto: Objeto) :
if (GameState.jugador.monedas < coste){
"¡No tienes suficientes monedas para comprar el objeto!".also { context!!.findViewById<TextView>(R.id.textoResultado).text = it }
}else{
- GameState.jugador.monedas -= coste
+ GameState.jugador.actualizarMonedas(GameState.jugador.monedas - coste)
RepositorioJugador.setMonedas(GameState.jugador.monedas)
GameState.jugador.conseguirObjeto(objeto)
GameState.eventoActual.actualizarFinalizado(true)
diff --git a/app/src/main/res/layout/activity_exploradores_de_pintia.xml b/app/src/main/res/layout/activity_exploradores_de_pintia.xml
index 2373cc52b4f01707e2890502ee933034702ddaae..c5b7fb2787649283b97e88db5be0f52c2ffeb6b6 100644
--- a/app/src/main/res/layout/activity_exploradores_de_pintia.xml
+++ b/app/src/main/res/layout/activity_exploradores_de_pintia.xml
@@ -23,11 +23,41 @@
android:gravity="center"
android:orientation="vertical">
+ <LinearLayout
+ android:id="@+id/moneyLayout"
+ android:layout_width="160dp"
+ android:layout_height="30dp"
+ android:background="@drawable/style_texto_border"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/moneyImage"
+ android:layout_width="30dp"
+ android:layout_height="match_parent"
+ android:layout_marginStart="10dp"
+ android:contentDescription="Logo del juego"
+ android:src="@drawable/logo_pintia"
+ tools:ignore="HardcodedText" />
+
+ <TextView
+ android:id="@+id/moneyText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="30dp"
+ android:text="1200"
+ android:textColor="@color/pintiaTitleText"
+ android:textSize="20sp"
+ android:fontFamily="@font/pixeled"
+ tools:ignore="HardcodedText" />
+
+ </LinearLayout>
+
<LinearLayout
android:id="@+id/mainArea"
android:layout_width="match_parent"
android:layout_height="180dp"
- android:layout_marginTop="15dp"
+ android:layout_marginTop="8dp"
android:background="@drawable/style_texto_border"
android:gravity="center"
android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_resumen_partida.xml b/app/src/main/res/layout/activity_resumen_partida.xml
index 0d5c51f33d8f511ecbfd3e93ee2ae3077efc9100..105078ab0540ec9d7d848109caf16c4ee81a5744 100644
--- a/app/src/main/res/layout/activity_resumen_partida.xml
+++ b/app/src/main/res/layout/activity_resumen_partida.xml
@@ -84,32 +84,73 @@
android:textColor="#401201"
android:textSize="16sp" />
- <LinearLayout
- android:id="@+id/linearLayoutObjetos"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/resumenRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:orientation="vertical"
- android:layout_marginTop="20dp"
- android:padding="10dp">
- </LinearLayout>
+ android:layout_marginTop="16dp"
+ android:divider="@android:color/darker_gray"
+ android:dividerHeight="1dp" />
<View
- android:id="@+id/divider"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="1dp"
- android:layout_marginTop="16dp"
- android:background="@android:color/darker_gray" />
+ android:layout_marginTop="10dp"
+ android:background="#000000" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:fontFamily="@font/pixeled"
+ android:text="Dinero Final"
+ android:textColor="#401201"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <LinearLayout
+ android:id="@+id/moneyLayout"
+ android:layout_width="160dp"
+ android:layout_height="30dp"
+ android:layout_marginTop="8dp"
+ android:background="@drawable/style_texto_border"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/moneyImage"
+ android:layout_width="30dp"
+ android:layout_height="match_parent"
+ android:layout_marginStart="10dp"
+ android:contentDescription="Logo del juego"
+ android:src="@drawable/logo_pintia"
+ tools:ignore="HardcodedText" />
+
+ <TextView
+ android:id="@+id/moneyText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="30dp"
+ android:text="1200"
+ android:textColor="@color/pintiaTitleText"
+ android:textSize="20sp"
+ android:fontFamily="@font/pixeled"
+ tools:ignore="HardcodedText" />
+
+
+ </LinearLayout>
<Button
android:id="@+id/botonContinuar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/pintiaButton"
+ android:layout_marginTop="10dp"
android:text="Continuar"
android:textColor="@color/pintiaButtonText" />
+ </LinearLayout>
+
- </LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/leaderboard_item.xml b/app/src/main/res/layout/leaderboard_item.xml
index d3173c5970f4dadf8af13d8fdb795728d8935921..0cee08e334b7ec051bbd47d2d2358c1681de172d 100644
--- a/app/src/main/res/layout/leaderboard_item.xml
+++ b/app/src/main/res/layout/leaderboard_item.xml
@@ -6,7 +6,9 @@
android:orientation="horizontal"
android:padding="16dp"
android:gravity="center_vertical"
- tools:ignore="HardcodedText">
+ tools:ignore="HardcodedText"
+ android:background="@drawable/style_texto_border"
+ android:layout_marginBottom="10dp">
<TextView
android:id="@+id/positionTextView"
diff --git a/app/src/main/res/layout/modal_detalles_compra.xml b/app/src/main/res/layout/modal_detalles_compra.xml
index 8a5b419381f696299082b9bc2e4ee7e72856947b..5e8b34b9ed6737f3ee93c6e9af860131e0ecd59d 100644
--- a/app/src/main/res/layout/modal_detalles_compra.xml
+++ b/app/src/main/res/layout/modal_detalles_compra.xml
@@ -54,9 +54,9 @@
android:layout_width="150dp"
android:layout_height="150dp"
android:contentDescription="Slot de equipo 1"
- android:scaleType="fitCenter"
+ android:scaleType="centerCrop"
android:scaleX="-1"
- android:src="@drawable/asi_objeto_espadadefault"/>
+ android:src="@drawable/asi_objeto_casco"/>
</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/modal_inventario.xml b/app/src/main/res/layout/modal_inventario.xml
index 399717c1ed67068d30cbdd04ffe49861bd74aab2..f5a6fb64a3f6bc46da62fc9a9e1950e7e4fc2e09 100644
--- a/app/src/main/res/layout/modal_inventario.xml
+++ b/app/src/main/res/layout/modal_inventario.xml
@@ -20,17 +20,50 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+ <LinearLayout
+ android:id="@+id/moneyLayout"
+ android:layout_width="160dp"
+ android:layout_height="30dp"
+ android:background="@drawable/style_texto_border"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tituloJuego">
+
+ <ImageView
+ android:id="@+id/moneyImage"
+ android:layout_width="30dp"
+ android:layout_height="match_parent"
+ android:layout_marginStart="10dp"
+ android:contentDescription="Logo del juego"
+ android:src="@drawable/logo_pintia"
+ tools:ignore="HardcodedText" />
+
+ <TextView
+ android:id="@+id/moneyText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="30dp"
+ android:text="1200"
+ android:textColor="@color/pintiaTitleText"
+ android:textSize="20sp"
+ android:fontFamily="@font/pixeled"
+ tools:ignore="HardcodedText" />
+
+ </LinearLayout>
<LinearLayout
android:id="@+id/mainArea"
android:layout_width="300dp"
android:layout_height="240dp"
+ android:layout_marginTop="8dp"
android:background="@drawable/style_texto_border"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tituloJuego">
+ app:layout_constraintTop_toBottomOf="@id/moneyLayout">
<LinearLayout
android:layout_width="wrap_content"
@@ -461,4 +494,5 @@
</GridLayout>
+
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/resumen_item.xml b/app/src/main/res/layout/resumen_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0e7183e8802070e81c89aaae129d704ce9199cc0
--- /dev/null
+++ b/app/src/main/res/layout/resumen_item.xml
@@ -0,0 +1,55 @@
+<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="wrap_content"
+ android:orientation="horizontal"
+ android:padding="5dp"
+ android:gravity="center_vertical"
+ tools:ignore="HardcodedText"
+ android:background="@drawable/style_texto_border"
+ android:layout_marginBottom="10dp">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/objetoSeleccionado"
+ android:layout_width="50dp"
+ android:layout_height="50dp"
+ android:layout_margin="5dp"
+ android:elevation="0dp"
+ app:cardCornerRadius="10dp">
+
+ <ImageView
+ android:id="@+id/imagenObjeto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:contentDescription="Slot de equipo 1"
+ android:scaleType="centerCrop"
+ android:scaleX="-1"
+ android:src="@drawable/asi_objeto_casco"/>
+ </androidx.cardview.widget.CardView>
+
+ <TextView
+ android:id="@+id/textoObjeto"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="Texto del objeto"
+ android:textSize="18sp"
+ android:textColor="#6A0000"
+ android:fontFamily="@font/pixeled"
+ android:paddingStart="16dp" />
+
+ <TextView
+ android:id="@+id/textoPrecio"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=": 20"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="#6A0000"
+ android:layout_marginEnd="10dp"
+ android:fontFamily="@font/pixeled"
+ android:gravity="end" />
+
+</LinearLayout>