Skip to content

Commit 2d673f0

Browse files
oxcaroxcar
committed
Refactorización de colores en los layouts
1 parent 11e0016 commit 2d673f0

File tree

10 files changed

+42
-30
lines changed

10 files changed

+42
-30
lines changed

‎mapmap-app/app/src/main/res/layout-large/activity_capture.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
android:textColor="@color/text_color_blue" />
9191

9292
<Chronometer
93-
android:id="@+id/duracionText"
93+
android:id="@+id/cronometroDuracion"
9494
style="@style/text_title_map"
9595
android:layout_width="wrap_content"
9696
android:layout_height="match_parent"
@@ -124,7 +124,7 @@
124124
android:layout_height="match_parent"
125125
android:layout_marginLeft="16dp"
126126
android:gravity="center_vertical"
127-
android:text="0m"
127+
android:text="0"
128128
android:textColor="#000" />
129129

130130
</LinearLayout>
@@ -248,7 +248,7 @@
248248
android:gravity="center_vertical|end"
249249
android:text="0"
250250
android:layout_weight="1"
251-
android:textColor="#00e191"
251+
android:textColor="@color/text_color_green"
252252
android:textSize="40sp" />
253253

254254
<ImageButton
@@ -286,7 +286,7 @@
286286
android:layout_marginLeft="8dp"
287287
android:layout_weight="1"
288288
android:text="0"
289-
android:textColor="#ff8500"
289+
android:textColor="@color/text_color_orange"
290290
android:textSize="40sp" />
291291

292292
</LinearLayout>

‎mapmap-app/app/src/main/res/layout-large/activity_main.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:id="@+id/usuarioLabel"
2525
android:layout_width="wrap_content"
2626
android:layout_height="wrap_content"
27-
android:textColor="#2f323e"
27+
android:textColor="@color/text_color_dark_gray"
2828
android:textSize="20sp"
2929
android:text=""/>
3030

@@ -45,15 +45,17 @@
4545
android:layout_height="wrap_content"
4646
android:layout_marginTop="64dp"
4747
android:layout_marginLeft="64dp"
48-
android:orientation="vertical">
48+
android:orientation="vertical"
49+
android:layout_marginStart="64dp">
4950

5051
<ImageButton
5152
android:id="@+id/botonTrazar"
5253
android:layout_width="wrap_content"
5354
android:layout_height="wrap_content"
5455
android:layout_marginBottom="32dp"
5556
android:src="@drawable/btn_trazar"
56-
android:background="@null"/>
57+
android:background="@null"
58+
android:contentDescription="Trazar" />
5759

5860
<ImageButton
5961
android:id="@+id/botonRecorridos"
@@ -63,7 +65,8 @@
6365
android:layout_alignLeft="@+id/WandButton"
6466
android:layout_marginBottom="32dp"
6567
android:background="@null"
66-
android:src="@drawable/btn_recorridos" />
68+
android:src="@drawable/btn_recorridos"
69+
android:contentDescription="Recorridos"/>
6770

6871
<ImageButton
6972
android:id="@+id/botonEnviar"
@@ -72,7 +75,8 @@
7275
android:layout_alignLeft="@+id/ReviewButton"
7376
android:layout_centerVertical="true"
7477
android:background="@null"
75-
android:src="@drawable/btn_enviar" />
78+
android:src="@drawable/btn_enviar"
79+
android:contentDescription="Enviar"/>
7680

7781
</LinearLayout>
7882

‎mapmap-app/app/src/main/res/layout/activity_capture.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
android:gravity="center_vertical|end"
249249
android:text="0"
250250
android:layout_weight="1"
251-
android:textColor="#00e191"
251+
android:textColor="@color/text_color_green"
252252
android:textSize="40sp" />
253253

254254
<ImageButton
@@ -286,7 +286,7 @@
286286
android:layout_marginLeft="8dp"
287287
android:layout_weight="1"
288288
android:text="0"
289-
android:textColor="#ff8500"
289+
android:textColor="@color/text_color_orange"
290290
android:textSize="40sp" />
291291

292292
</LinearLayout>

‎mapmap-app/app/src/main/res/layout/activity_main.xml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
android:id="@+id/usuarioLabel"
2525
android:layout_width="wrap_content"
2626
android:layout_height="wrap_content"
27-
android:textColor="#2f323e"
27+
android:textColor="@color/text_color_dark_gray"
2828
android:textSize="20sp"
2929
android:text=""/>
3030

@@ -45,15 +45,17 @@
4545
android:layout_height="wrap_content"
4646
android:layout_marginTop="64dp"
4747
android:layout_marginLeft="64dp"
48-
android:orientation="vertical">
48+
android:orientation="vertical"
49+
android:layout_marginStart="64dp">
4950

5051
<ImageButton
5152
android:id="@+id/botonTrazar"
5253
android:layout_width="wrap_content"
5354
android:layout_height="wrap_content"
5455
android:layout_marginBottom="32dp"
5556
android:src="@drawable/btn_trazar"
56-
android:background="@null"/>
57+
android:background="@null"
58+
android:contentDescription="Trazar" />
5759

