Skip to content
Snippets Groups Projects
Commit 27420379 authored by izajime's avatar izajime
Browse files

Feature: Implementada la interfaz de la tienda

parent 8113922d
No related branches found
No related tags found
2 merge requests!65Feature:,!51Tienda to guapa
Hide whitespace changes
Inline Side-by-side
app/src/main/AndroidManifest.xml
+ 1
− 0
View file @ 27420379
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
<activity android:name=".minijuegoReparacion.MinijuegoReparacion" android:exported="true"/> <activity android:name=".minijuegoReparacion.MinijuegoReparacion" android:exported="true"/>
<activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/> <activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/>
<activity android:name=".TabernaActivity" android:exported="true"/> <activity android:name=".TabernaActivity" android:exported="true"/>
<activity android:name=".TiendaActivity" android:exported="true"/>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
app/src/main/java/com/example/ellegadodepintia/MapActivity.kt
+ 6
− 0
View file @ 27420379
...@@ -42,5 +42,11 @@ class MapActivity : AppCompatActivity() { ...@@ -42,5 +42,11 @@ class MapActivity : AppCompatActivity() {
val intent = Intent(this, TabernaActivity::class.java) val intent = Intent(this, TabernaActivity::class.java)
startActivity(intent) startActivity(intent)
} }
val tienda = findViewById<ImageButton>(R.id.botonTienda)
tienda.setOnClickListener {
val intent = Intent(this, TiendaActivity::class.java)
startActivity(intent)
}
} }
} }
app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt 0 → 100644
+ 11
− 0
View file @ 27420379
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
app/src/main/res/layout/activity_tienda.xml
+ 111
− 34
View file @ 27420379
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:backgroundTint="#F2CDA0"> android:backgroundTint="#F2CDA0">
<ImageView <ImageView
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
...@@ -87,7 +86,6 @@ ...@@ -87,7 +86,6 @@
android:textSize="20sp" /> android:textSize="20sp" />
<ImageView <ImageView
android:id="@+id/iconMoneda"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
...@@ -126,15 +124,32 @@ ...@@ -126,15 +124,32 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <LinearLayout
android:id="@+id/precio02"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/pixeled"
android:text="100"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:textColor="#401201" android:orientation="horizontal"
android:textSize="20sp" /> 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> </LinearLayout>
...@@ -167,18 +182,33 @@ ...@@ -167,18 +182,33 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <LinearLayout
android:id="@+id/precio03"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/pixeled"
android:text="100"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:textColor="#401201" android:orientation="horizontal"
android:textSize="20sp" /> 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 <LinearLayout
android:orientation="vertical" android:orientation="vertical"
...@@ -208,15 +238,31 @@ ...@@ -208,15 +238,31 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <LinearLayout
android:id="@+id/precio04"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/pixeled"
android:text="100"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:textColor="#401201" android:orientation="horizontal"
android:textSize="20sp" /> 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> </LinearLayout>
...@@ -248,15 +294,31 @@ ...@@ -248,15 +294,31 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <LinearLayout
android:id="@+id/precio05"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/pixeled"
android:text="100"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:textColor="#401201" android:orientation="horizontal"
android:textSize="20sp" /> 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> </LinearLayout>
...@@ -279,7 +341,6 @@ ...@@ -279,7 +341,6 @@
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:backgroundTint="#F2CDA0"> android:backgroundTint="#F2CDA0">
<ImageView <ImageView
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
...@@ -289,15 +350,31 @@ ...@@ -289,15 +350,31 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <LinearLayout
android:id="@+id/precio06"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/pixeled"
android:text="100"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:textColor="#401201" android:orientation="horizontal"
android:textSize="20sp" /> 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> </LinearLayout>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment