Merge pull request #319 from anirudh24seven/cleanup-xml

Cleanup layout xml code so that it follows one consistent format

app/src/main/res/layout/activity_about.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:gravity="center"
     android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
 
     <ImageView
         android:src="@drawable/ic_launcher"
@@ -34,6 +34,7 @@
         android:gravity="center"
         android:text="@string/about_license"
         />
+
     <TextView
         android:id="@+id/about_improve"
         android:layout_width="wrap_content"
@@ -43,6 +44,7 @@
         android:gravity="center"
         android:text="@string/about_improve"
         />
+
     <TextView
         android:id="@+id/about_privacy_policy"
         android:layout_width="wrap_content"
@@ -52,6 +54,7 @@
         android:gravity="center"
         android:text="@string/about_privacy_policy"
         />
+
     <TextView
         android:id="@+id/about_uploads_to"
         android:layout_width="wrap_content"
@@ -61,4 +64,5 @@
         android:gravity="center"
         android:alpha="0.2"
         />
+
 </LinearLayout>

app/src/main/res/layout/activity_contributions.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,10 +6,12 @@
     android:id="@+id/contributionsFragmentContainer"
     android:background="#000000"
     >
+
     <fragment
         android:name="fr.free.nrw.commons.contributions.ContributionsListFragment"
         android:id="@+id/contributionsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         />
+
 </FrameLayout>

app/src/main/res/layout/activity_login.xml

@@ -2,19 +2,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:gravity="center"
-            android:orientation="vertical" >
+        android:orientation="vertical"
+        >
 
         <ImageView
             android:id="@+id/commonsLogo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-                android:src="@drawable/commons_logo_large" />
+            android:src="@drawable/commons_logo_large"
+            />
 
         <TextView
             android:id="@+id/loginSubtitle"
@@ -22,7 +25,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:text="@string/app_name"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -31,6 +35,7 @@
             android:gravity="center"
             android:orientation="vertical"
             >
+
             <FrameLayout
                 android:id="@+id/loginErrors"
                 android:layout_width="fill_parent"
@@ -45,7 +50,6 @@
                 android:inputType="textNoSuggestions"
                 android:imeOptions="flagNoExtractUi"
                 >
-
                 <requestFocus />
             </EditText>
 
@@ -55,23 +59,26 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:inputType="textPassword"
-                    android:imeOptions="flagNoExtractUi" />
+                android:imeOptions="flagNoExtractUi"
+                />
 
             <Button
                 android:id="@+id/loginButton"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:enabled="false"
-                    android:text="@string/login" />
+                android:text="@string/login"
+                />
+
             <Button
                 android:id="@+id/signupButton"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/signup"
                 android:layout_gravity="center_horizontal"
-                    android:onClick="signUp" />
+                android:onClick="signUp"
+                />
+
         </LinearLayout>
-
-
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/activity_multiple_uploads.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/uploadsFragmentContainer"
     android:orientation="vertical"
     android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
 </FrameLayout>

app/src/main/res/layout/activity_nearby.xml

@@ -2,12 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
 
     <FrameLayout
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        >
     </FrameLayout>
 
 </LinearLayout>

app/src/main/res/layout/activity_post_upload.xml

@@ -1,8 +1,8 @@
 <?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:layout_height="match_parent"
+    >
 
 </LinearLayout>

app/src/main/res/layout/activity_share.xml

@@ -4,13 +4,12 @@
     android:background="#000"
     >
 
-  
-    
     <ImageView
         android:id="@+id/backgroundImage"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        />
 
     <FrameLayout
         android:id="@+id/single_upload_fragment_container"

app/src/main/res/layout/activity_welcome.xml

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-              android:background="#0c609c">
+    android:background="#0c609c"
+    >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/welcomePager"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fadingEdge="none"
-            >
+        />
-
-    </android.support.v4.view.ViewPager>
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/welcomePagerIndicator"
         android:layout_height="24dp"
         android:layout_width="fill_parent"
-            android:layout_gravity="bottom" />
+        android:layout_gravity="bottom"
+        />
 
 </FrameLayout>

app/src/main/res/layout/detail_category_item.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    >
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,7 +16,10 @@
         android:textColor="@android:color/white"
         android:background="#20ffffff"
         />
+
     <fr.free.nrw.commons.media.MediaDetailSpacer
         android:layout_width="fill_parent"
-            android:layout_height="8dp"/>
+        android:layout_height="8dp"
+        />
+
 </LinearLayout>

app/src/main/res/layout/fragment_categorization.xml

