From 11e933838d366335198f58cdc9dd70fa806e764d Mon Sep 17 00:00:00 2001
From: victor <victor.calleja.garcia@estudiantes.uva.es>
Date: Tue, 19 Nov 2024 23:46:13 +0100
Subject: [PATCH] Feature: arrelar vistas minijuegos
---
.idea/deploymentTargetSelector.xml | 10 +++
.../MinijuegoReparacion.kt | 11 ++-
.../example/ellegadodepintia/ruleta/Ruleta.kt | 1 -
.../main/res/drawable/asi_reparar_palo.png | Bin 13059 -> 5027 bytes
.../res/layout/activity_iniciominijuego1.xml | 58 ++++++++------
.../main/res/layout/activity_minijuego2.xml | 11 ++-
.../layout/activity_minijuego_reparacion.xml | 34 ++++-----
app/src/main/res/layout/activity_ruleta.xml | 72 ++++++++++--------
8 files changed, 113 insertions(+), 84 deletions(-)
create mode 100644 .idea/deploymentTargetSelector.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="deploymentTargetSelector">
+ <selectionStates>
+ <SelectionState runConfigName="app">
+ <option name="selectionMode" value="DROPDOWN" />
+ </SelectionState>
+ </selectionStates>
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt b/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
index 461e996..0fcf8f4 100644
--- a/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
@@ -133,15 +133,18 @@ class MinijuegoReparacion : AppCompatActivity() {
soundManager.playSound(R.raw.sound_qte,20)
val relativeLayout = findViewById<RelativeLayout>(R.id.relativeLayoutFragmentos)
var para = false
+ val initialX = ruleImageView.x
+ val initialY = ruleImageView.y
val randomX = Random.nextFloat() * (1050 - 350)
val randomY = Random.nextFloat() * (1400 - 250)
- val randomR = 150 + Random.nextFloat() * (360 - 150)
- paloImageView.x = randomX + 75
- paloImageView.y = randomY + 130
ruleImageView.x = randomX
ruleImageView.y = randomY
+ val deltaX = ruleImageView.x - initialX
+ val deltaY = ruleImageView.y - initialY
+ paloImageView.x += deltaX
+ paloImageView.y += deltaY
+ val randomR = 150 + Random.nextFloat() * (360 - 150)
ruleImageView.rotation = randomR
-
fadeIn(paloImageView, ruleImageView)
intervaloDeAngulo = Pair((270f + randomR) % 360, (330f + randomR) % 360).let {
if (it.first > it.second) it.second to it.first else it
diff --git a/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt b/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
index 483aa50..73b0004 100644
--- a/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
@@ -45,7 +45,6 @@ class Ruleta : AppCompatActivity() {
private fun inicializarVistas() {
ruletaImage = findViewById(R.id.ruletaImage)
puntero = findViewById(R.id.ruletaPuntero)
- multiplicadorResultado = findViewById(R.id.multiplicadorResultado)
puntuacion = findViewById(R.id.puntuacion)
titulo = findViewById(R.id.ruletaTitulo)
}
diff --git a/app/src/main/res/drawable/asi_reparar_palo.png b/app/src/main/res/drawable/asi_reparar_palo.png
index acf6a6bf3ec006bd6f7c3b223d6ffce646619ff0..08c485c3881a6f72de2053b70ad5469d2decf007 100644
GIT binary patch
literal 5027
zcmeAS@N?(olHy`uVBq!ia0y~yV7$)2z!1Q}#=yYf?Pf2^z`&r8>=ES4z)+>ez|hdb
z!0?NKfuZ3A14F3+1H-EX1_rAc3=HB0b9M#VFfcH%C3(BMF#HF>1$&oIW?*1oFY)ws
zWq-jfEGEMwoGUqpfq{WBzsN6y@%*ClSquz9Wu7jMAr-gY&OP6)5*>DY|NY{8m$b02
z=Vz8x<j*M#so-Y6`y%H~hr;HvhfXDmO-&E}8%q~1=h+b;5NO_{peJ(hAfvlLNR7??
z*_EGn#eaXjZq=Ed9nW7YDH(0vw0YI0RjYSvZ9d1oYrm+Vxl;ZgoA1YWJ{NKnc%xeX
zgMI)1<MZvSzis_lb1KkwUa#BNHS4nTZ-*((RcM{0Y22RBl%m5v+0%QIK#9bigrr3)
z@^*UNbUiU;j;QMe&XW^lBj*LH1}^fL#Pop0^vUTnVwEDQ#m%!H>nuIt``kS+{jIv!
z-;b3SKkDzkpH+A5GVkyCQ_uU}zFxrmP;JKjo=p?dW4}MFY5!e)u=aMvy4AmPt<G(@
zAGOOh&MW%GvxdV@)~=kuC&^MQGJCFx+LkmE?YJI=?l}THOt-iBeo9)aU3q)iwYwp=
zu56pvnv^^7WVh*Ov-8g`-|}vJdPmNW&;QlQ7n|SzyE*^=IkWfj+dV~C4!--iIsX5v
z<x97;s~J3>^X%=Jo+UF6GS2exYd^VRRTk^a1f!jtlAM0-uR_;~oo?;xF<H{?BeQLG
z&*5KJ{{}Yr?%%!iRoCyit6SGy(bQX<uWWy~)av!WJ-JJT{SKB`Z{5_>q%?Wqf`kit
z_xr4_p8nl+DA9H<!(11p7Y#hIJ1=lpJ$bU>o{)ozFxQiuRwL7AJ15nCTz~)n^7yJB
zA6}o=tNMRv2irk8rOx|5UWL!Qu6cj@krao_sFJp?e@;!F>8LHL<GFlVuvhofQdR~d
zJMDwFlPj*ZJ<o~t)?7Y~y)9Mr{*Jo8KVD~g?9!?Iv%UU5|NdVG+2#LScl~+Bymn!e
z!j3w--)}ZoPhGm^kqMVh9}i<(!NRxNb#*IuZ+V`-f5TH_j&+R>Eu*XNeERk6Xwmxh
z=4JEa?))g=7Vzn7ek`spmp6H@!8*qc?K5oE8w6i0U^Y1LE5Bp^$;Rdfev3oABy%TU
z+6D^ZyodihCSCG<uFUbR_h!zvsdsrEOR-dY#24SaQ7^)B@T#WW`t6?L$4oiCP583P
zE;O50S(@cKQ+o0GZJrV!QGr>42a-xO4{u{T_;o?q>UYx$GPs&-pFCxKoG7w5wduj7
z4u_9#kIiyDYs&FWz<BYJ0v^7m*De#by-Dtzl`Zf_@txizzFa*AcjH2Vn0cp<xI;wS
zeS<fcEh+t>7a?&?VTV@qe%r*D=7jo>UoR9m3ha>v2YiyH^oOc9_YF2Wen_jBng3PF
zbw0?z&D+*KT(l%u)>TDOb5>jP11^pUTkhT#HodNJ!<~<j!AqgzMLKWO>&96=uhM2u
z2`uJqvRz_z=*k&~aPwF(jxWK-T`w01#EAYp%-%mgf3i^z$jttRmrDe8sxa^!dhqVy
zjgssa%eA613ZfV6N)Vjgw%Ro9>fh$(^V==`B(5vm5LUUVKELME(#MaNPnNIwaxr}V
zma7u$mt}Y{pO&<|KI3fKh8)3#nd*{xQCmL7Pt85lI4}Ik%ygSC{_%A`?e~4(`{~KY
z$B}hEK0NvP`T6CbQ_Y+PUf<u@R=?l-y|1A_j;Cqv<Nkf0=idMO;V^&w$8K@|&l=aC
ztZ3@__Vcv(_qsoa<?qT{zTcZZ+3f%M%lY@SJ51IY&OX18=>W&(tLNQc><-si?Jj+D
znOn8=x#aCrjXLHw@qIbvw8QcYuZiyU(*+@n-}n8zT>ojlzx}^kpI;UlS61Y&Q>p)W
z^t5}Vlx@|A4=?@q{r~DOSO4^+J19nu|7gwscW1x+-kOhgUH!b%W*eDL>a_GV&Ck5d
z*8e>0?=kcGn{Ml$d0gf2y}ZEBbd&0e%tC3qyz=mke`e&X^t`?ua`8dQjA>QNF2+XY
zdsG;f{W<%;?*G-}7E)(dMArUa;AeT=_j1G0z~^4aj~~~6XS?IS&8*hugyTOR9ew`Y
z>$csRnLW?us&8oVk_lgV=-@#Key`Pq+%|s6Q+6t(UI|-hJ4-Q|DPg&t-op1m8#ndT
zNv1D}zq@bM_J=lQ!Q9i26$hU!jScU8zeixkd4Bo&myEYhtqT9FnYKB(<XrQCk6$|2
zAAejdK7YRj=VK`rYq!|zHyIamb2^>kWO=amaJp`k`lj?}ncb_dc(iKdI(o5YF)mx@
z8pI?ZRdrk>#!5$5W_rgu?ds-J;nTX6FIE)Qv`EUvsfK7as%#Q`yo-so$6fUB4z`1R
zhPIaLw3s|ws?GPf2^kr`+U0hYV+QBslZt8n@rg1137X7D3oYg)gw<TUdwkzZ!!NO`
z*6T1g=+23c^Y34}N_sQTWnIhuyTJ!1Fi7w!By9NiXx`c_eyoi?65*ysvbv4CRw*h!
z`)oODnNHJ|D~qk#3wfJlA1{!StnItBWp3bENrs2-W=v<YD7+&!r=mMhDMVF6`q^c+
zwdNDnx_;r$n{jFN-1$1ojH;5`614Ul;oeYnRrR2^qp6Vy)8?NddX8>aN}W<Ub6*Pt
z-2P@S$Z{|@!OZ?-!NN@~KG9cV7!|@rX9&Bsvs=tNKS51-&n*AKJLe8+EpB}fVYRC5
z-jrW$U-xagxBZU&7o%5S_DSB@z37bURfQ>+7G+9J37SxRJ!;C$UgiATVhk6y<@OZw
zHpMRXiu}Y>esE23m1fa|woB*x?XsVFEarN<#o;7_kSkN~i&?7qx6(haTb;i>_Qsm-
zzs~xLB|_#-G|gGh)^yF)X7ioDcUQH3uieafjaA;v@zKnE4;%&FNZh-g<rB-T^qZfV
zaY^FbU2m^RKfEye!o9=N`?mE={kr#1xX9_JUrQE7XMUfT6MwsOUf9~4{SBaEF4mdl
z=yl}-H@X;onTi-UmH+i_d)j{c<%G)jypq4pl|J^p`|X{3{?FM#IX6$&3a*Yj%C{&Y
zJwtZ=eWQii557H47CmOlQPzLX=i6bfYm#XP4H-Q7x(rlQ;@>@X_O$!LRwB$7b7O);
z+gB?Co#@JQkJtQrw>jdz45-v);8NH-KY@>7M+Vce3obqD+_>MjE3j;zv%~%RS%ZDn
zb0<I3IqWTzxwK}p&$d1OY7Mmu`azXJbxzG+*DtkBvHK^jST{2(LSEUjtixbUezWU=
zj$(`KcgcF&_}8T`{~r0via`XFIM+E!YC3A$x;H24vh>964@!2(zH7!j!J@+NSo`m9
z!rx!yZpdOduao_04{vjzslzMVPWI+qA;LPKQq$trhou(;CN9fo3zq+MR`l}OyLE>)
z?9-Kry?)}ut~KqBdw$&Az+JuXs<llkC`~$-SbBy33cG&NS*WSeWCn}ZhI?yg2u;el
z7%!4%xP9&p=lsc`%&%gsEOce(nu+J_$g5yK|9)S=ZPB9L3IFp9&zW+RP1<a?zx(5)
z)&EcbI#C(hBiX(0`UAelG5@5eg_lN~`R>_gq&6)vrdffb>4DTlk>1~q0xXUNXI;*k
zax^J$teb7H4lK~?(KRbufW=WD#u!w@O`mXNszke^z?~pat&``df7e0g8}s`uLe~QX
z9~*GwiIlsav&>rOxFLCt^iExlrf5e{Ens+VMur|o(`_eEx>ew4%2wOc+MMvcBPv_q
zP7+&u2h1*)%>@E))B>w{o1%S8xY-ZRd+_4<#2CZfS6)h5x0Nz?OO`k}zn>7-lWh6^
zO60DeGtMp5u0Qi!ip84Ea{^Ngce9rA9H+}1qU|f6H9WbyW%81RvlA~lmIT|CcU`z(
zy>$9)-SVp|HqH0Tvs8ccLC<o-re1}!i=Roc>~2*#>1D3CtE;?GImUodoHzEm*U73E
zqFlUty}Q<y8aF4J@~(B>cH=Ooh$UCoB9IQ&%^g?#8~m8G91Ix@QUp$xuKIbMbHcr;
zw>WjGnw^~AF9^D3{ygs74I#G4>-R)!e@&1)aPEPZ6O%3|El9YXa=5Tdsl+k7dnxyF
zCjQHcLQdCfw%(F|Jzei;d)vExx3<cpU!7l&nc(Z7n2=U53sg+qRoeN2Au;Lxe=djG
z&jt5iWWTy=^g_Z%&wSdo<_CNmYh2ecFjidG(P0kwl^m6y-#+6$=Q~xISxpJkE55yn
zyerjp$GTnB`|pBMCT+*x?9aK(9p>u0J-?$8|3xq`cGiUpyB8gpEvB9Ov+m>q(eE0|
z8DIU5iQWo|^7a#!={;KdB2wiko7a82Wo@$4YW+i}1*QuO9ZFIJ4HU$kixNIaO%sr+
zDi`r?Uvk>nLYA*Nx^c^!xX6mPi+>9S`GS&wqMS{|hecBT_Id$Yxsw@}xTpz9x-Ml%
zbIBBP+sxy=^!J7ohMTf$c};K3wwtU_@qLa_)ASaVw3`=IMA%>6y<ui?ktst~L*ZFk
zn9j|QQ*$c>Sj-Q{|N9zW^ZPLW|M$=Be?C<2pMCR9+-;M^kHgpVJv)ARS5esa<Ltrp
z-#&T%`mj0wZuq~>MNLl}$`&{|tv=oRg}bTNanBoz>zDUPF`l2-^RKWf!Z-bM+P4=6
z|AzDL|MN6`^2v%g|6}U<@p3nt*}wO#zIYIvkrn0tKVZNAV{iQLum9)O{yUW5GS$c=
zdjfBPw?@ef9yw5TXV5YC{lV0)I}ZKv|Nm}%-P81aU)R>}dm-DC_E6!5^S$~{PhPsa
zpD!o~SZvCW)nIfyBP8*Z*xI{)-1SVp#A?6TTmJrP&ug27mRhO1&RT=pl@t7z9{zbE
zBE%rQdrD_l+p!kQJ^WS|`Bgc1_d0t`wd*+Y^t=9+i~aNJeg!l9;}sVGm5LLde}29*
zMOY?h65~qg#m_%$7MXSht~)sQNY(m>tG~5(9pSgH{Z%o03n-5HD~k$FY|~^Djw;`>
z^npOz$BLe1Uq6WPy;G@r+wc8O-;`lh?xnUu-X_}=tGSnMZ(CA0RZhld!KFpBOg}_6
zhlGan2MM!Sp9^h&#L$qTy7WrUWHV4gS5#M5ulVvJ(8|)vsknq`)q+heDQ#g~kEQNJ
zwmAsB7M!!~pyKM|S5KN{f{Ir;qlb+9XUHk1JAcw+EBvVF<|}X~)`#u5(Z6pC()$}?
z*Qu{vwI*x(uer1BE-G-Wlb=+w&P`g*Y>C18gL98>@jP$TzWloJ^CsO6P*YlSncXt`
zT^Dli-YLGTP}Tpz@L;T~bdN^+t(9~2YSyh`-?ih9Wuo?DDNsu|n&p7ws@YF&E;=X0
zB0Vv8cbsKED3c$&di)EkV}mJk_R@8^+W8Mx>|{GAw`ihu!?JAgvIf4D3+6lhUA9@A
z#hktN=AGT^#1$GW`?nWmfXd4^ilr;LZ`K;RIOqwq{OZ)zO*_WPlu*I{gxkL5b5s>i
zK&axL*5(K69_3nx1n*A$;x_HZt|@XXzkAoe4C6Q@=%U2&PV4citQf7(*vBuP8uF<p
zPYIe3-1K`>q|e`kxvkNK1&ZRa+Aq(_9ygPH?ECKGt9|*i>?b{!d+a-Z>FQ_iea{!J
z$lPTe<P}gq?;YQy?#JPwpxX7FR?+np>k4gb5B_){7sI-F8SAR2+W9Y-CQAQ0_$69v
zsrS<R*0sl<&p(m3Gkiz<FN?LmUmxF{Ri{_McZv1){;ki`Pd{Ea|9|#RPfk~+C9Y4F
zDZNi$ZS0@+P*;YfeCo3Y3vB0|z4h}X&*YDa&o+zsh|UnYwe7W05#t8EOD)bH6nSKL
zmBdcJUiEKr@v|}kg<TwC<pFok@3#}z%wS;Q6lgKJGymU?&X<So%fHiJD}6twc80z3
zgQNE~>iP5zv*!K!+kKAzU)%NR&+YP8Ki|JgPQhcrlx^qP#c#!`GjncPTC&!fVaBcr
z3nwMG`CFQ|x3_Q3y>}2)%eUK9etOcf@>f!k{r&8_x!1&22OYbZ(`Qvaxr(Pvh~b8G
z2*a%3*|h=7k6-0y)ZCSC@Ar3U-8b*GZ+9*dH@&%5re6B#w3iGG*{7`@TkLZB*FN>l
z=k=Sv?RN<Elbyf(9e?kP?N1+-UBBcmpjm6CQV}ohtr@Et-~D=fUH$cS$0I9WU*B!E
zWOs=4yI1E+eYdVZt|)!3dZOFi^Ald>ZEe_QEzq9B`#i8WYeC7>U~kW(dvm?5^<7pb
z9G~3IKR<W!d9Vj2<kbJ(UiUfP>-H6Q{dl>G=vN<CEQ`sQHB%*^XjQf@ORv&Pwkp$A
zDy5SzO<WzX=k;d4$MWR=-hWlfT3&oQx1%6&gJ11mGhb<kQrW1cnisc)G@Pzj3P1VS
zGvW2?-vz}}8m_OsQS^74Z2Rfr=_-?M?t1z#N;i0(@x}WEs~A|=6Agq+ijB3W1sNVl
zY)e_W-@$H5&z4EjQC<ueq=PR!)mb_tWRm#OZ6<d<e7>@%u6?r?f9&4Nf4@vw(f#{O
zT{Yv)yW*Wnu3v9^oRnqYX65^OJb3?f9mnSqG2ec_{PNYN^nBZWmFedLzQ+V=N;Wc0
zzkK)X(l_s}iK%#&l&eR++BMJj7`yT5Ycp=<7)d1;Rs6X4`~Cj^k8|aE{<G)4bC@(o
zICnn-1A}UbYeY#(Vo9o1a#3nxNh*Vpfsu)>p`os!Wr&fHm65rXv6;4kft7(l-j1wq
zC>nC}Q!>*kachu&ddZ7{fk6XqLrG?CYH>+oZUMR;3o8R7h$V-uyI(LcFfe$!`njxg
HN@xNAEEIE1
literal 13059
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
W`smaBFBupZ7(8A5T-G@yGywomxU0kf
diff --git a/app/src/main/res/layout/activity_iniciominijuego1.xml b/app/src/main/res/layout/activity_iniciominijuego1.xml
index faf37ce..52ce681 100644
--- a/app/src/main/res/layout/activity_iniciominijuego1.xml
+++ b/app/src/main/res/layout/activity_iniciominijuego1.xml
@@ -1,46 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent"
- tools:context=".minijuego1.InicioMinijuego1">
+ android:layout_height="match_parent">
<ImageView
android:id="@+id/fondoImagen"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/background_minijuego_1"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ app:layout_constraintWidth_percent="1.0"
+ app:layout_constraintHeight_percent="1.0"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent" />
<ImageView
android:id="@+id/titleImage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_1_titulo"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintHeight_percent="0.2"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0.2" />
+
<ImageView
android:id="@+id/bioImage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_1_descripcion"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintHeight_percent="0.15"
+ app:layout_constraintTop_toBottomOf="@id/titleImage"
app:layout_constraintStart_toStartOf="parent"
- android:layout_marginTop="300dp"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0" />
<ImageView
android:id="@+id/startButton"
- android:layout_width="wrap_content"
- android:layout_height="90dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_3_jugar"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintWidth_percent="0.8"
+ app:layout_constraintHeight_percent="0.1"
+ app:layout_constraintTop_toBottomOf="@id/bioImage"
app:layout_constraintStart_toStartOf="parent"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="56dp"
- android:layout_marginTop="600dp"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0.2" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_minijuego2.xml b/app/src/main/res/layout/activity_minijuego2.xml
index 281d2e2..f9c39da 100644
--- a/app/src/main/res/layout/activity_minijuego2.xml
+++ b/app/src/main/res/layout/activity_minijuego2.xml
@@ -26,25 +26,24 @@
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_alignParentTop="true"
- android:layout_marginTop="150dp"
+ android:layout_marginTop="100dp"
android:src="@drawable/texto_minijuego_2_titulo" />
<ImageView
android:id="@+id/descripcion"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="120dp"
+ android:layout_below="@id/titulo"
+ android:layout_marginTop="0dp"
android:src="@drawable/texto_minijuego_2_descripcion"
- android:layout_alignParentTop="true"
- android:layout_marginTop="400dp"
- android:layout_centerHorizontal="true"
/>
<ImageView
android:id="@+id/boton_iniciar"
android:layout_width="200dp"
android:layout_height="100dp"
- android:layout_marginTop="600dp"
android:src="@drawable/texto_minijuego_2_jugar"
+ android:layout_below="@id/descripcion"
android:layout_centerHorizontal="true"
android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/activity_minijuego_reparacion.xml b/app/src/main/res/layout/activity_minijuego_reparacion.xml
index e5bea48..5f9aa0b 100644
--- a/app/src/main/res/layout/activity_minijuego_reparacion.xml
+++ b/app/src/main/res/layout/activity_minijuego_reparacion.xml
@@ -5,8 +5,6 @@
android:background="@drawable/background_minijuego_reparar">
-
- <!-- Imagen del martillo -->
<ImageView
android:id="@+id/martillo"
android:layout_width="100dp"
@@ -16,46 +14,42 @@
android:layout_marginTop="16dp"
android:visibility="gone" />
- <!-- Imagen de la antigüedad a reparar -->
+
<ImageView
android:id="@+id/imageToRepair"
android:layout_width="250dp"
android:layout_height="250dp"
android:src="@drawable/asi_exploradores_jabonera"
android:layout_centerHorizontal="true"
- android:layout_marginBottom="-400dp"
+ android:layout_marginBottom="16dp"
android:visibility="gone" />
- <!-- Contenedor de los fragmentos (estos se agregarán programáticamente) -->
+
<RelativeLayout
android:id="@+id/relativeLayoutFragmentos"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true" >
+ </RelativeLayout>
- </RelativeLayout>
- <!-- Imagen del Quick Time Event -->
<ImageView
android:id="@+id/QTERule"
android:layout_width="150dp"
android:layout_height="150dp"
- android:src="@drawable/asi_reparar_rule"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
- />
- <!-- Imagen de la aguja para el QTE -->
+ android:scaleType="fitCenter"
+ android:src="@drawable/asi_reparar_rule" />
+
+
<ImageView
android:id="@+id/QTEPalo"
- android:layout_width="90dp"
- android:layout_height="50dp"
- android:layout_marginLeft="10dp"
- android:layout_marginStart="160dp"
- android:layout_marginTop="65dp"
- android:scaleX="3"
- android:scaleY="1.5"
+ android:layout_width="100dp"
+ android:layout_height="40dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="72dp"
+ android:scaleX="1.5"
+ android:scaleY="1"
android:src="@drawable/asi_reparar_palo" />
-
-
-
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_ruleta.xml b/app/src/main/res/layout/activity_ruleta.xml
index 85a4359..9e2c952 100644
--- a/app/src/main/res/layout/activity_ruleta.xml
+++ b/app/src/main/res/layout/activity_ruleta.xml
@@ -1,35 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
android:padding="16dp"
- android:gravity="center"
- android:id="@+id/ruletaLayout"
android:background="@drawable/background_minijuego_ruleta">
<ImageView
android:id="@+id/ruletaTitulo"
- android:layout_width="wrap_content"
- android:layout_height="132dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:layout_marginBottom="20dp"
android:contentDescription="Título de la ruleta"
- android:src="@drawable/texto_ruleta_titulo" />
+ android:src="@drawable/texto_ruleta_titulo"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintDimensionRatio="2:1"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
<ImageView
android:id="@+id/ruletaPuntero"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:layout_gravity="center"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:contentDescription="Puntero de la ruleta"
android:rotation="180"
- android:src="@drawable/asi_ruleta_puntero" />
+ android:src="@drawable/asi_ruleta_puntero"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="0.1"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintTop_toBottomOf="@id/ruletaTitulo"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
<FrameLayout
- android:layout_width="350dp"
- android:layout_height="350dp"
- android:layout_gravity="center"
- android:layout_marginBottom="30dp">
+ android:id="@+id/ruletaContainer"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintTop_toBottomOf="@id/ruletaPuntero"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/puntuacion">
+
<ImageView
android:id="@+id/ruletaImage"
android:layout_width="match_parent"
@@ -39,26 +56,21 @@
android:scaleType="centerCrop"/>
</FrameLayout>
- <TextView
- android:id="@+id/multiplicadorResultado"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Multiplicador: x1"
- android:textSize="18sp"
- android:textColor="#000"
- android:visibility="gone"
- android:layout_marginTop="20dp"
- android:layout_gravity="center"/>
+
<TextView
android:id="@+id/puntuacion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Puntuación: 33"
- android:textSize="40sp"
+ android:text="Puntuación: 33"
+ android:textSize="35sp"
android:textColor="#FFFF00"
- android:layout_marginTop="40dp"
android:fontFamily="@font/pixeled"
android:textAlignment="center"
- android:textStyle="bold"/>
-</LinearLayout>
+ android:textStyle="bold"
+ android:layout_marginTop="16dp"
+ app:layout_constraintTop_toBottomOf="@id/ruletaContainer"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--
GitLab