Skip to content

Commit 411b77d

Browse files
PapelRasgadoPapelRasgado
committed
Final
1 parent 4362402 commit 411b77d

File tree

4 files changed

+67
-32
lines changed

4 files changed

+67
-32
lines changed

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/daw/jp/genioquiz/GerenciadorPergunta.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,6 @@ public GerenciadorPergunta() {
101101
}
102102
};
103103
perguntas.add(new Pergunta("(Caveleiros do Zodiaco) Na Saga do Inferno quais são os deuses do sono e da morte que auxiliam Hades?", 2, "Thanatos", "Morpheus", "Hypnos", "Lucifer", valores));
104-
valores = new ArrayList<Boolean>() {
105-
{
106-
add(true);
107-
add(false);
108-
add(true);
109-
add(true);
110-
}
111-
};
112-
perguntas.add(new Pergunta("(Cavaleiros Do Zodiaco) Qual o Cavaleiro de Ouro que representa 'O pacifico carneiro que cavalga entre as estrelas' e possui poderes psiquicos?", 2, "Aioros de Sagitario", "Mú de Aries", "Saga de Gêmeos", "Manigold de Cancer", valores));
113104
valores = new ArrayList<Boolean>() {
114105
{
115106
add(false);
@@ -130,10 +121,10 @@ public GerenciadorPergunta() {
130121
perguntas.add(new Pergunta("(Cavaleiros Do Zodiaco) Quantas armaduras do Santuario (Bronze, Prata e Ouro) provem de constelações oficiais no anime e no mangá?", 2, "17", "88", "99", "124", valores));
131122
valores = new ArrayList<Boolean>() {
132123
{
124+
add(true);
133125
add(false);
134126
add(true);
135127
add(true);
136-
add(false);
137128
}
138129
};
139130
perguntas.add(new Pergunta("(Sword Art Online) Qual as espadas usadas por Kirito?", 3, "Excalibur", "Hasagi", "Elucidator", "Dark Repulser", valores));

‎app/src/main/res/layout/layout_pergunta.xml

+29-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
android:layout_marginEnd="8dp"
1414
android:layout_marginStart="8dp"
1515
android:layout_marginTop="8dp"
16+
android:fontFamily="@font/finger_paint"
1617
android:text="Pergunta"
18+
android:textColor="@android:color/background_dark"
1719
android:textSize="18sp"
1820
app:layout_constraintBottom_toBottomOf="parent"
1921
app:layout_constraintEnd_toEndOf="parent"
@@ -29,7 +31,9 @@
2931
android:layout_marginEnd="16dp"
3032
android:layout_marginStart="8dp"
3133
android:layout_marginTop="8dp"
34+
android:fontFamily="@font/finger_paint"
3235
android:text="Pergunta"
36+
android:textColor="@android:color/background_dark"
3337
app:layout_constraintBottom_toBottomOf="parent"
3438
app:layout_constraintEnd_toEndOf="parent"
3539
app:layout_constraintHorizontal_bias="0.206"
@@ -46,6 +50,7 @@
4650
android:layout_marginStart="8dp"
4751
android:layout_marginTop="60dp"
4852
android:text="Alternativa 1"
53+
android:fontFamily="@font/finger_paint"
4954
app:layout_constraintBottom_toBottomOf="parent"
5055
app:layout_constraintEnd_toStartOf="@+id/rdo3"
5156
app:layout_constraintHorizontal_bias="0.0"
@@ -56,6 +61,7 @@
5661
<CheckBox
5762
android:id="@+id/rdo2"
5863
android:layout_width="0dp"
64+
android:fontFamily="@font/finger_paint"
5965
android:layout_height="wrap_content"
6066
android:layout_marginBottom="8dp"
6167
android:layout_marginEnd="24dp"
@@ -73,6 +79,7 @@
7379
android:id="@+id/rdo3"
7480
android:layout_width="0dp"
7581
android:layout_height="wrap_content"
82+
android:fontFamily="@font/finger_paint"
7683
android:layout_marginBottom="8dp"
7784
android:layout_marginEnd="8dp"
7885
android:layout_marginStart="190dp"
@@ -90,6 +97,7 @@
9097
android:layout_width="0dp"
9198
android:layout_height="wrap_content"
9299
android:layout_marginBottom="8dp"
100+
android:fontFamily="@font/finger_paint"
93101
android:layout_marginEnd="8dp"
94102
android:layout_marginStart="190dp"
95103
android:layout_marginTop="32dp"
@@ -105,11 +113,14 @@
105113
android:id="@+id/btn_send"
106114
android:layout_width="wrap_content"
107115
android:layout_height="wrap_content"
116+
android:fontFamily="@font/finger_paint"
108117
android:layout_marginBottom="8dp"
109118
android:layout_marginEnd="8dp"
110119
android:layout_marginStart="8dp"
111120
android:layout_marginTop="8dp"
112-
android:text="Confirmar"
121+
android:background="@color/colorPrimary"
122+
android:text=" Confirmar "
123+
android:textColor="@android:color/background_light"
113124
app:layout_constraintBottom_toBottomOf="parent"
114125
app:layout_constraintEnd_toEndOf="parent"
115126
app:layout_constraintStart_toStartOf="parent"
@@ -130,4 +141,21 @@
130141
app:layout_constraintStart_toStartOf="parent"
131142
app:layout_constraintTop_toTopOf="parent"
132143
app:layout_constraintVertical_bias="1.0" />
144+
145+
<TextView
146+
android:id="@+id/textView6"
147+
android:layout_width="wrap_content"
148+
android:layout_height="wrap_content"
149+
android:layout_marginBottom="8dp"
150+
android:layout_marginEnd="8dp"
151+
android:layout_marginStart="8dp"
152+
android:layout_marginTop="8dp"
153+
android:fontFamily="@font/finger_paint"
154+
android:text="Nenhum Direito Reservado © Grupo Pink 2018"
155+
android:textColor="@android:color/background_dark"
156+
app:layout_constraintBottom_toBottomOf="parent"
157+
app:layout_constraintEnd_toEndOf="parent"
158+
app:layout_constraintStart_toStartOf="parent"
159+
app:layout_constraintTop_toTopOf="parent"
160+
app:layout_constraintVertical_bias="1.0" />
133161
</android.support.constraint.ConstraintLayout>

‎app/src/main/res/layout/layout_resultado.xml

+36-20
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77

88
<TextView
99
android:id="@+id/txt_resu_resp3"
10-
android:layout_width="wrap_content"
11-
android:layout_height="wrap_content"
10+
android:layout_width="129dp"
11+
android:layout_height="31dp"
1212
android:layout_marginBottom="8dp"
1313
android:layout_marginEnd="8dp"
1414
android:layout_marginStart="8dp"
15-
android:layout_marginTop="32dp"
15+
android:layout_marginTop="19dp"
16+
android:gravity="center_vertical"
1617
android:text="Alternativa 3"
18+
android:fontFamily="@font/finger_paint"
1719
app:layout_constraintBottom_toBottomOf="parent"
1820
app:layout_constraintEnd_toEndOf="parent"
1921
app:layout_constraintHorizontal_bias="0.023"
@@ -38,13 +40,15 @@
3840

3941
<TextView
4042
android:id="@+id/txt_resu_resp4"
41-
android:layout_width="wrap_content"
42-
android:layout_height="wrap_content"
43+
android:layout_width="129dp"
44+
android:layout_height="31dp"
4345
android:layout_marginBottom="8dp"
46+
android:fontFamily="@font/finger_paint"
4447
android:layout_marginEnd="8dp"
4548
android:layout_marginStart="8dp"
46-
android:layout_marginTop="32dp"
47-
android:text="Alternativa 2"
49+
android:layout_marginTop="20dp"
50+
android:gravity="center_vertical"
51+
android:text="Alternativa 4"
4852
app:layout_constraintBottom_toBottomOf="parent"
4953
app:layout_constraintEnd_toEndOf="parent"
5054
app:layout_constraintHorizontal_bias="0.023"
@@ -69,16 +73,18 @@
6973

7074
<TextView
7175
android:id="@+id/txt_resu_resp2"
72-
android:layout_width="wrap_content"
73-
android:layout_height="wrap_content"
76+
android:layout_width="129dp"
77+
android:fontFamily="@font/finger_paint"
78+
android:layout_height="31dp"
7479
android:layout_marginBottom="8dp"
7580
android:layout_marginEnd="8dp"
7681
android:layout_marginStart="8dp"
77-
android:layout_marginTop="32dp"
82+
android:layout_marginTop="20dp"
83+
android:gravity="center_vertical"
7884
android:text="Alternativa 2"
7985
app:layout_constraintBottom_toBottomOf="parent"
8086
app:layout_constraintEnd_toEndOf="parent"
81-
app:layout_constraintHorizontal_bias="0.023"
87+
app:layout_constraintHorizontal_bias="0.016"
8288
app:layout_constraintStart_toEndOf="@+id/txt_resu_color2"
8389
app:layout_constraintTop_toBottomOf="@+id/txt_resu_resp1"
8490
app:layout_constraintVertical_bias="0.0" />
@@ -100,6 +106,7 @@
100106

101107
<TextView
102108
android:id="@+id/txt_resu_resp"
109+
android:fontFamily="@font/finger_paint"
103110
android:layout_width="0dp"
104111
android:layout_height="wrap_content"
105112
android:layout_marginBottom="8dp"
@@ -117,19 +124,21 @@
117124

118125
<TextView
119126
android:id="@+id/txt_resu_resp1"
120-
android:layout_width="wrap_content"
121-
android:layout_height="wrap_content"
127+
android:fontFamily="@font/finger_paint"
128+
android:gravity="center_vertical"
129+
android:layout_width="129dp"
130+
android:layout_height="31dp"
122131
android:layout_marginBottom="8dp"
123132
android:layout_marginEnd="8dp"
124133
android:layout_marginStart="8dp"
125-
android:layout_marginTop="8dp"
134+
android:layout_marginTop="27dp"
126135
android:text="Alternativa 1"
127136
app:layout_constraintBottom_toBottomOf="parent"
128137
app:layout_constraintEnd_toEndOf="parent"
129-
app:layout_constraintHorizontal_bias="0.023"
138+
app:layout_constraintHorizontal_bias="0.016"
130139
app:layout_constraintStart_toEndOf="@+id/txt_resu_color1"
131140
app:layout_constraintTop_toBottomOf="@+id/txt_resu_resp"
132-
app:layout_constraintVertical_bias="0.107" />
141+
app:layout_constraintVertical_bias="0.0" />
133142

134143
<TextView
135144
android:id="@+id/txt_resu_color1"
@@ -148,7 +157,9 @@
148157

149158
<TextView
150159
android:id="@+id/txt_resu_resu"
160+
151161
android:layout_width="wrap_content"
162+
android:fontFamily="@font/finger_paint"
152163
android:layout_height="wrap_content"
153164
android:layout_marginBottom="8dp"
154165
android:layout_marginEnd="8dp"
@@ -165,6 +176,7 @@
165176

166177
<TextView
167178
android:id="@+id/txt_resu_info"
179+
android:fontFamily="@font/finger_paint"
168180
android:layout_width="0dp"
169181
android:layout_height="wrap_content"
170182
android:layout_marginBottom="8dp"
@@ -186,7 +198,8 @@
186198
android:layout_marginBottom="8dp"
187199
android:layout_marginEnd="8dp"
188200
android:layout_marginStart="155dp"
189-
android:layout_marginTop="8dp"
201+
android:layout_marginTop="7dp"
202+
android:fontFamily="@font/finger_paint"
190203
android:text="pont 1"
191204
app:layout_constraintBottom_toBottomOf="parent"
192205
app:layout_constraintEnd_toEndOf="parent"
@@ -201,7 +214,8 @@
201214
android:layout_height="wrap_content"
202215
android:layout_marginEnd="8dp"
203216
android:layout_marginStart="155dp"
204-
android:layout_marginTop="32dp"
217+
android:layout_marginTop="25dp"
218+
android:fontFamily="@font/finger_paint"
205219
android:text="pont 3"
206220
app:layout_constraintEnd_toEndOf="parent"
207221
app:layout_constraintHorizontal_bias="0.0"
@@ -215,7 +229,8 @@
215229
android:layout_marginBottom="8dp"
216230
android:layout_marginEnd="8dp"
217231
android:layout_marginStart="155dp"
218-
android:layout_marginTop="32dp"
232+
android:layout_marginTop="27dp"
233+
android:fontFamily="@font/finger_paint"
219234
android:text="pont 2"
220235
app:layout_constraintBottom_toBottomOf="parent"
221236
app:layout_constraintEnd_toEndOf="parent"
@@ -231,7 +246,8 @@
231246
android:layout_marginBottom="8dp"
232247
android:layout_marginEnd="8dp"
233248
android:layout_marginStart="155dp"
234-
android:layout_marginTop="32dp"
249+
android:layout_marginTop="27dp"
250+
android:fontFamily="@font/finger_paint"
235251
android:text="pont 4"
236252
app:layout_constraintBottom_toBottomOf="parent"
237253
app:layout_constraintEnd_toEndOf="parent"

0 commit comments

Comments
 (0)