From 87ad67ca82643993bd610ffd29f1881185821cc4 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 14 May 2014 17:24:51 +0200
Subject: [PATCH] Formatting fixes.

---
 src/main/AndroidManifest.xml            | 118 +++++++++---------
 src/main/res/layout/activity_main.xml   |   8 +-
 src/main/res/layout/list_item.xml       |  48 ++++----
 src/main/res/layout/route_fragment.xml  | 152 ++++++++++++------------
 src/main/res/layout/server_fragment.xml |  26 ++--
 src/main/res/menu/menu.xml              |   4 +-
 src/main/res/values/strings.xml         |   4 +-
 src/main/res/xml/preferences.xml        |  20 ++--
 8 files changed, 187 insertions(+), 193 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b7e4da6..b601219 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,78 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.nutomic.controldlna"
-    android:versionCode="14"
-    android:versionName="1.0.2" >
-    
+		package="com.github.nutomic.controldlna"
+		android:versionCode="14"
+		android:versionName="1.0.2" >
+
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+	<uses-sdk
+			android:minSdkVersion="8"
+			android:targetSdkVersion="19" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.Light" >
-        
-        <!--
+	<application
+			android:allowBackup="true"
+			android:icon="@drawable/ic_launcher"
+			android:label="@string/app_name"
+			android:theme="@style/Theme.AppCompat.Light" >
+
+		<!--
 			NOTE: configChanges is needed to avoid MediaRouterPlayService being
