Refactorización de colores en los layouts

CodeandoMexico · Jan 26, 2023 · 2d673f0 · 2d673f0
1 parent 11e0016
commit 2d673f0
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 30 deletions.
diff --git a/mapmap-app/app/src/main/res/layout-large/activity_capture.xml b/mapmap-app/app/src/main/res/layout-large/activity_capture.xml
@@ -90,7 +90,7 @@
  android:textColor="@color/text_color_blue" />
 
  <Chronometer
- android:id="@+id/duracionText"
+ android:id="@+id/cronometroDuracion"
  style="@style/text_title_map"
  android:layout_width="wrap_content"
  android:layout_height="match_parent"
@@ -124,7 +124,7 @@
  android:layout_height="match_parent"
  android:layout_marginLeft="16dp"
  android:gravity="center_vertical"
- android:text="0m"
+ android:text="0"
  android:textColor="#000" />
 
  </LinearLayout>
@@ -248,7 +248,7 @@
  android:gravity="center_vertical|end"
  android:text="0"
  android:layout_weight="1"
- android:textColor="#00e191"
+ android:textColor="@color/text_color_green"
  android:textSize="40sp" />
 
  <ImageButton
@@ -286,7 +286,7 @@
  android:layout_marginLeft="8dp"
  android:layout_weight="1"
  android:text="0"
- android:textColor="#ff8500"
+ android:textColor="@color/text_color_orange"
  android:textSize="40sp" />
 
  </LinearLayout>

diff --git a/mapmap-app/app/src/main/res/layout-large/activity_main.xml b/mapmap-app/app/src/main/res/layout-large/activity_main.xml
@@ -24,7 +24,7 @@
  android:id="@+id/usuarioLabel"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:textColor="#2f323e"
+ android:textColor="@color/text_color_dark_gray"
  android:textSize="20sp"
  android:text=""/>
 
@@ -45,15 +45,17 @@
  android:layout_height="wrap_content"
  android:layout_marginTop="64dp"
  android:layout_marginLeft="64dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginStart="64dp">
 
  <ImageButton
  android:id="@+id/botonTrazar"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginBottom="32dp"
  android:src="@drawable/btn_trazar"
- android:background="@null"/>
+ android:background="@null"
+ android:contentDescription="Trazar" />
 
  <ImageButton
  android:id="@+id/botonRecorridos"
@@ -63,7 +65,8 @@
  android:layout_alignLeft="@+id/WandButton"
  android:layout_marginBottom="32dp"
  android:background="@null"
- android:src="@drawable/btn_recorridos" />
+ android:src="@drawable/btn_recorridos"
+ android:contentDescription="Recorridos"/>
 
  <ImageButton
  android:id="@+id/botonEnviar"
@@ -72,7 +75,8 @@
  android:layout_alignLeft="@+id/ReviewButton"
  android:layout_centerVertical="true"
  android:background="@null"
- android:src="@drawable/btn_enviar" />
+ android:src="@drawable/btn_enviar"
+ android:contentDescription="Enviar"/>
 
  </LinearLayout>
 

diff --git a/mapmap-app/app/src/main/res/layout/activity_capture.xml b/mapmap-app/app/src/main/res/layout/activity_capture.xml
@@ -248,7 +248,7 @@
  android:gravity="center_vertical|end"
  android:text="0"
  android:layout_weight="1"
- android:textColor="#00e191"
+ android:textColor="@color/text_color_green"
  android:textSize="40sp" />
 
  <ImageButton
@@ -286,7 +286,7 @@
  android:layout_marginLeft="8dp"
  android:layout_weight="1"
  android:text="0"
- android:textColor="#ff8500"
+ android:textColor="@color/text_color_orange"
  android:textSize="40sp" />
 
  </LinearLayout>

diff --git a/mapmap-app/app/src/main/res/layout/activity_main.xml b/mapmap-app/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
  android:id="@+id/usuarioLabel"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:textColor="#2f323e"
+ android:textColor="@color/text_color_dark_gray"
  android:textSize="20sp"
  android:text=""/>
 
@@ -45,15 +45,17 @@
  android:layout_height="wrap_content"
  android:layout_marginTop="64dp"
  android:layout_marginLeft="64dp"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginStart="64dp">
 
  <ImageButton
  android:id="@+id/botonTrazar"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:layout_marginBottom="32dp"
  android:src="@drawable/btn_trazar"
- android:background="@null"/>
+ android:background="@null"
+ android:contentDescription="Trazar" />
 
  <ImageButton
  android:id="@+id/botonRecorridos"
