From abf4528d023600d74d6621c4a0795a0b3dc92504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 19 Oct 2015 09:21:48 +0200
Subject: [PATCH] Get rid of many tabs for consistency

---
 CONTRIBUTING.md                         |   4 +-
 F-Droid/res/layout-land/app_details.xml |   8 +-
 F-Droid/res/layout/apklistitem.xml      |   2 +-
 F-Droid/res/layout/app_details.xml      |   2 +-
 F-Droid/res/layout/applistitem.xml      | 185 ++++++++++++------------
 F-Droid/res/layout/fdroid.xml           |  22 +--
 F-Droid/res/layout/searchresults.xml    |  34 ++---
 F-Droid/res/xml/preferences.xml         | 138 +++++++++---------
 README.md                               |   4 +-
 settings.gradle                         |  12 +-
 10 files changed, 205 insertions(+), 206 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2af193b2f..25c4e0f66 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,7 +46,7 @@ it. We enforce some of these, but not all, via checkstyle.
 
 To get all the logcat messages by F-Droid, you can run:
 
-	adb logcat | grep `adb shell ps | grep org.fdroid.fdroid | cut -c10-15`
+    adb logcat | grep `adb shell ps | grep org.fdroid.fdroid | cut -c10-15`
 
 ## Building tips
 
@@ -60,7 +60,7 @@ In order to run the F-Droid test suite, you will need to have either a real devi
 connected via `adb`, or an emulator running. Then, execute the following from the
 command line:
 
-	gradle connectedCheck
+    gradle connectedCheck
 
 Note that the CI already runs the tests on an emulator, so you don't
 necessarily have to do this yourself if you open a merge request as the tests
diff --git a/F-Droid/res/layout-land/app_details.xml b/F-Droid/res/layout-land/app_details.xml
index bb9d4c7d2..48ac032d2 100644
--- a/F-Droid/res/layout-land/app_details.xml
+++ b/F-Droid/res/layout-land/app_details.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:baselineAligned="false"
-	android:orientation="horizontal">
+    android:layout_height="fill_parent"
+    android:baselineAligned="false"
+    android:orientation="horizontal">
 
     <ScrollView
         android:id="@+id/app_summary_container"
@@ -17,7 +17,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-	        android:padding="5dp">
+            android:padding="5dp">
 
             <fragment
                 android:layout_width="fill_parent"
diff --git a/F-Droid/res/layout/apklistitem.xml b/F-Droid/res/layout/apklistitem.xml
index 583d41773..ad19a703a 100644
--- a/F-Droid/res/layout/apklistitem.xml
+++ b/F-Droid/res/layout/apklistitem.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
-		android:layout_width="fill_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingTop="5dp"
diff --git a/F-Droid/res/layout/app_details.xml b/F-Droid/res/layout/app_details.xml
index f272f599f..210318629 100644
--- a/F-Droid/res/layout/app_details.xml
+++ b/F-Droid/res/layout/app_details.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
+    android:layout_height="fill_parent"
     android:orientation="vertical">
 
     <FrameLayout
diff --git a/F-Droid/res/layout/applistitem.xml b/F-Droid/res/layout/applistitem.xml
index f4a122047..6504b21cf 100644
--- a/F-Droid/res/layout/applistitem.xml
+++ b/F-Droid/res/layout/applistitem.xml
@@ -1,108 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:padding="10dp"
-	android:baselineAligned="false"
-	xmlns:tools="http://schemas.android.com/tools" >
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="10dp"
+    android:baselineAligned="false"
+    xmlns:tools="http://schemas.android.com/tools" >
 