@@ -1,5 +1,4 @@
 <?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"
@@ -17,6 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         >
+
         <EditText
             android:id="@+id/categoriesSearchBox"
             android:layout_height="wrap_content"
@@ -25,6 +25,7 @@
             android:singleLine="true"
             android:imeOptions="flagNoExtractUi"
             />
+
         <ProgressBar
             android:id="@+id/categoriesSearchInProgress"
             android:layout_width="wrap_content"

app/src/main/res/layout/fragment_contributions.xml

@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="#000000"
     >
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/waiting_first_sync"
-            android:id="@+id/waitingMessage" android:layout_gravity="center" android:visibility="gone"/>
+        android:id="@+id/waitingMessage"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/no_uploads_yet"
-            android:id="@+id/emptyMessage" android:layout_gravity="center" android:visibility="gone"/>
+        android:id="@+id/emptyMessage"
-    <GridView android:id="@+id/contributionsList"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        />
+
+    <GridView
+        android:id="@+id/contributionsList"
         android:layout_height="fill_parent"
         android:layout_width="fill_parent"
         android:stretchMode="columnWidth"

app/src/main/res/layout/fragment_media_detail.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@android:color/background_dark"
     >
-    <ProgressBar android:id="@+id/mediaDetailImageLoading"
+
+    <ProgressBar
+        android:id="@+id/mediaDetailImageLoading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -14,7 +15,8 @@
         android:visibility="visible"
         />
 
-    <ImageView android:id="@+id/mediaDetailImageFailed"
+    <ImageView
+        android:id="@+id/mediaDetailImageFailed"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="center"
@@ -22,7 +24,8 @@
         android:visibility="gone"
         />
 
-    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
+    <fr.free.nrw.commons.MediaWikiImageView
+        android:id="@+id/mediaDetailImage"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:scaleType="fitCenter"
@@ -34,30 +37,38 @@
         android:id="@+id/mediaDetailScrollView"
         android:fillViewport="true"
         android:background="@android:color/transparent"
-            android:cacheColorHint="@android:color/transparent">
+        android:cacheColorHint="@android:color/transparent"
+        >
 
-        <LinearLayout android:orientation="vertical"
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="fill_parent"
-                      android:layout_height="fill_parent">
+            android:layout_height="fill_parent"
+            >
 
             <!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
                  the detail info offscreen until it's placed properly. May be a better way to do this. -->
             <fr.free.nrw.commons.media.MediaDetailSpacer
                 android:layout_width="fill_parent"
                 android:layout_height="16dp"
-                    android:id="@+id/mediaDetailSpacer"/>
+                android:id="@+id/mediaDetailSpacer"
+                />
+
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:background="#AA000000"
-                    android:padding="16dp">
+                android:padding="16dp"
+                >
+
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
-                        android:padding="16dp">
+                    android:padding="16dp"
+                    >
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -65,7 +76,8 @@
                         android:text="Title"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                            android:paddingBottom="6dp"/>
+                        android:paddingBottom="6dp"
+                        />
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -75,17 +87,22 @@
                         android:textColor="@android:color/white"
                         android:background="#20ffffff"
                         android:textSize="14sp"
-                            android:padding="12dp"/>
+                        android:padding="12dp"
+                        />
                 </LinearLayout>
+
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="fill_parent"
-                        android:layout_height="8dp"/>
+                    android:layout_height="8dp"
+                    />
+
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
-                        android:padding="16dp">
+                    android:padding="16dp"
+                    >
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -93,7 +110,8 @@
                         android:textColor="@android:color/white"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                            android:paddingBottom="6dp"/>
+                        android:paddingBottom="6dp"
+                        />
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -103,17 +121,22 @@
                         android:textColor="@android:color/white"
                         android:layout_gravity="left|start"
                         android:textSize="14sp"
-                            android:padding="12dp"/>
+                        android:padding="12dp"
+                        />
                 </LinearLayout>
+
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="fill_parent"
-                        android:layout_height="8dp"/>
+                    android:layout_height="8dp"
+                    />
+
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
-                        android:padding="16dp">
+                    android:padding="16dp"
+                    >
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -121,7 +144,8 @@
                         android:text="License"
                         android:textSize="16sp"
                         android:textStyle="bold"
-                            android:paddingBottom="6dp"/>
+                        android:paddingBottom="6dp"
+                        />
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -131,18 +155,23 @@
                         android:background="#20ffffff"
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
-                            android:padding="12dp"/>
+                        android:padding="12dp"
+                        />
                 </LinearLayout>