@@ -63,7 +65,8 @@
  android:layout_alignLeft="@+id/WandButton"
  android:layout_marginBottom="32dp"
  android:background="@null"
- android:src="@drawable/btn_recorridos" />
+ android:src="@drawable/btn_recorridos"
+ android:contentDescription="Recorridos"/>
 
  <ImageButton
  android:id="@+id/botonEnviar"
@@ -72,7 +75,8 @@
  android:layout_alignLeft="@+id/ReviewButton"
  android:layout_centerVertical="true"
  android:background="@null"
- android:src="@drawable/btn_enviar" />
+ android:src="@drawable/btn_enviar"
+ android:contentDescription="Enviar"/>
 
  </LinearLayout>
 

diff --git a/mapmap-app/app/src/main/res/layout/activity_new.xml b/mapmap-app/app/src/main/res/layout/activity_new.xml
@@ -20,7 +20,8 @@
  android:id="@+id/appLogo"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:src="@drawable/app_logo" />
+ android:src="@drawable/app_logo"
+ android:contentDescription="MapMap" />
 
  </LinearLayout>
 

diff --git a/mapmap-app/app/src/main/res/layout/activity_register.xml b/mapmap-app/app/src/main/res/layout/activity_register.xml
@@ -5,30 +5,32 @@
  android:layout_height="match_parent"
  android:background="#EDF5E1"
  android:orientation="vertical"
- android:paddingBottom="@dimen/activity_vertical_margin"
  android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
  android:paddingTop="@dimen/activity_vertical_margin"
- tools:context=".NewActivity" >
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context=".NewActivity">
 
  <LinearLayout
  android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
 
  <ImageView
  android:id="@+id/passengerImageView"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:src="@drawable/app_logo" />
+ android:src="@drawable/app_logo"
+ android:contentDescription="MapMap" />
+
  </LinearLayout>
 
  <LinearLayout
  android:id="@+id/linearLayout"
  android:layout_width="fill_parent"
  android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/passengerImageView"
  android:layout_below="@+id/passengerImageView"
- android:orientation="vertical" >
+ android:layout_alignLeft="@+id/passengerImageView"
+ android:orientation="vertical">
 
  <ImageView
  android:id="@+id/imageView1"
@@ -50,9 +52,9 @@
  android:id="@+id/usuarioInputText"
  android:layout_width="match_parent"
  android:layout_height="48dp"
+ android:layout_below="@+id/usuarioLabel"
  android:layout_alignParentLeft="true"
  android:layout_alignParentRight="true"
- android:layout_below="@+id/usuarioLabel"
  android:layout_marginTop="8dp"
  android:imeOptions="actionDone"
  android:maxLines="1"

diff --git a/mapmap-app/app/src/main/res/layout/activity_review.xml b/mapmap-app/app/src/main/res/layout/activity_review.xml
@@ -34,10 +34,10 @@
  android:id="@+id/captureList"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:cacheColorHint="#00000000"
+ android:cacheColorHint="@color/text_color_dark_gray"
  android:divider="#00000000"
  android:layout_marginTop="32dp"
- android:dividerHeight="16dp">
+ android:dividerHeight="8dp">
 
  </ListView>
 

diff --git a/mapmap-app/app/src/main/res/layout/capture_list_item_layout.xml b/mapmap-app/app/src/main/res/layout/capture_list_item_layout.xml
@@ -26,7 +26,7 @@
  <LinearLayout
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
- android:gravity="right"
+ android:gravity="end"
  android:paddingTop="9dp" >
 
 

diff --git a/mapmap-app/app/src/main/res/values/colors.xml b/mapmap-app/app/src/main/res/values/colors.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  <color name="text_color">#EDF5E1</color>
- <color name="text_color_green">#5CDB95</color> 
+ <color name="text_color_green">#00e191</color>
  <color name="text_color_blue">#05386B</color>
  <color name="text_color_gray">#76847C</color>
+ <color name="text_color_dark_gray">#2f323d</color>
+ <color name="text_color_orange">#ff8500</color>
 </resources>
diff --git a/mapmap-app/app/src/main/res/values/strings.xml b/mapmap-app/app/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
  <string name="finalizar">Finalizar</string>
  <string name="boton_marcar_parada">Marcar parada</string>
  <string name="boton_iniciar_captura">Iniciar captura</string>
- <string name="btn_iniciar_captura">Inciiar captura</string>
  <string name="boton_mas">Más</string>
  <string name="boton_menos">Menos</string>
 </resources>