-	<!-- Actual icon size is dependent on preferences and set in
-		AppListAdapater.java:layoutIcon() -->
-	<ImageView
-		android:id="@+id/icon"
-		android:contentDescription="@string/app_icon"
-		android:layout_width="48dip"
-		android:layout_height="48dip"
-		android:layout_gravity="center_vertical"
-		android:scaleType="fitCenter"
-		tools:src="@drawable/ic_launcher" />
+    <!-- Actual icon size is dependent on preferences and set in AppListAdapater.java:layoutIcon() -->
+    <ImageView
+        android:id="@+id/icon"
+        android:contentDescription="@string/app_icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_gravity="center_vertical"
+        android:scaleType="fitCenter"
+        tools:src="@drawable/ic_launcher" />
 
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-		android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-		android:paddingRight="?attr/listPreferredItemPaddingRight"
-		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-		android:layout_gravity="center_vertical"
-		android:baselineAligned="false" >
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_gravity="center_vertical"
+        android:baselineAligned="false" >
 
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:baselineAligned="false"
-			android:layout_marginBottom="3dp" >
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:baselineAligned="false"
+            android:layout_marginBottom="3dp" >
 
-			<TextView android:id="@+id/name"
-				android:textSize="17sp"
-				android:textStyle="bold"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:layout_weight="1"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
-				android:gravity="start"
-				android:textAlignment="viewStart"
-				tools:text="F-Droid" />
+            <TextView android:id="@+id/name"
+                android:textSize="17sp"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                tools:text="F-Droid" />
 
-			<TextView android:id="@+id/status"
-				android:textSize="13sp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:layout_weight="0"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-				android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-				android:layout_gravity="center_vertical"
-				android:gravity="end"
-				android:textAlignment="viewEnd"
-				tools:text="Installed"
-				/>
+            <TextView android:id="@+id/status"
+                android:textSize="13sp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="0"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
+                android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+                android:layout_gravity="center_vertical"
+                android:gravity="end"
+                android:textAlignment="viewEnd"
+                tools:text="Installed"
+                />
 
-		</LinearLayout>
+        </LinearLayout>
 
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:baselineAligned="false"
-			>
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:baselineAligned="false"
+            >
 
-			<TextView android:id="@+id/summary"
-				android:textSize="13sp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:layout_weight="1"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
-				android:gravity="start"
-				android:textAlignment="viewStart"
-				tools:text="Application manager"
-				/>
+            <TextView android:id="@+id/summary"
+                android:textSize="13sp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                tools:text="Application manager"
+                />
 
-			<TextView android:id="@+id/license"
-				android:textSize="12sp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:layout_weight="0"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-				android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-				android:layout_gravity="center_vertical"
-				android:gravity="end"
-				android:textAlignment="viewEnd"
-				tools:text="GPLv3"
-				/>
+            <TextView android:id="@+id/license"
+                android:textSize="12sp"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:layout_weight="0"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
+                android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+                android:layout_gravity="center_vertical"
+                android:gravity="end"
+                android:textAlignment="viewEnd"
+                tools:text="GPLv3"
+                />
 
-		</LinearLayout>
+        </LinearLayout>
 
-	</LinearLayout>
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/F-Droid/res/layout/fdroid.xml b/F-Droid/res/layout/fdroid.xml
index fe0687322..d7d866c02 100644
--- a/F-Droid/res/layout/fdroid.xml
+++ b/F-Droid/res/layout/fdroid.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/fdroid_layout"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:baselineAligned="false"
-	android:orientation="vertical">
+    android:id="@+id/fdroid_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:baselineAligned="false"
+    android:orientation="vertical">
 
-	<android.support.v4.view.ViewPager
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/main_pager"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
+    <android.support.v4.view.ViewPager
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
-	</android.support.v4.view.ViewPager>
+    </android.support.v4.view.ViewPager>
 
 </LinearLayout>
diff --git a/F-Droid/res/layout/searchresults.xml b/F-Droid/res/layout/searchresults.xml
index 41ba64b45..dd8198a9d 100644
--- a/F-Droid/res/layout/searchresults.xml
+++ b/F-Droid/res/layout/searchresults.xml
@@ -1,23 +1,23 @@
 <?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="fill_parent"
