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 3e0c1997b217d4f4d2197fda5af1c940fc197d2b..53788c11f637adfa290fe052a7813d2c40917668 100644 --- a/app/src/main/res/layout/activity_exploradores_de_pintia.xml +++ b/app/src/main/res/layout/activity_exploradores_de_pintia.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/pintiaBackground" - android:padding="10dp" + android:padding="5dp" tools:context=".exploradoresDePintia.ExploradoresDePintia" tools:ignore="HardcodedText, UseCompoundDrawables"> @@ -280,8 +280,7 @@ android:rowCount="2" android:columnCount="2" android:orientation="vertical" - android:layout_marginTop="8dp" - android:padding="8dp"> + android:layout_marginTop="8dp"> <Button diff --git a/app/src/main/res/layout/modal_inventario.xml b/app/src/main/res/layout/modal_inventario.xml index f5a6fb64a3f6bc46da62fc9a9e1950e7e4fc2e09..7734de3f28d30dbf42ec4f6fb4e290f15d778bc2 100644 --- a/app/src/main/res/layout/modal_inventario.xml +++ b/app/src/main/res/layout/modal_inventario.xml @@ -7,7 +7,19 @@ android:padding="10dp" tools:context=".exploradoresDePintia.ExploradoresDePintia" tools:ignore="HardcodedText, UseCompoundDrawables"> - + <ScrollView + android:id="@+id/scrollView" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginBottom="10dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/bottom_navigation" + android:paddingBottom="10dp"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> <ImageView android:id="@+id/tituloJuego" android:layout_width="wrap_content" @@ -160,7 +172,8 @@ </LinearLayout> - <LinearLayout + <GridLayout + android:columnCount="2" android:id="@+id/estadisticas" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -168,37 +181,12 @@ android:background="@drawable/style_texto_border" android:gravity="center" android:orientation="horizontal" - android:padding="3dp" + android:padding="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/mainArea" tools:layout_editor_absoluteY="570dp"> - <LinearLayout - android:id="@+id/ataqueArea" - android:layout_width="100dp" - android:layout_height="wrap_content" - android:gravity="center" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/ataqueImage" - android:layout_width="30dp" - android:layout_height="30dp" - android:contentDescription="Imagen de ataque" - android:src="@drawable/icon_espada" /> - - <TextView - android:id="@+id/ataqueText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="5dp" - android:fontFamily="@font/pixeled" - android:text="1" - android:textColor="#000000" - android:textSize="18sp" /> - </LinearLayout> - <LinearLayout android:id="@+id/HealthArea" android:layout_width="110dp" @@ -224,6 +212,9 @@ android:textSize="18sp" /> </LinearLayout> + + + <LinearLayout android:id="@+id/EnergyArea" android:layout_width="110dp" @@ -274,46 +265,35 @@ android:textColor="#000000" android:textSize="18sp" /> </LinearLayout> + <LinearLayout + android:id="@+id/ataqueArea" + android:layout_width="100dp" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal"> + <ImageView + android:id="@+id/ataqueImage" + android:layout_width="30dp" + android:layout_height="30dp" + android:contentDescription="Imagen de ataque" + android:src="@drawable/icon_espada" /> - </LinearLayout> - + <TextView + android:id="@+id/ataqueText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:fontFamily="@font/pixeled" + android:text="1" + android:textColor="#000000" + android:textSize="18sp" /> + </LinearLayout> - <LinearLayout - android:id="@+id/bottom_navigation" - style="?android:attr/buttonBarStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent"> + </GridLayout> - <ImageButton - android:id="@+id/eventButton" - android:layout_width="0dp" - android:layout_height="50dp" - android:layout_marginEnd="40dp" - android:layout_weight="1" - android:background="?attr/selectableItemBackground" - android:contentDescription="Abre la zona de eventos" - android:padding="5dp" - android:scaleType="fitCenter" - android:src="@drawable/icon_event" /> - <ImageButton - android:id="@+id/inventoryButton" - android:layout_width="0dp" - android:layout_height="50dp" - android:layout_weight="1" - android:background="?attr/selectableItemBackground" - android:contentDescription="Abre el inventario" - android:padding="5dp" - android:scaleType="fitCenter" - android:src="@drawable/icon_inventario" /> - </LinearLayout> <GridLayout android:id="@+id/inventarioGrid" @@ -492,7 +472,42 @@ </androidx.cardview.widget.CardView> </GridLayout> + </LinearLayout> + </ScrollView> + <LinearLayout + android:id="@+id/bottom_navigation" + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + <ImageButton + android:id="@+id/eventButton" + android:layout_width="0dp" + android:layout_height="50dp" + android:layout_marginEnd="40dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:contentDescription="Abre la zona de eventos" + android:padding="5dp" + android:scaleType="fitCenter" + android:src="@drawable/icon_event" /> + <ImageButton + android:id="@+id/inventoryButton" + android:layout_width="0dp" + android:layout_height="50dp" + android:layout_weight="1" + android:background="?attr/selectableItemBackground" + android:contentDescription="Abre el inventario" + android:padding="5dp" + android:scaleType="fitCenter" + android:src="@drawable/icon_inventario" /> + + </LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>