[gdgtoledo#57] SF: follow android format with AndroidStudio's "Rearra…

…nge code" command
mdelapenya · Aug 8, 2016 · 2ec7beb · 2ec7beb
1 parent d0b78aa
commit 2ec7beb
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 79 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="es.craftsmanship.toledo.katangapp.activities">
+<manifest package="es.craftsmanship.toledo.katangapp.activities"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

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
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="#ffffff"
         android:pathData="M14.59,8L12,10.59 9.41,8 8,9.41 10.59,12 8,14.59 9.41,16 12,13.41 14.59,16 16,14.59 13.41,12 16,9.41 14.59,8zM12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>

diff --git 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 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="#ffffff"
         android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/>

diff --git a/app/src/main/res/drawable/ic_place_24dp.xml b/app/src/main/res/drawable/ic_place_24dp.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zm0,9.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>

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
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="#FFFFFF"
         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"/>

diff --git 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 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="@color/katanga_black_light"
-        android:strokeColor="@color/katanga_black_light"
-        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: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"/>
 </vector>
diff --git 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">
 
-    <solid android:color="#f6ec5e" android:angle="0"/>
-    <size android:height="15dp" android:width="15dp"/>
+    <solid android:angle="0" android:color="#f6ec5e"/>
+    <size android:width="15dp" android:height="15dp"/>
 </shape>
diff --git 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" />
 
 </android.support.design.widget.CoordinatorLayout>
diff --git 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">
 
     <LinearLayout
-        android:layout_alignParentRight="true"
-        android:orientation="horizontal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:orientation="horizontal">
         <ImageView
-            android:layout_margin="5dp"
             android:id="@+id/favIcon"
-            android:src="@drawable/ic_star_border_black_24dp"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-        <ImageView
+            android:layout_height="wrap_content"
             android:layout_margin="5dp"
+            android:src="@drawable/ic_star_border_black_24dp" />
+        <ImageView
             android:id="@+id/infoIcon"
-            android:src="@drawable/ic_info_outline_24dp"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:src="@drawable/ic_info_outline_24dp" />
     </LinearLayout>
 
     <TextView
@@ -59,9 +59,9 @@
         android:id="@+id/searchComponentsFrame"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
         android:layout_below="@id/seekBar"
-        android:layout_alignParentBottom="true">
+        android:layout_centerHorizontal="true">
 
         <at.markushi.ui.CircleButton
             android:id="@+id/searchButton"
@@ -75,9 +75,9 @@
             android:id="@+id/searchProgressBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="10dp"
-            android:indeterminateTintMode="src_atop"
             android:indeterminateTint="@android:color/black"
+            android:indeterminateTintMode="src_atop"
+            android:padding="10dp"
             android:visibility="invisible" />
     </FrameLayout>
 

diff --git a/app/src/main/res/layout/activity_route_map.xml b/app/src/main/res/layout/activity_route_map.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
+    android:id="@+id/main_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="es.craftsmanship.toledo.katangapp.activities.RouteMapActivity">
@@ -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"/>
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager

diff --git a/app/src/main/res/layout/activity_show_bus_stops.xml b/app/src/main/res/layout/activity_show_bus_stops.xml
@@ -7,8 +7,8 @@
     tools:context=".ShowBusStopsActivity">
 
     <android.support.v4.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/swipeRefreshLayout"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 

diff --git 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">
 
     <LinearLayout
-        android:layout_centerInParent="true"
-        android:orientation="vertical"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
 
         <ImageView
+            android:id="@+id/id_icon_katanga"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/id_icon_katanga"
-            android:src="@drawable/logok"
             android:layout_gravity="center"
+            android:src="@drawable/logok"
             />
         <TextView
             android:id="@+id/splashTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
             android:fontFamily="sans-serif"
-            android:textAlignment="center"
-            android:textSize="40sp"
             android:text="@string/katanga"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="40sp" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git 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 @@
 
     <LinearLayout
         android:id="@+id/cell_line"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="45dp"
-        android:gravity="center_vertical"
         android:layout_weight="3"
-        android:padding="6dp"
         android:background="@color/katanga_background_light"
+        android:gravity="center_vertical"
+        android:minHeight="45dp"
+        android:orientation="horizontal"
+        android:padding="6dp"
         >
 
         <TextView
@@ -28,21 +28,21 @@
 
     <LinearLayout
         android:id="@+id/cell_time"
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="45dp"
         android:layout_weight="1"
         android:background="@android:color/white"
+        android:gravity="center_vertical"
+        android:minHeight="45dp"
+        android:orientation="horizontal"
         android:padding="6dp">
 
         <TextView
             android:id="@+id/time"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingRight="50dp"
             android:gravity="end"
+            android:paddingRight="50dp"
             android:textColor="@android:color/black"
             android:textSize="18sp" />
     </LinearLayout>

diff --git a/app/src/main/res/layout/bus_stop_row.xml b/app/src/main/res/layout/bus_stop_row.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView android:id="@+id/card_view"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="8dp"

diff --git a/app/src/main/res/layout/favorite_row.xml b/app/src/main/res/layout/favorite_row.xml
@@ -3,19 +3,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
     android:layout_marginBottom="2dp"
     android:layout_marginLeft="@dimen/activity_horizontal_margin"
     android:layout_marginRight="@dimen/activity_horizontal_margin"
     android:layout_marginTop="2dp"
+    android:orientation="horizontal"
     app:cardCornerRadius="4dp"
     app:cardElevation="8dp">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="6dp"
-        android:background="@android:color/white">
+        android:background="@android:color/white"
+        android:padding="6dp">
 
         <ImageView
             android:id="@+id/busStopLogo"
@@ -29,17 +29,17 @@
             android:id="@+id/busStopId"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingBottom="4dp"
             android:layout_toRightOf="@+id/busStopLogo"
+            android:paddingBottom="4dp"
             android:textColor="@color/katanga_grey_dark"
             android:textSize="14sp" />
 
         <TextView
             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
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/katanga_grey_dark">
+    android:background="@color/katanga_grey_dark"
+    android:orientation="vertical">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/favoritesList"

diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml
@@ -1,6 +1,6 @@
- <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <FrameLayout android:id="@+id/route_fragment"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/route_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="es.craftsmanship.toledo.katangapp.activities.RouteMapActivity">
@@ -11,9 +11,9 @@
          android:orientation="vertical">
 
          <TextView
-             android:text="Titulo de la ruta"
              android:layout_width="wrap_content"
-             android:layout_height="wrap_content" />
+             android:layout_height="wrap_content"
+             android:text="Titulo de la ruta" />
 
          <android.support.v7.widget.RecyclerView
              android:id="@+id/route_bus_stops"
@@ -24,9 +24,9 @@
 
          <View
              android:layout_width="3dp"
-             android:layout_marginLeft="46dp"
              android:layout_height="fill_parent"
              android:layout_gravity="left"
+             android:layout_marginLeft="46dp"
              android:background="@android:color/white" />
      </LinearLayout>
  </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_route_map.xml b/app/src/main/res/layout/fragment_route_map.xml
@@ -1,9 +1,9 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout android:id="@+id/map"
+    android:name="com.google.android.gms.maps.SupportMapFragment"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/map"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:name="com.google.android.gms.maps.SupportMapFragment"
     tools:context="es.craftsmanship.toledo.katangapp.fragments.RouteMapFragment">
 
 </FrameLayout>