-	android:paddingLeft="2dp"
-	android:paddingStart="2dp"
-	android:paddingRight="2dp"
-	android:paddingEnd="2dp"
-	android:baselineAligned="false"
-	android:orientation="vertical">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingLeft="2dp"
+    android:paddingStart="2dp"
+    android:paddingRight="2dp"
+    android:paddingEnd="2dp"
+    android:baselineAligned="false"
+    android:orientation="vertical">
 
-	<TextView android:id="@+id/description"
-		android:singleLine="false"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="4dp"
-		android:gravity="center" />
+    <TextView android:id="@+id/description"
+        android:singleLine="false"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:gravity="center" />
 
-	<ListView android:id="@android:id/list"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent" />
+    <ListView android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
 
 </LinearLayout>
diff --git a/F-Droid/res/xml/preferences.xml b/F-Droid/res/xml/preferences.xml
index b647b95c0..38acc7f38 100644
--- a/F-Droid/res/xml/preferences.xml
+++ b/F-Droid/res/xml/preferences.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory android:title="@string/updates">
-		<ListPreference android:title="@string/update_interval"
-			android:key="updateInterval"
-			android:defaultValue="24"
-			android:entries="@array/updateIntervalNames"
-			android:entryValues="@array/updateIntervalValues" />
-		<CheckBoxPreference android:title="@string/automatic_scan_wifi"
-			android:defaultValue="false"
-			android:key="updateOnWifiOnly" />
-		<CheckBoxPreference android:title="@string/notify"
-			android:defaultValue="true"
-			android:key="updateNotify" />
-		<EditTextPreference
-			android:defaultValue="14"
-			android:key="updateHistoryDays"
-			android:maxLength="2"
-			android:numeric="integer"
-			android:title="@string/update_history" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/display">
+    <PreferenceCategory android:title="@string/updates">
+        <ListPreference android:title="@string/update_interval"
+            android:key="updateInterval"
+            android:defaultValue="24"
+            android:entries="@array/updateIntervalNames"
+            android:entryValues="@array/updateIntervalValues" />
+        <CheckBoxPreference android:title="@string/automatic_scan_wifi"
+            android:defaultValue="false"
+            android:key="updateOnWifiOnly" />
+        <CheckBoxPreference android:title="@string/notify"
+            android:defaultValue="true"
+            android:key="updateNotify" />
+        <EditTextPreference
+            android:defaultValue="14"
+            android:key="updateHistoryDays"
+            android:maxLength="2"
+            android:numeric="integer"
+            android:title="@string/update_history" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/display">
         <ListPreference android:title="@string/pref_language"
             android:key="language"
             android:defaultValue=""
@@ -27,29 +27,29 @@
         <CheckBoxPreference android:title="@string/compactlayout"
             android:defaultValue="false"
             android:key="compactlayout"/>
-		<ListPreference android:title="@string/theme"
-			android:key="theme"
-			android:defaultValue="light"
-			android:entries="@array/themeNames"
-			android:entryValues="@array/themeValues" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/appcompatibility">
-       <CheckBoxPreference android:title="@string/show_incompat_versions"
-           android:defaultValue="false"
-           android:key="incompatibleVersions" />
-		<CheckBoxPreference android:title="@string/rooted"
-			android:defaultValue="true"
-			android:key="rooted" />
-		<CheckBoxPreference android:title="@string/ignoreTouch"
-			android:defaultValue="false"
-			android:key="ignoreTouchscreen" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/local_repo">
-		<EditTextPreference
-		    android:key="localRepoName"
-		    android:title="@string/local_repo_name" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/proxy" >
+        <ListPreference android:title="@string/theme"
+            android:key="theme"
+            android:defaultValue="light"
+            android:entries="@array/themeNames"
+            android:entryValues="@array/themeValues" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/appcompatibility">
+        <CheckBoxPreference android:title="@string/show_incompat_versions"
+            android:defaultValue="false"
+            android:key="incompatibleVersions" />
+        <CheckBoxPreference android:title="@string/rooted"
+            android:defaultValue="true"
+            android:key="rooted" />
+        <CheckBoxPreference android:title="@string/ignoreTouch"
+            android:defaultValue="false"
+            android:key="ignoreTouchscreen" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/local_repo">
+        <EditTextPreference
+            android:key="localRepoName"
+            android:title="@string/local_repo_name" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/proxy" >
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="enableProxy"
@@ -58,34 +58,34 @@
         <EditTextPreference
             android:key="proxyHost"
             android:title="@string/proxy_host"
