diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 92ef36bae55d477e1868e24402b11d36fcf75f0c..a6e64bbb1bd96a794b6dc89cf937808671f286f6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,7 @@ <activity android:name=".minijuegoReparacion.MinijuegoReparacion" android:exported="true"/> <activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/> <activity android:name=".TabernaActivity" android:exported="true"/> + <activity android:name=".TiendaActivity" android:exported="true"/> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt index e78b901e8890527bfcf4e095ffd8c0b1ea2ef8d1..13553b83c27286554208f21d74dc692545cddaa8 100644 --- a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt +++ b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt @@ -42,5 +42,11 @@ class MapActivity : AppCompatActivity() { val intent = Intent(this, TabernaActivity::class.java) startActivity(intent) } + + val tienda = findViewById<ImageButton>(R.id.botonTienda) + tienda.setOnClickListener { + val intent = Intent(this, TiendaActivity::class.java) + startActivity(intent) + } } } diff --git a/app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt b/app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..a628326d4e68a749a22b2243ab9a8a7346c7649f --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class TiendaActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_tienda) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tienda.xml b/app/src/main/res/layout/activity_tienda.xml index e7d0f1a2335eeb8e69b3082a298f8559a0c8fb56..18aa724d44d700902fabaa7b75bea9fcc5906a21 100644 --- a/app/src/main/res/layout/activity_tienda.xml +++ b/app/src/main/res/layout/activity_tienda.xml @@ -59,7 +59,6 @@ android:layout_marginBottom="5dp" android:backgroundTint="#F2CDA0"> - <ImageView android:layout_width="100dp" android:layout_height="100dp" @@ -87,7 +86,6 @@ android:textSize="20sp" /> <ImageView - android:id="@+id/iconMoneda" android:layout_width="20dp" android:layout_height="20dp" android:layout_marginStart="4dp" @@ -126,15 +124,32 @@ </androidx.cardview.widget.CardView> - <TextView - android:id="@+id/precio02" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pixeled" - android:text="100" android:layout_gravity="center_horizontal|bottom" - android:textColor="#401201" - android:textSize="20sp" /> + android:orientation="horizontal" + android:gravity="center" + android:layout_marginBottom="8dp"> + + <TextView + android:id="@+id/precio02" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:text="100" + android:textColor="#401201" + android:textSize="20sp" /> + + <ImageView + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="4dp" + android:contentDescription="Icono de moneda" + android:src="@drawable/logo_pintia" + android:scaleType="centerCrop" /> + </LinearLayout> + </LinearLayout> @@ -167,18 +182,33 @@ </androidx.cardview.widget.CardView> - <TextView - android:id="@+id/precio03" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pixeled" - android:text="100" android:layout_gravity="center_horizontal|bottom" - android:textColor="#401201" - android:textSize="20sp" /> + android:orientation="horizontal" + android:gravity="center" + android:layout_marginBottom="8dp"> - </LinearLayout> + <TextView + android:id="@+id/precio03" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:text="100" + android:textColor="#401201" + android:textSize="20sp" /> + <ImageView + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="4dp" + android:contentDescription="Icono de moneda" + android:src="@drawable/logo_pintia" + android:scaleType="centerCrop" /> + </LinearLayout> + + </LinearLayout> <LinearLayout android:orientation="vertical" @@ -208,15 +238,31 @@ </androidx.cardview.widget.CardView> - <TextView - android:id="@+id/precio04" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pixeled" - android:text="100" android:layout_gravity="center_horizontal|bottom" - android:textColor="#401201" - android:textSize="20sp" /> + android:orientation="horizontal" + android:gravity="center" + android:layout_marginBottom="8dp"> + + <TextView + android:id="@+id/precio04" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:text="100" + android:textColor="#401201" + android:textSize="20sp" /> + + <ImageView + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="4dp" + android:contentDescription="Icono de moneda" + android:src="@drawable/logo_pintia" + android:scaleType="centerCrop" /> + </LinearLayout> </LinearLayout> @@ -248,15 +294,31 @@ </androidx.cardview.widget.CardView> - <TextView - android:id="@+id/precio05" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pixeled" - android:text="100" android:layout_gravity="center_horizontal|bottom" - android:textColor="#401201" - android:textSize="20sp" /> + android:orientation="horizontal" + android:gravity="center" + android:layout_marginBottom="8dp"> + + <TextView + android:id="@+id/precio05" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:text="100" + android:textColor="#401201" + android:textSize="20sp" /> + + <ImageView + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="4dp" + android:contentDescription="Icono de moneda" + android:src="@drawable/logo_pintia" + android:scaleType="centerCrop" /> + </LinearLayout> </LinearLayout> @@ -279,7 +341,6 @@ android:layout_marginBottom="5dp" android:backgroundTint="#F2CDA0"> - <ImageView android:layout_width="100dp" android:layout_height="100dp" @@ -289,15 +350,31 @@ </androidx.cardview.widget.CardView> - <TextView - android:id="@+id/precio06" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/pixeled" - android:text="100" android:layout_gravity="center_horizontal|bottom" - android:textColor="#401201" - android:textSize="20sp" /> + android:orientation="horizontal" + android:gravity="center" + android:layout_marginBottom="8dp"> + + <TextView + android:id="@+id/precio06" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:text="100" + android:textColor="#401201" + android:textSize="20sp" /> + + <ImageView + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginStart="4dp" + android:contentDescription="Icono de moneda" + android:src="@drawable/logo_pintia" + android:scaleType="centerCrop" /> + </LinearLayout> </LinearLayout>