+
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="fill_parent"
-                        android:layout_height="8dp"/>
+                    android:layout_height="8dp"
+                    />
+
                 <LinearLayout
                     android:orientation="vertical"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="#20ffffff"
                     android:padding="16dp"
-                        android:textStyle="bold">
+                    android:textStyle="bold"
+                    >
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -150,12 +179,14 @@
                         android:textSize="16sp"
                         android:layout_gravity="left|start"
                         android:textColor="@android:color/white"
-                            android:paddingBottom="6dp"/>
+                        android:paddingBottom="6dp"
+                        />
                     <LinearLayout
                         android:orientation="vertical"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                            android:id="@+id/mediaDetailCategoryContainer"/>
+                        android:id="@+id/mediaDetailCategoryContainer"
+                        />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>

app/src/main/res/layout/fragment_media_detail_pager.xml

@@ -1,16 +1,15 @@
 <?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:layout_height="match_parent"
+    >
+
     <android.support.v4.view.ViewPager
         android:id="@+id/mediaDetailsPager"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:fadingEdge="none"
-            >
+        />
-
-    </android.support.v4.view.ViewPager>
 
 </LinearLayout>

app/src/main/res/layout/fragment_multiple_uploads_list.xml

@@ -1,17 +1,20 @@
 <?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:layout_height="match_parent"
-    <EditText android:id="@+id/multipleBaseTitle"
+    >
+
+    <EditText
+        android:id="@+id/multipleBaseTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/multiple_share_base_title"
         android:imeOptions="flagNoExtractUi"
         />
 
-    <GridView android:id="@+id/multipleShareBackground"
+    <GridView
+        android:id="@+id/multipleShareBackground"
         android:layout_height="fill_parent"
         android:layout_width="fill_parent"
         android:stretchMode="columnWidth"

app/src/main/res/layout/fragment_nearby.xml

@@ -1,18 +1,20 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    >
 
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"  />
+        android:layout_centerInParent="true"
+        />
 
     <ListView
         android:id="@+id/listview"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+        android:layout_height="fill_parent"
-    </ListView>
+        />
 
 </RelativeLayout>

app/src/main/res/layout/fragment_single_upload.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -38,7 +37,8 @@
         android:background="#90000000"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/titleDescButton" />
+        android:id="@+id/titleDescButton"
+        />
 
     <TextView
         android:layout_width="wrap_content"
@@ -46,5 +46,6 @@
         android:text="@string/share_license_summary"
         android:id="@+id/share_license_summary"
         android:gravity="center"
-        android:layout_marginTop="16dp"/>
+        android:layout_marginTop="16dp"
+        />
 </LinearLayout>

app/src/main/res/layout/item_place.xml

@@ -2,11 +2,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:foreground="?attr/selectableItemBackground"
-    android:layout_height="@dimen/icon_size">
+    android:layout_height="@dimen/icon_size"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        >
 
         <ImageView
             android:id="@+id/icon"
@@ -14,7 +16,8 @@
             android:layout_height="match_parent"
             android:src="@drawable/empty_photo"
             android:background="#ffffff"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            />
 
         <TextView
             android:id="@+id/distance"
@@ -26,7 +29,8 @@
             style="?android:textAppearanceSmallInverse"
             android:textColor="#ffffff"
             android:background="@color/text_background"
-            tools:text="Overlay"/>
+            tools:text="Overlay"
+            />
 
         <TextView
             android:id="@+id/tvName"
@@ -40,7 +44,8 @@
             android:maxLines="1"
             android:ellipsize="none"
             style="?android:textAppearanceMedium"
-            tools:text="Name" />
+            tools:text="Name"
+            />
 
         <TextView
             android:id="@+id/tvDesc"
@@ -53,7 +58,8 @@
             android:ellipsize="none"
             android:maxLines="4"
             style="?android:textAppearanceSmall"
-            tools:text="Description" />
+            tools:text="Description"
+            />
 
     </RelativeLayout>
 </FrameLayout>

app/src/main/res/layout/layout_categories_item.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

app/src/main/res/layout/layout_contribution.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
@@ -9,7 +8,8 @@
     android:paddingBottom="0dp"
     >
 
-    <TextView android:id="@+id/contributionSequenceNumber"
+    <TextView
+        android:id="@+id/contributionSequenceNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="98sp"
@@ -17,7 +17,9 @@
         android:typeface="serif"
         android:layout_gravity="end|bottom"
         />