5860
<ImageButton
5961
android:id="@+id/botonRecorridos"
@@ -63,7 +65,8 @@
6365
android:layout_alignLeft="@+id/WandButton"
6466
android:layout_marginBottom="32dp"
6567
android:background="@null"
66-
android:src="@drawable/btn_recorridos" />
68+
android:src="@drawable/btn_recorridos"
69+
android:contentDescription="Recorridos"/>
6770

6871
<ImageButton
6972
android:id="@+id/botonEnviar"
@@ -72,7 +75,8 @@
7275
android:layout_alignLeft="@+id/ReviewButton"
7376
android:layout_centerVertical="true"
7477
android:background="@null"
75-
android:src="@drawable/btn_enviar" />
78+
android:src="@drawable/btn_enviar"
79+
android:contentDescription="Enviar"/>
7680

7781
</LinearLayout>
7882

‎mapmap-app/app/src/main/res/layout/activity_new.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
android:id="@+id/appLogo"
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
23-
android:src="@drawable/app_logo" />
23+
android:src="@drawable/app_logo"
24+
android:contentDescription="MapMap" />
2425

2526
</LinearLayout>
2627

‎mapmap-app/app/src/main/res/layout/activity_register.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@
55
android:layout_height="match_parent"
66
android:background="#EDF5E1"
77
android:orientation="vertical"
8-
android:paddingBottom="@dimen/activity_vertical_margin"
98
android:paddingLeft="@dimen/activity_horizontal_margin"
10-
android:paddingRight="@dimen/activity_horizontal_margin"
119
android:paddingTop="@dimen/activity_vertical_margin"
12-
tools:context=".NewActivity" >
10+
android:paddingRight="@dimen/activity_horizontal_margin"
11+
android:paddingBottom="@dimen/activity_vertical_margin"
12+
tools:context=".NewActivity">
1313

1414
<LinearLayout
1515
android:layout_width="match_parent"
16-
android:layout_height="wrap_content" >
16+
android:layout_height="wrap_content">
1717

1818
<ImageView
1919
android:id="@+id/passengerImageView"
2020
android:layout_width="wrap_content"
2121
android:layout_height="wrap_content"
22-
android:src="@drawable/app_logo" />
22+
android:src="@drawable/app_logo"
23+
android:contentDescription="MapMap" />
24+
2325
</LinearLayout>
2426

2527
<LinearLayout
2628
android:id="@+id/linearLayout"
2729
android:layout_width="fill_parent"
2830
android:layout_height="wrap_content"
29-
android:layout_alignLeft="@+id/passengerImageView"
3031
android:layout_below="@+id/passengerImageView"
31-
android:orientation="vertical" >
32+
android:layout_alignLeft="@+id/passengerImageView"
33+
android:orientation="vertical">
3234

3335
<ImageView
3436
android:id="@+id/imageView1"
@@ -50,9 +52,9 @@
5052
android:id="@+id/usuarioInputText"
5153
android:layout_width="match_parent"
5254
android:layout_height="48dp"
55+
android:layout_below="@+id/usuarioLabel"
5356
android:layout_alignParentLeft="true"
5457
android:layout_alignParentRight="true"
55-
android:layout_below="@+id/usuarioLabel"
5658
android:layout_marginTop="8dp"
5759
android:imeOptions="actionDone"
5860
android:maxLines="1"

‎mapmap-app/app/src/main/res/layout/activity_review.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
android:id="@+id/captureList"
3535
android:layout_width="match_parent"
3636
android:layout_height="wrap_content"
37-
android:cacheColorHint="#00000000"
37+
android:cacheColorHint="@color/text_color_dark_gray"
3838
android:divider="#00000000"
3939
android:layout_marginTop="32dp"
40-
android:dividerHeight="16dp">
40+
android:dividerHeight="8dp">
4141

4242
</ListView>
4343

‎mapmap-app/app/src/main/res/layout/capture_list_item_layout.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<LinearLayout
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
29-
android:gravity="right"
29+
android:gravity="end"
3030
android:paddingTop="9dp" >
3131

3232

‎mapmap-app/app/src/main/res/values/colors.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<color name="text_color">#EDF5E1</color>
4-
<color name="text_color_green">#5CDB95</color>
4+
<color name="text_color_green">#00e191</color>
55
<color name="text_color_blue">#05386B</color>
66
<color name="text_color_gray">#76847C</color>
7+
<color name="text_color_dark_gray">#2f323d</color>
8+
<color name="text_color_orange">#ff8500</color>
79
</resources>

‎mapmap-app/app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<string name="finalizar">Finalizar</string>
77
<string name="boton_marcar_parada">Marcar parada</string>
88
<string name="boton_iniciar_captura">Iniciar captura</string>
9-
<string name="btn_iniciar_captura">Inciiar captura</string>
109
<string name="boton_mas">Más</string>
1110
<string name="boton_menos">Menos</string>
1211
</resources>

0 commit comments

Comments
 (0)