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 index b447b8a..b744b15 100644 --- 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" /> @@ -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" /> 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 index 893d619..76562b9 100644 --- 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,7 +45,8 @@ android:layout_height="wrap_content" android:layout_marginTop="64dp" android:layout_marginLeft="64dp" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginStart="64dp"> + android:background="@null" + android:contentDescription="Trazar" /> + android:src="@drawable/btn_recorridos" + android:contentDescription="Recorridos"/> + android:src="@drawable/btn_enviar" + android:contentDescription="Enviar"/> diff --git a/mapmap-app/app/src/main/res/layout/activity_capture.xml b/mapmap-app/app/src/main/res/layout/activity_capture.xml index 86d6b9a..b744b15 100644 --- 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" /> diff --git a/mapmap-app/app/src/main/res/layout/activity_main.xml b/mapmap-app/app/src/main/res/layout/activity_main.xml index 893d619..76562b9 100644 --- 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,7 +45,8 @@ android:layout_height="wrap_content" android:layout_marginTop="64dp" android:layout_marginLeft="64dp" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginStart="64dp"> + android:background="@null" + android:contentDescription="Trazar" /> + android:src="@drawable/btn_recorridos" + android:contentDescription="Recorridos"/> + android:src="@drawable/btn_enviar" + android:contentDescription="Enviar"/> diff --git a/mapmap-app/app/src/main/res/layout/activity_new.xml b/mapmap-app/app/src/main/res/layout/activity_new.xml index 599de07..7405361 100644 --- 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" /> diff --git a/mapmap-app/app/src/main/res/layout/activity_register.xml b/mapmap-app/app/src/main/res/layout/activity_register.xml index f08df98..2a7a15f 100644 --- 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"> + android:layout_height="wrap_content"> + android:src="@drawable/app_logo" + android:contentDescription="MapMap" /> + + android:layout_alignLeft="@+id/passengerImageView" + android:orientation="vertical"> + android:dividerHeight="8dp"> 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 index d52324b..5c792b1 100644 --- 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 @@ diff --git a/mapmap-app/app/src/main/res/values/colors.xml b/mapmap-app/app/src/main/res/values/colors.xml index 58ce313..a08e765 100644 --- a/mapmap-app/app/src/main/res/values/colors.xml +++ b/mapmap-app/app/src/main/res/values/colors.xml @@ -1,7 +1,9 @@ #EDF5E1 - #5CDB95 + #00e191 #05386B #76847C + #2f323d + #ff8500 \ No newline at end of file diff --git a/mapmap-app/app/src/main/res/values/strings.xml b/mapmap-app/app/src/main/res/values/strings.xml index 641d597..9983b52 100644 --- a/mapmap-app/app/src/main/res/values/strings.xml +++ b/mapmap-app/app/src/main/res/values/strings.xml @@ -6,7 +6,6 @@ Finalizar Marcar parada Iniciar captura - Inciiar captura Más Menos