-    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/contributionImage"
+
+    <fr.free.nrw.commons.MediaWikiImageView
+        android:id="@+id/contributionImage"
         android:layout_width="fill_parent"
         android:layout_height="240dp"
         android:scaleType="centerCrop"
@@ -60,7 +62,6 @@
             android:maxLines="2"
             android:ellipsize="end"
             />
-
     </LinearLayout>
 
 </FrameLayout>

app/src/main/res/layout/layout_upload_item.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
@@ -8,7 +7,9 @@
     android:paddingBottom="0dp"
     android:background="#000000"
     >
-    <ImageView android:id="@+id/uploadImage"
+
+    <ImageView
+        android:id="@+id/uploadImage"
         android:layout_width="fill_parent"
         android:layout_height="192dp"
         android:scaleType="centerCrop"

app/src/main/res/layout/login.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    >
 
     <RelativeLayout 
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        >
 
         <ImageView
             android:id="@+id/commonsLogo"
@@ -14,7 +16,8 @@
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="20dp"
-            android:src="@drawable/commons_logo_large" />
+            android:src="@drawable/commons_logo_large"
+            />
 
         <LinearLayout
             android:layout_width="fill_parent"
@@ -23,13 +26,15 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="20dp"
             android:orientation="vertical"
-            android:padding="20dp" >
+            android:padding="20dp"
+            >
 
             <EditText
                 android:id="@+id/loginUsername"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-               android:hint="@string/username" >
+                android:hint="@string/username"
+                >
 
                <requestFocus />
             </EditText>
@@ -39,17 +44,17 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
-               android:inputType="textPassword" />
+                android:inputType="textPassword"
+                />
 
            <Button
                 android:id="@+id/loginButton"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="20dp"
-               android:text="@string/login" />
+                android:text="@string/login"
+               />
             
         </LinearLayout>
-        
     </RelativeLayout>
-
 </FrameLayout>

app/src/main/res/layout/welcome_copyright.xml

@@ -1,5 +1,4 @@
 <?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"
@@ -26,7 +25,8 @@
         android:textAlignment="center"
         android:paddingTop="24dp"
         android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+        android:textColor="@android:color/white"
+        />
 
     <TextView
         android:layout_width="wrap_content"
@@ -36,5 +36,6 @@
         android:layout_gravity="center"
         android:textAlignment="center"
         android:paddingTop="16dp"
-            android:gravity="center_horizontal"/>
+        android:gravity="center_horizontal"
+        />
 </LinearLayout>

app/src/main/res/layout/welcome_final.xml

@@ -1,5 +1,4 @@
 <?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"
@@ -12,18 +11,21 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="180dp"
-            android:gravity="center_horizontal">
+        android:gravity="center_horizontal"
+        >
 
         <ImageView
             android:layout_width="150dp"
             android:layout_height="180dp"
-                android:src="@drawable/welcome_wikipedia"/>
+            android:src="@drawable/welcome_wikipedia"
+            />
 
         <ImageView
             android:layout_width="160dp"
             android:layout_height="120dp"
             android:layout_gravity="center"
-                android:src="@drawable/welcome_copyright"/>
+            android:src="@drawable/welcome_copyright"
+            />
 
     </LinearLayout>
 
@@ -37,7 +39,8 @@
         android:textAlignment="center"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
-            android:singleLine="false"/>
+        android:singleLine="false"
+        />
 
     <TextView
         android:layout_width="wrap_content"
@@ -46,7 +49,8 @@
         android:layout_gravity="center"
         android:textAlignment="center"
         android:paddingTop="16dp"
-            android:gravity="center_horizontal"/>
+        android:gravity="center_horizontal"
+        />
 
     <Button
         android:layout_width="120dp"

app/src/main/res/layout/welcome_wikipedia.xml

@@ -1,5 +1,4 @@
 <?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"
@@ -13,7 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:src="@drawable/welcome_wikipedia"
-            android:adjustViewBounds="true"/>
+        android:adjustViewBounds="true"
+        />
 
     <TextView
         android:layout_width="wrap_content"
@@ -25,7 +25,8 @@
         android:textAlignment="center"
         android:paddingTop="24dp"
         android:gravity="center_horizontal"
-            android:textColor="@android:color/white"/>
+        android:textColor="@android:color/white"
+        />
 
     <TextView
         android:layout_width="wrap_content"
@@ -35,5 +36,6 @@
         android:layout_gravity="center"
         android:textAlignment="center"
         android:paddingTop="16dp"
-            android:gravity="center_horizontal"/>
+        android:gravity="center_horizontal"
+        />
 </LinearLayout>