From 2ec7beb99a3a4561267c74ff3be463125f644154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 26 Jul 2016 16:59:03 +0200 Subject: [PATCH] [#57] SF: follow android format with AndroidStudio's "Rearrange code" command --- app/src/main/AndroidManifest.xml | 4 +-- .../drawable/ic_highlight_off_black_24dp.xml | 4 +-- .../res/drawable/ic_info_outline_24dp.xml | 4 +-- app/src/main/res/drawable/ic_place_24dp.xml | 4 +-- .../drawable/ic_star_border_black_24dp.xml | 4 +-- .../res/drawable/ic_star_favorite_24dp.xml | 8 +++--- app/src/main/res/drawable/seekbar_thumb.xml | 4 +-- app/src/main/res/layout/activity_bus_stop.xml | 4 +-- app/src/main/res/layout/activity_main.xml | 26 +++++++++---------- .../main/res/layout/activity_route_map.xml | 6 ++--- .../res/layout/activity_show_bus_stops.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 20 +++++++------- .../main/res/layout/bus_stop_route_row.xml | 16 ++++++------ app/src/main/res/layout/bus_stop_row.xml | 4 +-- app/src/main/res/layout/favorite_row.xml | 10 +++---- app/src/main/res/layout/favorites.xml | 4 +-- app/src/main/res/layout/fragment_route.xml | 10 +++---- .../main/res/layout/fragment_route_map.xml | 6 ++--- app/src/main/res/layout/overlay_view.xml | 18 ++++++------- 19 files changed, 79 insertions(+), 79 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f04764..e7c3527 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/ic_highlight_off_black_24dp.xml b/app/src/main/res/drawable/ic_highlight_off_black_24dp.xml index 69dd97c..e7eb395 100644 --- a/app/src/main/res/drawable/ic_highlight_off_black_24dp.xml +++ b/app/src/main/res/drawable/ic_highlight_off_black_24dp.xml @@ -1,8 +1,8 @@ + android:viewportHeight="24.0" + android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_info_outline_24dp.xml b/app/src/main/res/drawable/ic_info_outline_24dp.xml index 087871c..bf966a2 100644 --- a/app/src/main/res/drawable/ic_info_outline_24dp.xml +++ b/app/src/main/res/drawable/ic_info_outline_24dp.xml @@ -1,8 +1,8 @@ + android:viewportHeight="24.0" + android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_place_24dp.xml b/app/src/main/res/drawable/ic_place_24dp.xml index da69495..2ee204e 100644 --- a/app/src/main/res/drawable/ic_place_24dp.xml +++ b/app/src/main/res/drawable/ic_place_24dp.xml @@ -1,8 +1,8 @@ + android:viewportHeight="24.0" + android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_star_border_black_24dp.xml b/app/src/main/res/drawable/ic_star_border_black_24dp.xml index 233f78d..f1669b2 100644 --- a/app/src/main/res/drawable/ic_star_border_black_24dp.xml +++ b/app/src/main/res/drawable/ic_star_border_black_24dp.xml @@ -1,8 +1,8 @@ + android:viewportHeight="24.0" + android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_star_favorite_24dp.xml b/app/src/main/res/drawable/ic_star_favorite_24dp.xml index 91c4809..1bfd65f 100644 --- a/app/src/main/res/drawable/ic_star_favorite_24dp.xml +++ b/app/src/main/res/drawable/ic_star_favorite_24dp.xml @@ -1,10 +1,10 @@ + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" + android:strokeColor="@color/katanga_black_light"/> diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml index 16f471d..d7d5da5 100644 --- a/app/src/main/res/drawable/seekbar_thumb.xml +++ b/app/src/main/res/drawable/seekbar_thumb.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bus_stop.xml b/app/src/main/res/layout/activity_bus_stop.xml index 120e769..14b9827 100644 --- a/app/src/main/res/layout/activity_bus_stop.xml +++ b/app/src/main/res/layout/activity_bus_stop.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" - app:backgroundTint="@color/katanga_yellow" - android:src="@drawable/ic_star_favorite_24dp" /> + android:src="@drawable/ic_star_favorite_24dp" + app:backgroundTint="@color/katanga_yellow" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5f79475..e0f551f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,22 +12,22 @@ tools:context=".MainActivity"> + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:orientation="horizontal"> - + + android:layout_height="wrap_content" + android:layout_margin="5dp" + android:src="@drawable/ic_info_outline_24dp" /> + android:layout_centerHorizontal="true"> diff --git a/app/src/main/res/layout/activity_route_map.xml b/app/src/main/res/layout/activity_route_map.xml index 894b045..9113e01 100644 --- a/app/src/main/res/layout/activity_route_map.xml +++ b/app/src/main/res/layout/activity_route_map.xml @@ -1,9 +1,9 @@ @@ -27,8 +27,8 @@ android:id="@+id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" - app:tabMode="fixed" - app:tabGravity="fill"/> + app:tabGravity="fill" + app:tabMode="fixed"/> diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 1fe11e4..b0152be 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -11,28 +11,28 @@ tools:context="es.craftsmanship.toledo.katangapp.activities.SplashActivity"> + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:orientation="vertical"> + android:textAlignment="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="40sp" /> diff --git a/app/src/main/res/layout/bus_stop_route_row.xml b/app/src/main/res/layout/bus_stop_route_row.xml index c753e80..fe3c11c 100644 --- a/app/src/main/res/layout/bus_stop_route_row.xml +++ b/app/src/main/res/layout/bus_stop_route_row.xml @@ -6,14 +6,14 @@ diff --git a/app/src/main/res/layout/bus_stop_row.xml b/app/src/main/res/layout/bus_stop_row.xml index 36e73e2..190c1bd 100644 --- a/app/src/main/res/layout/bus_stop_row.xml +++ b/app/src/main/res/layout/bus_stop_row.xml @@ -1,7 +1,7 @@ - + android:background="@android:color/white" + android:padding="6dp"> @@ -38,8 +38,8 @@ android:id="@+id/busStopAddress" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/busStopLogo" android:layout_below="@+id/busStopId" + android:layout_toRightOf="@+id/busStopLogo" android:gravity="left" android:textColor="@android:color/black" android:textSize="18sp" /> diff --git a/app/src/main/res/layout/favorites.xml b/app/src/main/res/layout/favorites.xml index f8dcc98..f4beae3 100644 --- a/app/src/main/res/layout/favorites.xml +++ b/app/src/main/res/layout/favorites.xml @@ -1,9 +1,9 @@ + android:background="@color/katanga_grey_dark" + android:orientation="vertical"> @@ -11,9 +11,9 @@ android:orientation="vertical"> + android:layout_height="wrap_content" + android:text="Titulo de la ruta" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_route_map.xml b/app/src/main/res/layout/fragment_route_map.xml index 2442446..0e3193e 100644 --- a/app/src/main/res/layout/fragment_route_map.xml +++ b/app/src/main/res/layout/fragment_route_map.xml @@ -1,9 +1,9 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/overlay_view.xml b/app/src/main/res/layout/overlay_view.xml index 691f85b..e9d5f44 100644 --- a/app/src/main/res/layout/overlay_view.xml +++ b/app/src/main/res/layout/overlay_view.xml @@ -1,30 +1,30 @@ - + android:layout_marginRight="10dp" + android:layout_weight="0.06" + android:src="@drawable/ic_highlight_off_black_24dp" /> \ No newline at end of file