-	    android:summary="@string/proxy_host_summary"
-	    android:dependency="enableProxy" />
+            android:summary="@string/proxy_host_summary"
+            android:dependency="enableProxy" />
         <EditTextPreference
             android:key="proxyPort"
             android:title="@string/proxy_port"
             android:summary="@string/proxy_port_summary"
-	    android:dependency="enableProxy" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/other">
-		<CheckBoxPreference android:title="@string/cache_downloaded"
-			android:defaultValue="false"
-			android:key="cacheDownloaded" />
-		<CheckBoxPreference android:title="@string/expert"
-			android:defaultValue="false"
-			android:key="expert" />
-		<CheckBoxPreference
-			android:key="unstableUpdates"
-			android:title="@string/unstable_updates"
-			android:summary="@string/unstable_updates_summary"
-			android:defaultValue="false"
-			android:dependency="expert" />
-		<CheckBoxPreference android:title="@string/system_installer"
-			android:defaultValue="false"
-			android:key="privilegedInstaller"
-			android:dependency="expert" />
-		<Preference android:title="@string/uninstall_system"
-			android:summary="@string/uninstall_system_summary"
-			android:key="uninstallPrivilegedApp"
-			android:dependency="expert" />
-	</PreferenceCategory>
+            android:dependency="enableProxy" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/other">
+        <CheckBoxPreference android:title="@string/cache_downloaded"
+            android:defaultValue="false"
+            android:key="cacheDownloaded" />
+        <CheckBoxPreference android:title="@string/expert"
+            android:defaultValue="false"
+            android:key="expert" />
+        <CheckBoxPreference
+            android:key="unstableUpdates"
+            android:title="@string/unstable_updates"
+            android:summary="@string/unstable_updates_summary"
+            android:defaultValue="false"
+            android:dependency="expert" />
+        <CheckBoxPreference android:title="@string/system_installer"
+            android:defaultValue="false"
+            android:key="privilegedInstaller"
+            android:dependency="expert" />
+        <Preference android:title="@string/uninstall_system"
+            android:summary="@string/uninstall_system_summary"
+            android:key="uninstallPrivilegedApp"
+            android:dependency="expert" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/README.md b/README.md
index 9486d2d48..2c0ac5719 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ for Android.
 The only requirements are the [Android SDK](https://developer.android.com/sdk/)
 and [Gradle](http://gradle.org/) 2.7:
 
-	cd F-Droid
-	gradle assembleRelease
+    cd F-Droid
+    gradle assembleRelease
 
 ## Direct download
 
diff --git a/settings.gradle b/settings.gradle
index bd4f9f6b5..d6c16f904 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,12 +2,12 @@ include ':F-Droid'
 include ':Privileged-Extension'
 include ':privileged-api-lib'
 if (hasProperty('sourceDeps')) {
-	include ':extern:support-v4-preferencefragment'
-	include ':extern:nanohttpd:core'
-	include ':extern:zipsigner'
+    include ':extern:support-v4-preferencefragment'
+    include ':extern:nanohttpd:core'
+    include ':extern:zipsigner'
 
         // Needed for zipsigner
-	include ':extern:spongycastle:core'
-	include ':extern:spongycastle:pkix'
-	include ':extern:spongycastle:prov'
+    include ':extern:spongycastle:core'
+    include ':extern:spongycastle:pkix'
+    include ':extern:spongycastle:prov'
 }