-			      killed on screen rotate. (why do you do this, Google???).
-			      This comes with some rendering issues on screen rotate (sometimes)
-			      on Android 4.4 (but that's not my error).
-         -->
-        <activity
-            android:name=".gui.MainActivity"
-            android:label="@string/app_name"
-			android:launchMode="singleTop"
-			android:configChanges="orientation|keyboardHidden|screenSize" >
-            
-            <intent-filter android:label="@string/app_name" >
-                
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                
-            </intent-filter>
-            
-        </activity>
-        
-        <activity
-            android:name=".gui.PreferencesActivity"
-            android:label="@string/settings_title" >
+				  killed on screen rotate. (why do you do this, Google???).
+				  This comes with some rendering issues on screen rotate (sometimes)
+				  on Android 4.4 (but that's not my error).
+		 -->
+		<activity
+				android:name=".gui.MainActivity"
+				android:label="@string/app_name"
+				android:launchMode="singleTop"
+				android:configChanges="orientation|keyboardHidden|screenSize" >
+			<intent-filter android:label="@string/app_name" >
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
 
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".gui.MainActivity" />
+		<activity
+				android:name=".gui.PreferencesActivity"
+				android:label="@string/settings_title" >
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value=".gui.MainActivity" />
+		</activity>
 
-        </activity>
-            
 		<service android:name="org.teleal.cling.android.AndroidUpnpServiceImpl" />
-  		
-  		<service android:name=".mediarouter.MediaRouterPlayService" />
-  		
-  		<service android:name=".upnp.RemotePlayService" />
 
-        <service android:name=".upnp.ProviderService"
-                android:label="@string/upnp_route_provider_service"
-                android:process=":mrp">
-            <intent-filter>
-                <action android:name="android.media.MediaRouteProviderService" />
-            </intent-filter>
-        </service>
+		<service android:name=".mediarouter.MediaRouterPlayService" />
 
-        <service android:name=".localroute.ProviderService"
-            android:process=":mrp">
-            <intent-filter>
-                <action android:name="android.media.MediaRouteProviderService" />
-            </intent-filter>
-        </service>
-        
-    </application>    
+		<service android:name=".upnp.RemotePlayService" />
+
+		<service android:name=".upnp.ProviderService"
+				android:label="@string/upnp_route_provider_service"
+				android:process=":mrp">
+			<intent-filter>
+				<action android:name="android.media.MediaRouteProviderService" />
+			</intent-filter>
+		</service>
+
+		<service android:name=".localroute.ProviderService"
+				android:process=":mrp">
+			<intent-filter>
+				<action android:name="android.media.MediaRouteProviderService" />
+			</intent-filter>
+		</service>
+
+	</application>
 
 </manifest>
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml
index 3676c09..fcb8c92 100644
--- a/src/main/res/layout/activity_main.xml
+++ b/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.view.ViewPager
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/pager"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent" />
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/pager"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 30bac95..b68ad97 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="?android:attr/listPreferredItemHeight"
-	android:orientation="horizontal" >
+		android:layout_width="fill_parent"
+		android:layout_height="?android:attr/listPreferredItemHeight"
+		android:orientation="horizontal" >
 
 	<com.github.nutomic.controldlna.utility.RemoteImageView
-		android:id="@+id/image"
-		android:layout_width="?android:attr/listPreferredItemHeight"
-		android:layout_height="?android:attr/listPreferredItemHeight"
-		android:padding="4dip"
-		android:contentDescription="@string/album_art" />
+			android:id="@+id/image"
+			android:layout_width="?android:attr/listPreferredItemHeight"
+			android:layout_height="?android:attr/listPreferredItemHeight"
+			android:padding="4dip"
+			android:contentDescription="@string/album_art" />
 
 
 	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="vertical"
-		android:layout_marginTop="4dip" >
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:orientation="vertical"
+			android:layout_marginTop="4dip" >
 
 		<TextView
-			android:id="@+id/title"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:lines="1"
-			android:ellipsize="end" />
+				android:id="@+id/title"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:lines="1"
+				android:ellipsize="end" />
 		
 		<TextView
-			android:id="@+id/subtitle"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:lines="1"
-			android:ellipsize="end" />
+				android:id="@+id/subtitle"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceSmall"
+				android:lines="1"
+				android:ellipsize="end" />
 
 	</LinearLayout>
 
diff --git a/src/main/res/layout/route_fragment.xml b/src/main/res/layout/route_fragment.xml
index 961d8a4..82da1e0 100644
--- a/src/main/res/layout/route_fragment.xml
+++ b/src/main/res/layout/route_fragment.xml
@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical" >
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical" >
 
 	<ListView
-		android:id="@+id/listview"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_above="@+id/controls"
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true" />
-
-	<TextView
-		android:id="@id/android:empty"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="10dip"
-		android:text="@string/route_list_empty"
-		android:layout_centerInParent="true"
-		android:gravity="center" />
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:orientation="vertical"
-		android:id="@+id/controls"
-		android:visibility="gone"
-		android:background="@android:color/white" >
-
-		<SeekBar
-			android:id="@+id/progressBar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content" />
-	
-		<RelativeLayout
+			android:id="@+id/listview"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:gravity="center"
-			android:paddingLeft="10dip"
-			android:paddingRight="10dip" >
+			android:layout_above="@+id/controls"
+			android:layout_alignParentRight="true"
+			android:layout_alignParentTop="true" />
+
+	<TextView
+			android:id="@id/android:empty"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dip"
+			android:text="@string/route_list_empty"
+			android:layout_centerInParent="true"
+			android:gravity="center" />
+
+	<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:orientation="vertical"
+			android:id="@+id/controls"
+			android:visibility="gone"
+			android:background="@android:color/white" >
+
+		<SeekBar
+				android:id="@+id/progressBar"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content" />
+	
+		<RelativeLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center"
+				android:paddingLeft="10dip"
+				android:paddingRight="10dip" >
 
 			<TextView
-				android:id="@+id/current_time"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentLeft="true"
-				android:layout_alignParentTop="true"
-				android:gravity="right"
-				android:minEms="2" />
+					android:id="@+id/current_time"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentTop="true"
+					android:gravity="right"
+					android:minEms="2" />
 
 			<ImageButton
-				android:id="@+id/shuffle"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/shuffle"
-				android:layout_toLeftOf="@+id/previous" />
+					android:id="@+id/shuffle"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/shuffle"
+					android:layout_toLeftOf="@+id/previous" />
 
 			<ImageButton
-				android:id="@+id/previous"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/previous"
-				android:layout_toLeftOf="@+id/playpause" />
+					android:id="@+id/previous"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/previous"
+					android:layout_toLeftOf="@+id/playpause" />
 
 			<ImageButton
-				android:id="@+id/playpause"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/play"
-				android:layout_centerHorizontal="true"/>
+					android:id="@+id/playpause"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/play"
+					android:layout_centerHorizontal="true"/>
 
 			<ImageButton
-				android:id="@+id/next"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/next"
-				android:layout_toRightOf="@id/playpause" />
+					android:id="@+id/next"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/next"
+					android:layout_toRightOf="@id/playpause" />
 
 			<ImageButton
-				android:id="@+id/repeat"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:contentDescription="@string/repeat"
-				android:layout_toRightOf="@id/next" />
+					android:id="@+id/repeat"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:contentDescription="@string/repeat"
+					android:layout_toRightOf="@id/next" />
 
 			<TextView
-				android:id="@+id/total_time"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentTop="true"
-				android:gravity="right"
-				android:minEms="2"/>
+					android:id="@+id/total_time"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentRight="true"
+					android:layout_alignParentTop="true"
+					android:gravity="right"
+					android:minEms="2"/>
 
 		</RelativeLayout>
 
diff --git a/src/main/res/layout/server_fragment.xml b/src/main/res/layout/server_fragment.xml
index 4a5529e..bb02186 100644
--- a/src/main/res/layout/server_fragment.xml
+++ b/src/main/res/layout/server_fragment.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical" >
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical" >
 
 	<ListView
-		android:id="@id/android:list"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
+			android:id="@id/android:list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent" />
 
 	<TextView
-		android:id="@id/android:empty"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="10dip"
-		android:text="@string/device_list_empty"
-		android:layout_centerInParent="true"
-		android:gravity="center" />
+			android:id="@id/android:empty"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dip"
+			android:text="@string/device_list_empty"
+			android:layout_centerInParent="true"
+			android:gravity="center" />
 
 </RelativeLayout>
diff --git a/src/main/res/menu/menu.xml b/src/main/res/menu/menu.xml
index ffd380d..09375ae 100644
--- a/src/main/res/menu/menu.xml
+++ b/src/main/res/menu/menu.xml
@@ -3,7 +3,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<item
-		android:id="@+id/preferences"
-		android:title="@string/settings_title" />
+			android:id="@+id/preferences"
+			android:title="@string/settings_title" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 72aea52..5aee71b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -61,7 +61,7 @@
 	<!-- Title for the contact developer preference -->
 	<string name="contact_dev_title">Contact Developer</string>
 
-    <!-- Appended to all routes provided by a debug build -->
-    <string name="debug">Debug</string>
+	<!-- Appended to all routes provided by a debug build -->
+	<string name="debug">Debug</string>
 	
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 8ea9a8c..31490b9 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -2,19 +2,19 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<ListPreference
-		android:key="enable_wifi_on_start"
-		android:title="@string/enable_wifi_title"
-		android:entries="@array/enable_wifi_value_titles"
-		android:entryValues="@array/enable_wifi_values"
-		android:defaultValue="ask"/>
+			android:key="enable_wifi_on_start"
+			android:title="@string/enable_wifi_title"
+			android:entries="@array/enable_wifi_value_titles"
+			android:entryValues="@array/enable_wifi_values"
+			android:defaultValue="ask"/>
 
 	<CheckBoxPreference
-		android:key="incoming_phone_call_pause"
-		android:title="@string/incoming_phone_call_pause"
-		android:defaultValue="true" />
+			android:key="incoming_phone_call_pause"
+			android:title="@string/incoming_phone_call_pause"
+			android:defaultValue="true" />
 
 	<Preference
-		android:key="contact_dev"
-		android:title="@string/contact_dev_title" />
+			android:key="contact_dev"
+			android:title="@string/contact_dev_title" />
 
 </PreferenceScreen>
\ No newline at end of file