From 273c68553c936ecedf2510a99a84e741a1388abe Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Wed, 7 Sep 2016 19:08:03 +0700
Subject: [PATCH] Remove campaigns again

This was already done in #240, but re-introduced in 4b01f6e95f.
---
 .../main/res/layout/activity_campaigns.xml    | 13 -----
 .../main/res/layout/fragment_campaigns.xml    | 18 -------
 .../main/res/layout/layout_campaign_item.xml  | 12 -----
 .../main/res/xml/campaigns_sync_adapter.xml   |  9 ----
 disable-campaigns.patch                       | 51 -------------------
 5 files changed, 103 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_campaigns.xml
 delete mode 100644 app/src/main/res/layout/fragment_campaigns.xml
 delete mode 100644 app/src/main/res/layout/layout_campaign_item.xml
 delete mode 100644 app/src/main/res/xml/campaigns_sync_adapter.xml
 delete mode 100644 disable-campaigns.patch

diff --git a/app/src/main/res/layout/activity_campaigns.xml b/app/src/main/res/layout/activity_campaigns.xml
deleted file mode 100644
index cfac7c79b..000000000
--- a/app/src/main/res/layout/activity_campaigns.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/campaignsList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_campaigns.xml b/app/src/main/res/layout/fragment_campaigns.xml
deleted file mode 100644
index 3ff614f0e..000000000
--- a/app/src/main/res/layout/fragment_campaigns.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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">
-
-    <GridView android:id="@+id/campaignsList"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:stretchMode="columnWidth"
-              android:columnWidth="240dp"
-              android:numColumns="auto_fit"
-              android:listSelector="@null"
-              android:fadingEdge="none"
-              android:fastScrollEnabled="false"
-            />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_campaign_item.xml b/app/src/main/res/layout/layout_campaign_item.xml
deleted file mode 100644
index 79c0355dd..000000000
--- a/app/src/main/res/layout/layout_campaign_item.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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">
-    <TextView
-        android:id="@+id/campaignItemName"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/campaigns_sync_adapter.xml b/app/src/main/res/xml/campaigns_sync_adapter.xml
deleted file mode 100644
index 1da828c50..000000000
--- a/app/src/main/res/xml/campaigns_sync_adapter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.free.nrw.commons.campaigns.contentprovider"
-              android:accountType="fr.free.nrw.commons"
-              android:supportsUploading="false"
-              android:userVisible="true"
-              android:isAlwaysSyncable="true"
-        />
diff --git a/disable-campaigns.patch b/disable-campaigns.patch
deleted file mode 100644
index 586abe1d5..000000000
--- a/disable-campaigns.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
-index 5ad1c77..50b16ff 100644
---- a/app/src/main/AndroidManifest.xml
-+++ b/app/src/main/AndroidManifest.xml
-@@ -82,14 +82,6 @@
-             android:label="@string/title_activity_settings"
-             />
-         <activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
--        <activity android:name=".campaigns.CampaignActivity" android:label="Campaigns"
--                android:icon="@drawable/ic_launcher"
--                >
--            <intent-filter>
--                <action android:name="android.intent.action.MAIN"/>
--                <category android:name="android.intent.category.LAUNCHER"/>
--            </intent-filter>
--        </activity>
-
-         <service android:name=".upload.UploadService" >
-         </service>
-@@ -106,17 +98,6 @@
-                 android:resource="@xml/authenticator" />
-         </service>
-         <service
--                android:name=".campaigns.CampaignsSyncService"
--                android:exported="true">
--            <intent-filter>
--                <action
--                        android:name="android.content.SyncAdapter" />
--            </intent-filter>
--            <meta-data
--                    android:name="android.content.SyncAdapter"
--                    android:resource="@xml/campaigns_sync_adapter" />
--        </service>
--        <service
-                 android:name=".contributions.ContributionsSyncService"
-                 android:exported="true">
-             <intent-filter>
-@@ -148,13 +129,6 @@
-                 android:exported="false">
-         </provider>
-         <provider
--                android:name=".campaigns.CampaignsContentProvider"
--                android:label="@string/provider_campaigns"
--                android:syncable="true"
--                android:authorities="fr.free.nrw.commons.campaigns.contentprovider"
--                android:exported="false">
--        </provider>
--        <provider
-                 android:name=".modifications.ModificationsContentProvider"
-                 android:label="@string/provider_modifications"
-                 android:syncable="true"