Changed project structure

Switched from custom layout to standard gradle project structure

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "submodules/dslv"]
 	path = submodules/dslv
 	url = git://github.com/danieloeh/drag-sort-listview.git
+[submodule "app/dslv"]
+	path = app/dslv
+	url = https://github.com/danieloeh/drag-sort-listview.git

app/build.gradle

@@ -0,0 +1,112 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12.2'
+    }
+}
+apply plugin: 'com.android.application'
+
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:appcompat-v7:20.0.0'
+    compile 'org.apache.commons:commons-lang3:3.3.2'
+    compile ('org.shredzone.flattr4j:flattr4j-core:2.10') {
+        exclude group: 'org.apache.httpcomponents', module: 'httpcore'
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+        exclude group: 'org.json', module: 'json'
+    }
+    compile 'commons-io:commons-io:2.4'
+    compile 'com.nineoldandroids:library:2.4.0'
+    compile project('dslv:library')
+
+    compile 'com.jayway.android.robotium:robotium-solo:5.2.1'
+    compile ("com.doomonafireball.betterpickers:library:1.5.2") {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+    compile 'org.jsoup:jsoup:1.7.3'
+    compile 'com.squareup.picasso:picasso:2.3.4'
+    compile 'com.squareup.okhttp:okhttp:2.0.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'
+    compile 'com.squareup.okio:okio:1.0.0'
+}
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "20.0"
+
+    defaultConfig {
+        minSdkVersion 10
+        targetSdkVersion 19
+        testApplicationId "de.test.antennapod"
+        testInstrumentationRunner "de.test.antennapod.AntennaPodTestRunner"
+    }
+
+    signingConfigs {
+        releaseConfig {
+            if (project.hasProperty('releaseStoreFile')) {
+                storeFile file(releaseStoreFile)
+            } else {
+                storeFile file('keystore')
+            }
+            if (project.hasProperty('releaseStorePassword')) {
+                storePassword releaseStorePassword
+            } else {
+                storePassword "password"
+            }
+            if (project.hasProperty('releaseKeyAlias')) {
+                keyAlias releaseKeyAlias
+            } else {
+                keyAlias "alias"
+            }
+            if (project.hasProperty('releaseKeyPassword')) {
+                keyPassword releaseKeyPassword
+            } else {
+                keyPassword "password"
+            }
+        }
+    }
+
+    buildTypes {
+        def STRING = "String"
+        def FLATTR_APP_KEY = "FLATTR_APP_KEY"
+        def FLATTR_APP_SECRET = "FLATTR_APP_SECRET"
+        def mFlattrAppKey = (project.hasProperty('flattrAppKey')) ? flattrAppKey : "\"\""
+        def mFlattrAppSecret = (project.hasProperty('flattrAppSecret')) ? flattrAppSecret : "\"\""
+
+        debug {
+            applicationIdSuffix ".debug"
+            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
+            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
+        }
+        release {
+            runProguard true
+            proguardFile 'proguard.cfg'
+            signingConfig signingConfigs.releaseConfig
+            buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
+            buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.12'
+}

app/dslv

@@ -0,0 +1 @@
+Subproject commit 80011c50e444e1c7d5e13b57bdb127b524a1ff92

app/settings.gradle

@@ -0,0 +1 @@
+include ':app:dslv:library'

app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod;
+package de.test.antennapod;
 
 import android.test.InstrumentationTestRunner;
 import android.test.suitebuilder.TestSuiteBuilder;
@@ -10,7 +10,7 @@ public class AntennaPodTestRunner extends InstrumentationTestRunner {
     public TestSuite getAllTests() {
         return new TestSuiteBuilder(AntennaPodTestRunner.class)
                 .includeAllPackagesUnderHere()
-                .excludePackages("instrumentationTest.de.test.antennapod.gpodnet")
+                .excludePackages("de.test.antennapod.gpodnet")
                 .build();
     }
 }

app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java

@@ -1,7 +1,7 @@
-package instrumentationTest.de.test.antennapod.gpodnet;
+package de.test.antennapod.gpodnet;
 
 import android.test.AndroidTestCase;
-import android.util.Log;
+
 import de.danoeh.antennapod.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.gpoddernet.model.GpodnetDevice;

app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java

@@ -1,13 +1,13 @@
-package instrumentationTest.de.test.antennapod.syndication.handler;
+package de.test.antennapod.handler;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.feed.*;
 import de.danoeh.antennapod.syndication.handler.FeedHandler;
 import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.AtomGenerator;
+import de.test.antennapod.util.syndication.feedgenerator.AtomGenerator;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.FeedGenerator;
+import de.test.antennapod.util.syndication.feedgenerator.FeedGenerator;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
+import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;

app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.download;
+package de.test.antennapod.service.download;
 
 import android.test.InstrumentationTestCase;
 import android.util.Log;
@@ -8,7 +8,7 @@ import de.danoeh.antennapod.service.download.DownloadStatus;
 import de.danoeh.antennapod.service.download.Downloader;
 import de.danoeh.antennapod.service.download.HttpDownloader;
 import de.danoeh.antennapod.util.DownloadError;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.service.download.HTTPBin;
 
 import java.io.File;
 import java.io.IOException;

app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.playback;
+package de.test.antennapod.service.playback;
 
 import android.content.Context;
 import android.media.RemoteControlClient;
@@ -10,7 +10,7 @@ import de.danoeh.antennapod.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.service.playback.PlayerStatus;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 import de.danoeh.antennapod.util.playback.Playable;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.service.download.HTTPBin;
 import junit.framework.AssertionFailedError;
 import org.apache.commons.io.IOUtils;
 
@@ -69,7 +69,7 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
         assertTrue(cacheDir.canWrite());
         assertTrue(cacheDir.canRead());
         if (!dest.exists()) {
-            InputStream i = getInstrumentation().getTargetContext().getAssets().open("testfile.mp3");
+            InputStream i = getInstrumentation().getContext().getAssets().open("testfile.mp3");
             OutputStream o = new FileOutputStream(new File(cacheDir, PLAYABLE_DEST_URL));
             IOUtils.copy(i, o);
             o.flush();

app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.service.playback;
+package de.test.antennapod.service.playback;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;

app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
@@ -9,14 +9,14 @@ import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.storage.FeedItemStatistics;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 import de.danoeh.antennapod.util.flattr.FlattrStatus;
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.*;
+import static de.test.antennapod.storage.DBTestUtils.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.saveFeedlist;
+import static de.test.antennapod.storage.DBTestUtils.saveFeedlist;
 
 /**
  * Test class for DBReader

app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import static instrumentationTest.de.test.antennapod.storage.DBTestUtils.*;
+import static de.test.antennapod.storage.DBTestUtils.*;
 
 /**
  * Test class for DBTasks

app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import de.danoeh.antennapod.feed.Feed;

app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.storage;
+package de.test.antennapod.storage;
 
 import android.content.Context;
 import android.database.Cursor;

app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java

@@ -1,8 +1,7 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import com.robotium.solo.Solo;
@@ -10,7 +9,6 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.storage.PodDBAdapter;
 

app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.content.Intent;
 import android.content.SharedPreferences;

app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -7,10 +7,9 @@ import android.os.Build;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.feed.*;
-import de.danoeh.antennapod.storage.DBWriter;
 import de.danoeh.antennapod.storage.PodDBAdapter;
-import instrumentationTest.de.test.antennapod.util.service.download.HTTPBin;
+import de.test.antennapod.util.service.download.HTTPBin;
-import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
+import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator;
 import junit.framework.Assert;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;

app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.feed.Feed;

app/src/androidTest/java/de/test/antennapod/ui/VideoplayerActivityTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.ui;
+package de.test.antennapod.ui;
 
 import android.test.ActivityInstrumentationTestCase2;
 

app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 

app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import java.io.File;
 import java.io.IOException;

app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 import de.danoeh.antennapod.util.URIUtil;

app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util;
+package de.test.antennapod.util;
 
 import android.test.AndroidTestCase;
 import de.danoeh.antennapod.util.URLChecker;

app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.playback;
+package de.test.antennapod.util.playback;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;

app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.service.download;
+package de.test.antennapod.util.service.download;
 
 import android.util.Base64;
 import android.util.Log;

app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.service.download;
+package de.test.antennapod.util.service.download;
 
 import java.io.*;
 import java.net.InetAddress;

app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication;
+package de.test.antennapod.util.syndication;
 
 import android.test.InstrumentationTestCase;
 import de.danoeh.antennapod.util.syndication.FeedDiscoverer;

app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
 import de.danoeh.antennapod.feed.Feed;

app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import de.danoeh.antennapod.feed.Feed;
 

app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import org.xmlpull.v1.XmlSerializer;
 

app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java

@@ -1,4 +1,4 @@
-package instrumentationTest.de.test.antennapod.util.syndication.feedgenerator;
+package de.test.antennapod.util.syndication.feedgenerator;
 
 import android.util.Xml;
 import de.danoeh.antennapod.feed.Feed;