diff --git a/.gitmodules b/.gitmodules index 17dac28b0..2529169ca 100644 --- a/.gitmodules +++ b/.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 diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 000000000..1295a81dc --- /dev/null +++ b/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' +} diff --git a/app/dslv b/app/dslv new file mode 160000 index 000000000..80011c50e --- /dev/null +++ b/app/dslv @@ -0,0 +1 @@ +Subproject commit 80011c50e444e1c7d5e13b57bdb127b524a1ff92 diff --git a/lint.xml b/app/lint.xml similarity index 100% rename from lint.xml rename to app/lint.xml diff --git a/proguard.cfg b/app/proguard.cfg similarity index 100% rename from proguard.cfg rename to app/proguard.cfg diff --git a/app/settings.gradle b/app/settings.gradle new file mode 100644 index 000000000..e2d4f844d --- /dev/null +++ b/app/settings.gradle @@ -0,0 +1 @@ +include ':app:dslv:library' diff --git a/src/instrumentationTest/de/test/antennapod/AntennaPodTestRunner.java b/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java similarity index 75% rename from src/instrumentationTest/de/test/antennapod/AntennaPodTestRunner.java rename to app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java index cc8494632..24cd6e669 100644 --- a/src/instrumentationTest/de/test/antennapod/AntennaPodTestRunner.java +++ b/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(); } } diff --git a/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java b/app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java similarity index 97% rename from src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java rename to app/src/androidTest/java/de/test/antennapod/gpodnet/GPodnetServiceTest.java index a96fc7aab..971a79a81 100644 --- a/src/instrumentationTest/de/test/antennapod/gpodnet/GPodnetServiceTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/syndication/handler/FeedHandlerTest.java b/app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java similarity index 95% rename from src/instrumentationTest/de/test/antennapod/syndication/handler/FeedHandlerTest.java rename to app/src/androidTest/java/de/test/antennapod/handler/FeedHandlerTest.java index 213dac66a..3fe42dfd0 100644 --- a/src/instrumentationTest/de/test/antennapod/syndication/handler/FeedHandlerTest.java +++ b/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 instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.FeedGenerator; -import instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator; +import de.test.antennapod.util.syndication.feedgenerator.AtomGenerator; +import de.test.antennapod.util.syndication.feedgenerator.FeedGenerator; +import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator; import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; diff --git a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java similarity index 97% rename from src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java rename to app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java index 6e44c8a0f..575bbb998 100644 --- a/src/instrumentationTest/de/test/antennapod/service/download/HttpDownloaderTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java rename to app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java index 71747dae8..b7d30a7b8 100644 --- a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java +++ b/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(); diff --git a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java rename to app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java index 19f64b4cf..86f609d74 100644 --- a/src/instrumentationTest/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java rename to app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java index c42c7a0cc..fe337a5fb 100644 --- a/src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java +++ b/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 diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/storage/DBTasksTest.java rename to app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java index 1e5afd0e3..8859e50f9 100644 --- a/src/instrumentationTest/de/test/antennapod/storage/DBTasksTest.java +++ b/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 diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBTestUtils.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java similarity index 97% rename from src/instrumentationTest/de/test/antennapod/storage/DBTestUtils.java rename to app/src/androidTest/java/de/test/antennapod/storage/DBTestUtils.java index 7e9e1b908..947984574 100644 --- a/src/instrumentationTest/de/test/antennapod/storage/DBTestUtils.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java rename to app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java index 67d99f9fc..c1e045b79 100644 --- a/src/instrumentationTest/de/test/antennapod/storage/DBWriterTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java similarity index 96% rename from src/instrumentationTest/de/test/antennapod/ui/MainActivityTest.java rename to app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java index 23fc224c8..9b98c5f89 100644 --- a/src/instrumentationTest/de/test/antennapod/ui/MainActivityTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/ui/PlaybackTest.java rename to app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java index 98d93a35d..28271a52b 100644 --- a/src/instrumentationTest/de/test/antennapod/ui/PlaybackTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java similarity index 96% rename from src/instrumentationTest/de/test/antennapod/ui/UITestUtils.java rename to app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java index 8877d46d6..eac90e7c1 100644 --- a/src/instrumentationTest/de/test/antennapod/ui/UITestUtils.java +++ b/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 instrumentationTest.de.test.antennapod.util.syndication.feedgenerator.RSS2Generator; +import de.test.antennapod.util.service.download.HTTPBin; +import de.test.antennapod.util.syndication.feedgenerator.RSS2Generator; import junit.framework.Assert; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/src/instrumentationTest/de/test/antennapod/ui/UITestUtilsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/ui/UITestUtilsTest.java rename to app/src/androidTest/java/de/test/antennapod/ui/UITestUtilsTest.java index 88180152c..e7782ff59 100644 --- a/src/instrumentationTest/de/test/antennapod/ui/UITestUtilsTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/VideoplayerActivityTest.java similarity index 94% rename from src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java rename to app/src/androidTest/java/de/test/antennapod/ui/VideoplayerActivityTest.java index 807552571..da6f07cab 100644 --- a/src/instrumentationTest/de/test/antennapod/ui/VideoplayerActivityTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/ConverterTest.java b/app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java similarity index 95% rename from src/instrumentationTest/de/test/antennapod/util/ConverterTest.java rename to app/src/androidTest/java/de/test/antennapod/util/ConverterTest.java index 8e5674b06..9ab444a99 100644 --- a/src/instrumentationTest/de/test/antennapod/util/ConverterTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/FilenameGeneratorTest.java b/app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java similarity index 96% rename from src/instrumentationTest/de/test/antennapod/util/FilenameGeneratorTest.java rename to app/src/androidTest/java/de/test/antennapod/util/FilenameGeneratorTest.java index 552d34941..bf7f57459 100644 --- a/src/instrumentationTest/de/test/antennapod/util/FilenameGeneratorTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/URIUtilTest.java b/app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java similarity index 92% rename from src/instrumentationTest/de/test/antennapod/util/URIUtilTest.java rename to app/src/androidTest/java/de/test/antennapod/util/URIUtilTest.java index a7cba4c03..61d230295 100644 --- a/src/instrumentationTest/de/test/antennapod/util/URIUtilTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java b/app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java similarity index 97% rename from src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java rename to app/src/androidTest/java/de/test/antennapod/util/URLCheckerTest.java index 08fd0d486..fd485e0da 100644 --- a/src/instrumentationTest/de/test/antennapod/util/URLCheckerTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/playback/TimelineTest.java b/app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/util/playback/TimelineTest.java rename to app/src/androidTest/java/de/test/antennapod/util/playback/TimelineTest.java index 1b1d011d4..c2b7ad316 100644 --- a/src/instrumentationTest/de/test/antennapod/util/playback/TimelineTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/service/download/HTTPBin.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/util/service/download/HTTPBin.java rename to app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java index fc5025b14..5cb723446 100644 --- a/src/instrumentationTest/de/test/antennapod/util/service/download/HTTPBin.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/service/download/NanoHTTPD.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java similarity index 99% rename from src/instrumentationTest/de/test/antennapod/util/service/download/NanoHTTPD.java rename to app/src/androidTest/java/de/test/antennapod/util/service/download/NanoHTTPD.java index 916a2af6c..4a5818479 100644 --- a/src/instrumentationTest/de/test/antennapod/util/service/download/NanoHTTPD.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/FeedDiscovererTest.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/util/syndication/FeedDiscovererTest.java rename to app/src/androidTest/java/de/test/antennapod/util/syndication/FeedDiscovererTest.java index 51a28089d..10414fd2a 100644 --- a/src/instrumentationTest/de/test/antennapod/util/syndication/FeedDiscovererTest.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java rename to app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java index 0e3440030..8ce6c08e4 100644 --- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java similarity index 93% rename from src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java rename to app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java index e6b0f0697..23518de87 100644 --- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/FeedGenerator.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java similarity index 88% rename from src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java rename to app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java index d8bef2354..e7cbb1b42 100644 --- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java +++ b/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; diff --git a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java similarity index 98% rename from src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java rename to app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java index 824a84a66..6355d4bb9 100644 --- a/src/instrumentationTest/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java +++ b/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; diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/com/aocate/presto/service/IDeathCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IDeathCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IDeathCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IDeathCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnBufferingUpdateListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnCompletionListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnErrorListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnInfoListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnPitchAdjustmentAvailableChangedListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnPreparedListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnSeekCompleteListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IOnSpeedAdjustmentAvailableChangedListenerCallback_0_8.aidl diff --git a/src/com/aocate/presto/service/IPlayMedia_0_8.aidl b/app/src/main/aidl/com/aocate/presto/service/IPlayMedia_0_8.aidl similarity index 100% rename from src/com/aocate/presto/service/IPlayMedia_0_8.aidl rename to app/src/main/aidl/com/aocate/presto/service/IPlayMedia_0_8.aidl diff --git a/assets/LICENSE.html b/app/src/main/assets/LICENSE.html similarity index 100% rename from assets/LICENSE.html rename to app/src/main/assets/LICENSE.html diff --git a/assets/LICENSE_APACHE_COMMONS.txt b/app/src/main/assets/LICENSE_APACHE_COMMONS.txt similarity index 100% rename from assets/LICENSE_APACHE_COMMONS.txt rename to app/src/main/assets/LICENSE_APACHE_COMMONS.txt diff --git a/assets/LICENSE_BETTERPICKERS.txt b/app/src/main/assets/LICENSE_BETTERPICKERS.txt similarity index 100% rename from assets/LICENSE_BETTERPICKERS.txt rename to app/src/main/assets/LICENSE_BETTERPICKERS.txt diff --git a/assets/LICENSE_DSLV.txt b/app/src/main/assets/LICENSE_DSLV.txt similarity index 100% rename from assets/LICENSE_DSLV.txt rename to app/src/main/assets/LICENSE_DSLV.txt diff --git a/assets/LICENSE_FLATTR4J.txt b/app/src/main/assets/LICENSE_FLATTR4J.txt similarity index 100% rename from assets/LICENSE_FLATTR4J.txt rename to app/src/main/assets/LICENSE_FLATTR4J.txt diff --git a/assets/LICENSE_JSOUP.txt b/app/src/main/assets/LICENSE_JSOUP.txt similarity index 100% rename from assets/LICENSE_JSOUP.txt rename to app/src/main/assets/LICENSE_JSOUP.txt diff --git a/assets/LICENSE_NINE_OLD_ANDROIDS.txt b/app/src/main/assets/LICENSE_NINE_OLD_ANDROIDS.txt similarity index 100% rename from assets/LICENSE_NINE_OLD_ANDROIDS.txt rename to app/src/main/assets/LICENSE_NINE_OLD_ANDROIDS.txt diff --git a/assets/LICENSE_OKHTTP.txt b/app/src/main/assets/LICENSE_OKHTTP.txt similarity index 100% rename from assets/LICENSE_OKHTTP.txt rename to app/src/main/assets/LICENSE_OKHTTP.txt diff --git a/assets/LICENSE_OKIO.txt b/app/src/main/assets/LICENSE_OKIO.txt similarity index 100% rename from assets/LICENSE_OKIO.txt rename to app/src/main/assets/LICENSE_OKIO.txt diff --git a/assets/LICENSE_PICASSO.txt b/app/src/main/assets/LICENSE_PICASSO.txt similarity index 100% rename from assets/LICENSE_PICASSO.txt rename to app/src/main/assets/LICENSE_PICASSO.txt diff --git a/assets/LICENSE_PRESTO.txt b/app/src/main/assets/LICENSE_PRESTO.txt similarity index 100% rename from assets/LICENSE_PRESTO.txt rename to app/src/main/assets/LICENSE_PRESTO.txt diff --git a/assets/Roboto-Light.ttf b/app/src/main/assets/Roboto-Light.ttf similarity index 100% rename from assets/Roboto-Light.ttf rename to app/src/main/assets/Roboto-Light.ttf diff --git a/assets/Roboto.ttf b/app/src/main/assets/Roboto.ttf similarity index 100% rename from assets/Roboto.ttf rename to app/src/main/assets/Roboto.ttf diff --git a/assets/about.html b/app/src/main/assets/about.html similarity index 100% rename from assets/about.html rename to app/src/main/assets/about.html diff --git a/assets/logo.png b/app/src/main/assets/logo.png similarity index 100% rename from assets/logo.png rename to app/src/main/assets/logo.png diff --git a/assets/testfile.mp3 b/app/src/main/assets/testfile.mp3 similarity index 100% rename from assets/testfile.mp3 rename to app/src/main/assets/testfile.mp3 diff --git a/src/com/aocate/media/AndroidMediaPlayer.java b/app/src/main/java/com/aocate/media/AndroidMediaPlayer.java similarity index 100% rename from src/com/aocate/media/AndroidMediaPlayer.java rename to app/src/main/java/com/aocate/media/AndroidMediaPlayer.java diff --git a/src/com/aocate/media/MediaPlayer.java b/app/src/main/java/com/aocate/media/MediaPlayer.java similarity index 100% rename from src/com/aocate/media/MediaPlayer.java rename to app/src/main/java/com/aocate/media/MediaPlayer.java diff --git a/src/com/aocate/media/MediaPlayerImpl.java b/app/src/main/java/com/aocate/media/MediaPlayerImpl.java similarity index 100% rename from src/com/aocate/media/MediaPlayerImpl.java rename to app/src/main/java/com/aocate/media/MediaPlayerImpl.java diff --git a/src/com/aocate/media/ServiceBackedMediaPlayer.java b/app/src/main/java/com/aocate/media/ServiceBackedMediaPlayer.java similarity index 100% rename from src/com/aocate/media/ServiceBackedMediaPlayer.java rename to app/src/main/java/com/aocate/media/ServiceBackedMediaPlayer.java diff --git a/src/com/aocate/media/SpeedAdjustmentAlgorithm.java b/app/src/main/java/com/aocate/media/SpeedAdjustmentAlgorithm.java similarity index 100% rename from src/com/aocate/media/SpeedAdjustmentAlgorithm.java rename to app/src/main/java/com/aocate/media/SpeedAdjustmentAlgorithm.java diff --git a/src/de/danoeh/antennapod/AppConfig.java b/app/src/main/java/de/danoeh/antennapod/AppConfig.java similarity index 100% rename from src/de/danoeh/antennapod/AppConfig.java rename to app/src/main/java/de/danoeh/antennapod/AppConfig.java diff --git a/src/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java similarity index 100% rename from src/de/danoeh/antennapod/PodcastApp.java rename to app/src/main/java/de/danoeh/antennapod/PodcastApp.java diff --git a/src/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/AboutActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/AudioplayerActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java diff --git a/src/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java diff --git a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/DirectoryChooserActivity.java diff --git a/src/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/DownloadAuthenticationActivity.java diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/FeedInfoActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java diff --git a/src/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/FlattrAuthActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/MainActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/MediaplayerActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java diff --git a/src/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java diff --git a/src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java diff --git a/src/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java diff --git a/src/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromIntentActivity.java diff --git a/src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/OpmlImportFromPathActivity.java diff --git a/src/de/danoeh/antennapod/activity/OpmlImportHolder.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java similarity index 100% rename from src/de/danoeh/antennapod/activity/OpmlImportHolder.java rename to app/src/main/java/de/danoeh/antennapod/activity/OpmlImportHolder.java diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/PreferenceActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java diff --git a/src/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/StorageErrorActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java diff --git a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/VideoplayerActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java diff --git a/src/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java similarity index 100% rename from src/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java rename to app/src/main/java/de/danoeh/antennapod/activity/gpoddernet/GpodnetAuthenticationActivity.java diff --git a/src/de/danoeh/antennapod/adapter/ActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/ActionButtonCallback.java rename to app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonCallback.java diff --git a/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/ActionButtonUtils.java rename to app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java diff --git a/src/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/AdapterUtils.java rename to app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java diff --git a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/ChapterListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java rename to app/src/main/java/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java diff --git a/src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistDescriptionAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/NavListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/QueueListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/QueueListAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/SearchlistAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/SearchlistAdapter.java diff --git a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java rename to app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java diff --git a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java b/app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/DownloadObserver.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/DownloadObserver.java diff --git a/src/de/danoeh/antennapod/asynctask/FeedRemover.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/FeedRemover.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/FeedRemover.java diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/FlattrClickWorker.java diff --git a/src/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/FlattrStatusFetcher.java diff --git a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java diff --git a/src/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/OpmlExportWorker.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java diff --git a/src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/OpmlFeedQueuer.java diff --git a/src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/OpmlImportWorker.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/OpmlImportWorker.java diff --git a/src/de/danoeh/antennapod/asynctask/PicassoImageResource.java b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/PicassoImageResource.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/PicassoImageResource.java diff --git a/src/de/danoeh/antennapod/asynctask/PicassoProvider.java b/app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java similarity index 100% rename from src/de/danoeh/antennapod/asynctask/PicassoProvider.java rename to app/src/main/java/de/danoeh/antennapod/asynctask/PicassoProvider.java diff --git a/src/de/danoeh/antennapod/backup/OpmlBackupAgent.java b/app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java similarity index 100% rename from src/de/danoeh/antennapod/backup/OpmlBackupAgent.java rename to app/src/main/java/de/danoeh/antennapod/backup/OpmlBackupAgent.java diff --git a/src/de/danoeh/antennapod/dialog/AuthenticationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/AuthenticationDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/AuthenticationDialog.java diff --git a/src/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/AutoFlattrPreferenceDialog.java diff --git a/src/de/danoeh/antennapod/dialog/ConfirmationDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/ConfirmationDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/ConfirmationDialog.java diff --git a/src/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java b/app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java rename to app/src/main/java/de/danoeh/antennapod/dialog/DownloadRequestErrorDialogCreator.java diff --git a/src/de/danoeh/antennapod/dialog/FeedItemDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/FeedItemDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java diff --git a/src/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/GpodnetSetHostnameDialog.java diff --git a/src/de/danoeh/antennapod/dialog/TimeDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/TimeDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/TimeDialog.java diff --git a/src/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java similarity index 100% rename from src/de/danoeh/antennapod/dialog/VariableSpeedDialog.java rename to app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java diff --git a/src/de/danoeh/antennapod/feed/Chapter.java b/app/src/main/java/de/danoeh/antennapod/feed/Chapter.java similarity index 100% rename from src/de/danoeh/antennapod/feed/Chapter.java rename to app/src/main/java/de/danoeh/antennapod/feed/Chapter.java diff --git a/src/de/danoeh/antennapod/feed/EventDistributor.java b/app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java similarity index 100% rename from src/de/danoeh/antennapod/feed/EventDistributor.java rename to app/src/main/java/de/danoeh/antennapod/feed/EventDistributor.java diff --git a/src/de/danoeh/antennapod/feed/Feed.java b/app/src/main/java/de/danoeh/antennapod/feed/Feed.java similarity index 100% rename from src/de/danoeh/antennapod/feed/Feed.java rename to app/src/main/java/de/danoeh/antennapod/feed/Feed.java diff --git a/src/de/danoeh/antennapod/feed/FeedComponent.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedComponent.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedComponent.java diff --git a/src/de/danoeh/antennapod/feed/FeedFile.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedFile.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedFile.java diff --git a/src/de/danoeh/antennapod/feed/FeedImage.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedImage.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedImage.java diff --git a/src/de/danoeh/antennapod/feed/FeedItem.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedItem.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedItem.java diff --git a/src/de/danoeh/antennapod/feed/FeedMedia.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedMedia.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedMedia.java diff --git a/src/de/danoeh/antennapod/feed/FeedPreferences.java b/app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java similarity index 100% rename from src/de/danoeh/antennapod/feed/FeedPreferences.java rename to app/src/main/java/de/danoeh/antennapod/feed/FeedPreferences.java diff --git a/src/de/danoeh/antennapod/feed/ID3Chapter.java b/app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java similarity index 100% rename from src/de/danoeh/antennapod/feed/ID3Chapter.java rename to app/src/main/java/de/danoeh/antennapod/feed/ID3Chapter.java diff --git a/src/de/danoeh/antennapod/feed/MediaType.java b/app/src/main/java/de/danoeh/antennapod/feed/MediaType.java similarity index 100% rename from src/de/danoeh/antennapod/feed/MediaType.java rename to app/src/main/java/de/danoeh/antennapod/feed/MediaType.java diff --git a/src/de/danoeh/antennapod/feed/SearchResult.java b/app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java similarity index 100% rename from src/de/danoeh/antennapod/feed/SearchResult.java rename to app/src/main/java/de/danoeh/antennapod/feed/SearchResult.java diff --git a/src/de/danoeh/antennapod/feed/SimpleChapter.java b/app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java similarity index 100% rename from src/de/danoeh/antennapod/feed/SimpleChapter.java rename to app/src/main/java/de/danoeh/antennapod/feed/SimpleChapter.java diff --git a/src/de/danoeh/antennapod/feed/VorbisCommentChapter.java b/app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java similarity index 100% rename from src/de/danoeh/antennapod/feed/VorbisCommentChapter.java rename to app/src/main/java/de/danoeh/antennapod/feed/VorbisCommentChapter.java diff --git a/src/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/AddFeedFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java diff --git a/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/CoverFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java diff --git a/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/DownloadLogFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java diff --git a/src/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/DownloadsFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java diff --git a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/ItemlistFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java diff --git a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java diff --git a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java diff --git a/src/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/QueueFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java diff --git a/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java diff --git a/src/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/SearchFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastTopListFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/SuggestionListFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java similarity index 100% rename from src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/GpodnetService.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetService.java diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceAuthenticationException.java diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceBadStatusCodeException.java diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/GpodnetServiceException.java diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetDevice.java diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetPodcast.java diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetSubscriptionChange.java diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetTag.java diff --git a/src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java b/app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java similarity index 100% rename from src/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java rename to app/src/main/java/de/danoeh/antennapod/gpoddernet/model/GpodnetUploadChangesResponse.java diff --git a/src/de/danoeh/antennapod/opml/OpmlElement.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java similarity index 100% rename from src/de/danoeh/antennapod/opml/OpmlElement.java rename to app/src/main/java/de/danoeh/antennapod/opml/OpmlElement.java diff --git a/src/de/danoeh/antennapod/opml/OpmlReader.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java similarity index 100% rename from src/de/danoeh/antennapod/opml/OpmlReader.java rename to app/src/main/java/de/danoeh/antennapod/opml/OpmlReader.java diff --git a/src/de/danoeh/antennapod/opml/OpmlSymbols.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java similarity index 100% rename from src/de/danoeh/antennapod/opml/OpmlSymbols.java rename to app/src/main/java/de/danoeh/antennapod/opml/OpmlSymbols.java diff --git a/src/de/danoeh/antennapod/opml/OpmlWriter.java b/app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java similarity index 100% rename from src/de/danoeh/antennapod/opml/OpmlWriter.java rename to app/src/main/java/de/danoeh/antennapod/opml/OpmlWriter.java diff --git a/src/de/danoeh/antennapod/preferences/GpodnetPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java similarity index 100% rename from src/de/danoeh/antennapod/preferences/GpodnetPreferences.java rename to app/src/main/java/de/danoeh/antennapod/preferences/GpodnetPreferences.java diff --git a/src/de/danoeh/antennapod/preferences/PlaybackPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java similarity index 100% rename from src/de/danoeh/antennapod/preferences/PlaybackPreferences.java rename to app/src/main/java/de/danoeh/antennapod/preferences/PlaybackPreferences.java diff --git a/src/de/danoeh/antennapod/preferences/UserPreferences.java b/app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java similarity index 100% rename from src/de/danoeh/antennapod/preferences/UserPreferences.java rename to app/src/main/java/de/danoeh/antennapod/preferences/UserPreferences.java diff --git a/src/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java rename to app/src/main/java/de/danoeh/antennapod/receiver/AlarmUpdateReceiver.java diff --git a/src/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java rename to app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java diff --git a/src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java rename to app/src/main/java/de/danoeh/antennapod/receiver/FeedUpdateReceiver.java diff --git a/src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/MediaButtonReceiver.java rename to app/src/main/java/de/danoeh/antennapod/receiver/MediaButtonReceiver.java diff --git a/src/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/PlayerWidget.java rename to app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java diff --git a/src/de/danoeh/antennapod/receiver/SPAReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java similarity index 100% rename from src/de/danoeh/antennapod/receiver/SPAReceiver.java rename to app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java diff --git a/src/de/danoeh/antennapod/service/GpodnetSyncService.java b/app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java similarity index 100% rename from src/de/danoeh/antennapod/service/GpodnetSyncService.java rename to app/src/main/java/de/danoeh/antennapod/service/GpodnetSyncService.java diff --git a/src/de/danoeh/antennapod/service/download/APRedirectHandler.java b/app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/APRedirectHandler.java rename to app/src/main/java/de/danoeh/antennapod/service/download/APRedirectHandler.java diff --git a/src/de/danoeh/antennapod/service/download/AntennapodHttpClient.java b/app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/AntennapodHttpClient.java rename to app/src/main/java/de/danoeh/antennapod/service/download/AntennapodHttpClient.java diff --git a/src/de/danoeh/antennapod/service/download/DownloadRequest.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/DownloadRequest.java rename to app/src/main/java/de/danoeh/antennapod/service/download/DownloadRequest.java diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/DownloadService.java rename to app/src/main/java/de/danoeh/antennapod/service/download/DownloadService.java diff --git a/src/de/danoeh/antennapod/service/download/DownloadStatus.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/DownloadStatus.java rename to app/src/main/java/de/danoeh/antennapod/service/download/DownloadStatus.java diff --git a/src/de/danoeh/antennapod/service/download/Downloader.java b/app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/Downloader.java rename to app/src/main/java/de/danoeh/antennapod/service/download/Downloader.java diff --git a/src/de/danoeh/antennapod/service/download/DownloaderCallback.java b/app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/DownloaderCallback.java rename to app/src/main/java/de/danoeh/antennapod/service/download/DownloaderCallback.java diff --git a/src/de/danoeh/antennapod/service/download/HttpDownloader.java b/app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java similarity index 100% rename from src/de/danoeh/antennapod/service/download/HttpDownloader.java rename to app/src/main/java/de/danoeh/antennapod/service/download/HttpDownloader.java diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackService.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java similarity index 100% rename from src/de/danoeh/antennapod/service/playback/PlaybackService.java rename to app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackService.java diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java similarity index 100% rename from src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java rename to app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java similarity index 100% rename from src/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java rename to app/src/main/java/de/danoeh/antennapod/service/playback/PlaybackServiceTaskManager.java diff --git a/src/de/danoeh/antennapod/service/playback/PlayerStatus.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java similarity index 100% rename from src/de/danoeh/antennapod/service/playback/PlayerStatus.java rename to app/src/main/java/de/danoeh/antennapod/service/playback/PlayerStatus.java diff --git a/src/de/danoeh/antennapod/service/playback/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java similarity index 100% rename from src/de/danoeh/antennapod/service/playback/PlayerWidgetService.java rename to app/src/main/java/de/danoeh/antennapod/service/playback/PlayerWidgetService.java diff --git a/src/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java similarity index 100% rename from src/de/danoeh/antennapod/spa/SPAUtil.java rename to app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java diff --git a/src/de/danoeh/antennapod/storage/DBReader.java b/app/src/main/java/de/danoeh/antennapod/storage/DBReader.java similarity index 100% rename from src/de/danoeh/antennapod/storage/DBReader.java rename to app/src/main/java/de/danoeh/antennapod/storage/DBReader.java diff --git a/src/de/danoeh/antennapod/storage/DBTasks.java b/app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java similarity index 100% rename from src/de/danoeh/antennapod/storage/DBTasks.java rename to app/src/main/java/de/danoeh/antennapod/storage/DBTasks.java diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java similarity index 100% rename from src/de/danoeh/antennapod/storage/DBWriter.java rename to app/src/main/java/de/danoeh/antennapod/storage/DBWriter.java diff --git a/src/de/danoeh/antennapod/storage/DownloadRequestException.java b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java similarity index 100% rename from src/de/danoeh/antennapod/storage/DownloadRequestException.java rename to app/src/main/java/de/danoeh/antennapod/storage/DownloadRequestException.java diff --git a/src/de/danoeh/antennapod/storage/DownloadRequester.java b/app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java similarity index 100% rename from src/de/danoeh/antennapod/storage/DownloadRequester.java rename to app/src/main/java/de/danoeh/antennapod/storage/DownloadRequester.java diff --git a/src/de/danoeh/antennapod/storage/FeedItemStatistics.java b/app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java similarity index 100% rename from src/de/danoeh/antennapod/storage/FeedItemStatistics.java rename to app/src/main/java/de/danoeh/antennapod/storage/FeedItemStatistics.java diff --git a/src/de/danoeh/antennapod/storage/FeedSearcher.java b/app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java similarity index 100% rename from src/de/danoeh/antennapod/storage/FeedSearcher.java rename to app/src/main/java/de/danoeh/antennapod/storage/FeedSearcher.java diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java similarity index 100% rename from src/de/danoeh/antennapod/storage/PodDBAdapter.java rename to app/src/main/java/de/danoeh/antennapod/storage/PodDBAdapter.java diff --git a/src/de/danoeh/antennapod/syndication/handler/FeedHandler.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/FeedHandler.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandler.java diff --git a/src/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/FeedHandlerResult.java diff --git a/src/de/danoeh/antennapod/syndication/handler/HandlerState.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/HandlerState.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/HandlerState.java diff --git a/src/de/danoeh/antennapod/syndication/handler/SyndHandler.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/SyndHandler.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/SyndHandler.java diff --git a/src/de/danoeh/antennapod/syndication/handler/TypeGetter.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/TypeGetter.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/TypeGetter.java diff --git a/src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java b/app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java rename to app/src/main/java/de/danoeh/antennapod/syndication/handler/UnsupportedFeedtypeException.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSContent.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/NSContent.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSContent.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSITunes.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/NSITunes.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSITunes.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/NSMedia.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSMedia.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/NSRSS20.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSRSS20.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/NSSimpleChapters.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/Namespace.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/Namespace.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/Namespace.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/SyndElement.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/SyndElement.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/SyndElement.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/AtomText.java diff --git a/src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java b/app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java rename to app/src/main/java/de/danoeh/antennapod/syndication/namespace/atom/NSAtom.java diff --git a/src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/util/SyndDateUtils.java rename to app/src/main/java/de/danoeh/antennapod/syndication/util/SyndDateUtils.java diff --git a/src/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java b/app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java similarity index 100% rename from src/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java rename to app/src/main/java/de/danoeh/antennapod/syndication/util/SyndTypeUtils.java diff --git a/src/de/danoeh/antennapod/util/ChapterUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/ChapterUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/ChapterUtils.java diff --git a/src/de/danoeh/antennapod/util/Converter.java b/app/src/main/java/de/danoeh/antennapod/util/Converter.java similarity index 100% rename from src/de/danoeh/antennapod/util/Converter.java rename to app/src/main/java/de/danoeh/antennapod/util/Converter.java diff --git a/src/de/danoeh/antennapod/util/DownloadError.java b/app/src/main/java/de/danoeh/antennapod/util/DownloadError.java similarity index 100% rename from src/de/danoeh/antennapod/util/DownloadError.java rename to app/src/main/java/de/danoeh/antennapod/util/DownloadError.java diff --git a/src/de/danoeh/antennapod/util/DuckType.java b/app/src/main/java/de/danoeh/antennapod/util/DuckType.java similarity index 100% rename from src/de/danoeh/antennapod/util/DuckType.java rename to app/src/main/java/de/danoeh/antennapod/util/DuckType.java diff --git a/src/de/danoeh/antennapod/util/EpisodeFilter.java b/app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java similarity index 100% rename from src/de/danoeh/antennapod/util/EpisodeFilter.java rename to app/src/main/java/de/danoeh/antennapod/util/EpisodeFilter.java diff --git a/src/de/danoeh/antennapod/util/FeedtitleComparator.java b/app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/FeedtitleComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/FeedtitleComparator.java diff --git a/src/de/danoeh/antennapod/util/FileNameGenerator.java b/app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java similarity index 100% rename from src/de/danoeh/antennapod/util/FileNameGenerator.java rename to app/src/main/java/de/danoeh/antennapod/util/FileNameGenerator.java diff --git a/src/de/danoeh/antennapod/util/InvalidFeedException.java b/app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java similarity index 100% rename from src/de/danoeh/antennapod/util/InvalidFeedException.java rename to app/src/main/java/de/danoeh/antennapod/util/InvalidFeedException.java diff --git a/src/de/danoeh/antennapod/util/LangUtils.java b/app/src/main/java/de/danoeh/antennapod/util/LangUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/LangUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/LangUtils.java diff --git a/src/de/danoeh/antennapod/util/NetworkUtils.java b/app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/NetworkUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/NetworkUtils.java diff --git a/src/de/danoeh/antennapod/util/QueueAccess.java b/app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java similarity index 100% rename from src/de/danoeh/antennapod/util/QueueAccess.java rename to app/src/main/java/de/danoeh/antennapod/util/QueueAccess.java diff --git a/src/de/danoeh/antennapod/util/ShareUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/ShareUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/ShareUtils.java diff --git a/src/de/danoeh/antennapod/util/ShownotesProvider.java b/app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java similarity index 100% rename from src/de/danoeh/antennapod/util/ShownotesProvider.java rename to app/src/main/java/de/danoeh/antennapod/util/ShownotesProvider.java diff --git a/src/de/danoeh/antennapod/util/StorageUtils.java b/app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/StorageUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/StorageUtils.java diff --git a/src/de/danoeh/antennapod/util/ThemeUtils.java b/app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/ThemeUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/ThemeUtils.java diff --git a/src/de/danoeh/antennapod/util/URIUtil.java b/app/src/main/java/de/danoeh/antennapod/util/URIUtil.java similarity index 100% rename from src/de/danoeh/antennapod/util/URIUtil.java rename to app/src/main/java/de/danoeh/antennapod/util/URIUtil.java diff --git a/src/de/danoeh/antennapod/util/URLChecker.java b/app/src/main/java/de/danoeh/antennapod/util/URLChecker.java similarity index 100% rename from src/de/danoeh/antennapod/util/URLChecker.java rename to app/src/main/java/de/danoeh/antennapod/util/URLChecker.java diff --git a/src/de/danoeh/antennapod/util/UndoBarController.java b/app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java similarity index 100% rename from src/de/danoeh/antennapod/util/UndoBarController.java rename to app/src/main/java/de/danoeh/antennapod/util/UndoBarController.java diff --git a/src/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/comparator/ChapterStartTimeComparator.java diff --git a/src/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/comparator/DownloadStatusComparator.java diff --git a/src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/comparator/FeedItemPubdateComparator.java diff --git a/src/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/comparator/PlaybackCompletionDateComparator.java diff --git a/src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java b/app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java similarity index 100% rename from src/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java rename to app/src/main/java/de/danoeh/antennapod/util/comparator/SearchResultValueComparator.java diff --git a/src/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java b/app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java similarity index 100% rename from src/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java rename to app/src/main/java/de/danoeh/antennapod/util/exception/MediaFileNotFoundException.java diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java similarity index 100% rename from src/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java rename to app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrServiceCreator.java diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrStatus.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java similarity index 100% rename from src/de/danoeh/antennapod/util/flattr/FlattrStatus.java rename to app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrStatus.java diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrThing.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java similarity index 100% rename from src/de/danoeh/antennapod/util/flattr/FlattrThing.java rename to app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrThing.java diff --git a/src/de/danoeh/antennapod/util/flattr/FlattrUtils.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/flattr/FlattrUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/flattr/FlattrUtils.java diff --git a/src/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java b/app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java similarity index 100% rename from src/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java rename to app/src/main/java/de/danoeh/antennapod/util/flattr/SimpleFlattrThing.java diff --git a/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java b/app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java similarity index 100% rename from src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java rename to app/src/main/java/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java diff --git a/src/de/danoeh/antennapod/util/id3reader/ChapterReader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/ChapterReader.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/ChapterReader.java diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/ID3Reader.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3Reader.java diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/ID3ReaderException.java diff --git a/src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/model/FrameHeader.java diff --git a/src/de/danoeh/antennapod/util/id3reader/model/Header.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/model/Header.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/model/Header.java diff --git a/src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java b/app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java similarity index 100% rename from src/de/danoeh/antennapod/util/id3reader/model/TagHeader.java rename to app/src/main/java/de/danoeh/antennapod/util/id3reader/model/TagHeader.java diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java similarity index 100% rename from src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java rename to app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java similarity index 100% rename from src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java rename to app/src/main/java/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java diff --git a/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java similarity index 100% rename from src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java rename to app/src/main/java/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java diff --git a/src/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java b/app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java similarity index 100% rename from src/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java rename to app/src/main/java/de/danoeh/antennapod/util/menuhandler/NavDrawerActivity.java diff --git a/src/de/danoeh/antennapod/util/playback/AudioPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/AudioPlayer.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/AudioPlayer.java diff --git a/src/de/danoeh/antennapod/util/playback/ExternalMedia.java b/app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/ExternalMedia.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/ExternalMedia.java diff --git a/src/de/danoeh/antennapod/util/playback/IPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/IPlayer.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/IPlayer.java diff --git a/src/de/danoeh/antennapod/util/playback/MediaPlayerError.java b/app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/MediaPlayerError.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/MediaPlayerError.java diff --git a/src/de/danoeh/antennapod/util/playback/Playable.java b/app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/Playable.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/Playable.java diff --git a/src/de/danoeh/antennapod/util/playback/PlaybackController.java b/app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/PlaybackController.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/PlaybackController.java diff --git a/src/de/danoeh/antennapod/util/playback/Timeline.java b/app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/Timeline.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/Timeline.java diff --git a/src/de/danoeh/antennapod/util/playback/VideoPlayer.java b/app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java similarity index 100% rename from src/de/danoeh/antennapod/util/playback/VideoPlayer.java rename to app/src/main/java/de/danoeh/antennapod/util/playback/VideoPlayer.java diff --git a/src/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java b/app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java similarity index 100% rename from src/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java rename to app/src/main/java/de/danoeh/antennapod/util/syndication/FeedDiscoverer.java diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java similarity index 100% rename from src/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java rename to app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/OggInputStream.java diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java similarity index 100% rename from src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java rename to app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentChapterReader.java diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java similarity index 100% rename from src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java rename to app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentHeader.java diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java similarity index 100% rename from src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java rename to app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReader.java diff --git a/src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java b/app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java similarity index 100% rename from src/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java rename to app/src/main/java/de/danoeh/antennapod/util/vorbiscommentreader/VorbisCommentReaderException.java diff --git a/src/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java similarity index 100% rename from src/de/danoeh/antennapod/view/AspectRatioVideoView.java rename to app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java diff --git a/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml similarity index 100% rename from res/anim/fade_in.xml rename to app/src/main/res/anim/fade_in.xml diff --git a/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml similarity index 100% rename from res/anim/fade_out.xml rename to app/src/main/res/anim/fade_out.xml diff --git a/res/drawable-hdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_antenna.png similarity index 100% rename from res/drawable-hdpi-v11/ic_stat_antenna.png rename to app/src/main/res/drawable-hdpi-v11/ic_stat_antenna.png diff --git a/res/drawable-hdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png similarity index 100% rename from res/drawable-hdpi-v11/ic_stat_authentication.png rename to app/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png diff --git a/res/drawable-hdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync.png similarity index 100% rename from res/drawable-hdpi-v11/stat_notify_sync.png rename to app/src/main/res/drawable-hdpi-v11/stat_notify_sync.png diff --git a/res/drawable-hdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-hdpi-v11/stat_notify_sync_error.png similarity index 100% rename from res/drawable-hdpi-v11/stat_notify_sync_error.png rename to app/src/main/res/drawable-hdpi-v11/stat_notify_sync_error.png diff --git a/res/drawable-hdpi/action_about.png b/app/src/main/res/drawable-hdpi/action_about.png similarity index 100% rename from res/drawable-hdpi/action_about.png rename to app/src/main/res/drawable-hdpi/action_about.png diff --git a/res/drawable-hdpi/action_about_dark.png b/app/src/main/res/drawable-hdpi/action_about_dark.png similarity index 100% rename from res/drawable-hdpi/action_about_dark.png rename to app/src/main/res/drawable-hdpi/action_about_dark.png diff --git a/res/drawable-hdpi/action_search.png b/app/src/main/res/drawable-hdpi/action_search.png similarity index 100% rename from res/drawable-hdpi/action_search.png rename to app/src/main/res/drawable-hdpi/action_search.png diff --git a/res/drawable-hdpi/action_search_dark.png b/app/src/main/res/drawable-hdpi/action_search_dark.png similarity index 100% rename from res/drawable-hdpi/action_search_dark.png rename to app/src/main/res/drawable-hdpi/action_search_dark.png diff --git a/res/drawable-hdpi/action_settings.png b/app/src/main/res/drawable-hdpi/action_settings.png similarity index 100% rename from res/drawable-hdpi/action_settings.png rename to app/src/main/res/drawable-hdpi/action_settings.png diff --git a/res/drawable-hdpi/action_settings_dark.png b/app/src/main/res/drawable-hdpi/action_settings_dark.png similarity index 100% rename from res/drawable-hdpi/action_settings_dark.png rename to app/src/main/res/drawable-hdpi/action_settings_dark.png diff --git a/res/drawable-hdpi/action_stream.png b/app/src/main/res/drawable-hdpi/action_stream.png similarity index 100% rename from res/drawable-hdpi/action_stream.png rename to app/src/main/res/drawable-hdpi/action_stream.png diff --git a/res/drawable-hdpi/action_stream_dark.png b/app/src/main/res/drawable-hdpi/action_stream_dark.png similarity index 100% rename from res/drawable-hdpi/action_stream_dark.png rename to app/src/main/res/drawable-hdpi/action_stream_dark.png diff --git a/res/drawable-hdpi/av_download.png b/app/src/main/res/drawable-hdpi/av_download.png similarity index 100% rename from res/drawable-hdpi/av_download.png rename to app/src/main/res/drawable-hdpi/av_download.png diff --git a/res/drawable-hdpi/av_download_dark.png b/app/src/main/res/drawable-hdpi/av_download_dark.png similarity index 100% rename from res/drawable-hdpi/av_download_dark.png rename to app/src/main/res/drawable-hdpi/av_download_dark.png diff --git a/res/drawable-hdpi/av_fast_forward.png b/app/src/main/res/drawable-hdpi/av_fast_forward.png similarity index 100% rename from res/drawable-hdpi/av_fast_forward.png rename to app/src/main/res/drawable-hdpi/av_fast_forward.png diff --git a/res/drawable-hdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-hdpi/av_fast_forward_dark.png similarity index 100% rename from res/drawable-hdpi/av_fast_forward_dark.png rename to app/src/main/res/drawable-hdpi/av_fast_forward_dark.png diff --git a/res/drawable-hdpi/av_pause.png b/app/src/main/res/drawable-hdpi/av_pause.png similarity index 100% rename from res/drawable-hdpi/av_pause.png rename to app/src/main/res/drawable-hdpi/av_pause.png diff --git a/res/drawable-hdpi/av_pause_dark.png b/app/src/main/res/drawable-hdpi/av_pause_dark.png similarity index 100% rename from res/drawable-hdpi/av_pause_dark.png rename to app/src/main/res/drawable-hdpi/av_pause_dark.png diff --git a/res/drawable-hdpi/av_play.png b/app/src/main/res/drawable-hdpi/av_play.png similarity index 100% rename from res/drawable-hdpi/av_play.png rename to app/src/main/res/drawable-hdpi/av_play.png diff --git a/res/drawable-hdpi/av_play_dark.png b/app/src/main/res/drawable-hdpi/av_play_dark.png similarity index 100% rename from res/drawable-hdpi/av_play_dark.png rename to app/src/main/res/drawable-hdpi/av_play_dark.png diff --git a/res/drawable-hdpi/av_rewind.png b/app/src/main/res/drawable-hdpi/av_rewind.png similarity index 100% rename from res/drawable-hdpi/av_rewind.png rename to app/src/main/res/drawable-hdpi/av_rewind.png diff --git a/res/drawable-hdpi/av_rewind_dark.png b/app/src/main/res/drawable-hdpi/av_rewind_dark.png similarity index 100% rename from res/drawable-hdpi/av_rewind_dark.png rename to app/src/main/res/drawable-hdpi/av_rewind_dark.png diff --git a/res/drawable-hdpi/content_discard.png b/app/src/main/res/drawable-hdpi/content_discard.png similarity index 100% rename from res/drawable-hdpi/content_discard.png rename to app/src/main/res/drawable-hdpi/content_discard.png diff --git a/res/drawable-hdpi/content_discard_dark.png b/app/src/main/res/drawable-hdpi/content_discard_dark.png similarity index 100% rename from res/drawable-hdpi/content_discard_dark.png rename to app/src/main/res/drawable-hdpi/content_discard_dark.png diff --git a/res/drawable-hdpi/content_new.png b/app/src/main/res/drawable-hdpi/content_new.png similarity index 100% rename from res/drawable-hdpi/content_new.png rename to app/src/main/res/drawable-hdpi/content_new.png diff --git a/res/drawable-hdpi/content_new_dark.png b/app/src/main/res/drawable-hdpi/content_new_dark.png similarity index 100% rename from res/drawable-hdpi/content_new_dark.png rename to app/src/main/res/drawable-hdpi/content_new_dark.png diff --git a/res/drawable-hdpi/default_cover.png b/app/src/main/res/drawable-hdpi/default_cover.png similarity index 100% rename from res/drawable-hdpi/default_cover.png rename to app/src/main/res/drawable-hdpi/default_cover.png diff --git a/res/drawable-hdpi/default_cover_dark.png b/app/src/main/res/drawable-hdpi/default_cover_dark.png similarity index 100% rename from res/drawable-hdpi/default_cover_dark.png rename to app/src/main/res/drawable-hdpi/default_cover_dark.png diff --git a/res/drawable-hdpi/device_access_time.png b/app/src/main/res/drawable-hdpi/device_access_time.png similarity index 100% rename from res/drawable-hdpi/device_access_time.png rename to app/src/main/res/drawable-hdpi/device_access_time.png diff --git a/res/drawable-hdpi/device_access_time_dark.png b/app/src/main/res/drawable-hdpi/device_access_time_dark.png similarity index 100% rename from res/drawable-hdpi/device_access_time_dark.png rename to app/src/main/res/drawable-hdpi/device_access_time_dark.png diff --git a/res/drawable-hdpi/ic_action_overflow.png b/app/src/main/res/drawable-hdpi/ic_action_overflow.png similarity index 100% rename from res/drawable-hdpi/ic_action_overflow.png rename to app/src/main/res/drawable-hdpi/ic_action_overflow.png diff --git a/res/drawable-hdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-hdpi/ic_action_overflow_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_overflow_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_overflow_dark.png diff --git a/res/drawable-hdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png similarity index 100% rename from res/drawable-hdpi/ic_action_pause_over_video.png rename to app/src/main/res/drawable-hdpi/ic_action_pause_over_video.png diff --git a/res/drawable-hdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-hdpi/ic_action_play_over_video.png similarity index 100% rename from res/drawable-hdpi/ic_action_play_over_video.png rename to app/src/main/res/drawable-hdpi/ic_action_play_over_video.png diff --git a/res/drawable-hdpi/ic_drag_handle.png b/app/src/main/res/drawable-hdpi/ic_drag_handle.png similarity index 100% rename from res/drawable-hdpi/ic_drag_handle.png rename to app/src/main/res/drawable-hdpi/ic_drag_handle.png diff --git a/res/drawable-hdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-hdpi/ic_drag_handle_dark.png similarity index 100% rename from res/drawable-hdpi/ic_drag_handle_dark.png rename to app/src/main/res/drawable-hdpi/ic_drag_handle_dark.png diff --git a/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from res/drawable-hdpi/ic_drawer.png rename to app/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/res/drawable-hdpi/ic_drawer_dark.png b/app/src/main/res/drawable-hdpi/ic_drawer_dark.png similarity index 100% rename from res/drawable-hdpi/ic_drawer_dark.png rename to app/src/main/res/drawable-hdpi/ic_drawer_dark.png diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_new.png b/app/src/main/res/drawable-hdpi/ic_new.png similarity index 100% rename from res/drawable-hdpi/ic_new.png rename to app/src/main/res/drawable-hdpi/ic_new.png diff --git a/res/drawable-hdpi/ic_new_dark.png b/app/src/main/res/drawable-hdpi/ic_new_dark.png similarity index 100% rename from res/drawable-hdpi/ic_new_dark.png rename to app/src/main/res/drawable-hdpi/ic_new_dark.png diff --git a/res/drawable-hdpi/ic_stat_antenna.png b/app/src/main/res/drawable-hdpi/ic_stat_antenna.png similarity index 100% rename from res/drawable-hdpi/ic_stat_antenna.png rename to app/src/main/res/drawable-hdpi/ic_stat_antenna.png diff --git a/res/drawable-hdpi/ic_stat_authentication.png b/app/src/main/res/drawable-hdpi/ic_stat_authentication.png similarity index 100% rename from res/drawable-hdpi/ic_stat_authentication.png rename to app/src/main/res/drawable-hdpi/ic_stat_authentication.png diff --git a/res/drawable-hdpi/location_web_site.png b/app/src/main/res/drawable-hdpi/location_web_site.png similarity index 100% rename from res/drawable-hdpi/location_web_site.png rename to app/src/main/res/drawable-hdpi/location_web_site.png diff --git a/res/drawable-hdpi/location_web_site_dark.png b/app/src/main/res/drawable-hdpi/location_web_site_dark.png similarity index 100% rename from res/drawable-hdpi/location_web_site_dark.png rename to app/src/main/res/drawable-hdpi/location_web_site_dark.png diff --git a/res/drawable-hdpi/navigation_accept.png b/app/src/main/res/drawable-hdpi/navigation_accept.png similarity index 100% rename from res/drawable-hdpi/navigation_accept.png rename to app/src/main/res/drawable-hdpi/navigation_accept.png diff --git a/res/drawable-hdpi/navigation_accept_dark.png b/app/src/main/res/drawable-hdpi/navigation_accept_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_accept_dark.png rename to app/src/main/res/drawable-hdpi/navigation_accept_dark.png diff --git a/res/drawable-hdpi/navigation_cancel.png b/app/src/main/res/drawable-hdpi/navigation_cancel.png similarity index 100% rename from res/drawable-hdpi/navigation_cancel.png rename to app/src/main/res/drawable-hdpi/navigation_cancel.png diff --git a/res/drawable-hdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-hdpi/navigation_cancel_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_cancel_dark.png rename to app/src/main/res/drawable-hdpi/navigation_cancel_dark.png diff --git a/res/drawable-hdpi/navigation_chapters.png b/app/src/main/res/drawable-hdpi/navigation_chapters.png similarity index 100% rename from res/drawable-hdpi/navigation_chapters.png rename to app/src/main/res/drawable-hdpi/navigation_chapters.png diff --git a/res/drawable-hdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-hdpi/navigation_chapters_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_chapters_dark.png rename to app/src/main/res/drawable-hdpi/navigation_chapters_dark.png diff --git a/res/drawable-hdpi/navigation_collapse.png b/app/src/main/res/drawable-hdpi/navigation_collapse.png similarity index 100% rename from res/drawable-hdpi/navigation_collapse.png rename to app/src/main/res/drawable-hdpi/navigation_collapse.png diff --git a/res/drawable-hdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-hdpi/navigation_collapse_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_collapse_dark.png rename to app/src/main/res/drawable-hdpi/navigation_collapse_dark.png diff --git a/res/drawable-hdpi/navigation_expand.png b/app/src/main/res/drawable-hdpi/navigation_expand.png similarity index 100% rename from res/drawable-hdpi/navigation_expand.png rename to app/src/main/res/drawable-hdpi/navigation_expand.png diff --git a/res/drawable-hdpi/navigation_expand_dark.png b/app/src/main/res/drawable-hdpi/navigation_expand_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_expand_dark.png rename to app/src/main/res/drawable-hdpi/navigation_expand_dark.png diff --git a/res/drawable-hdpi/navigation_refresh.png b/app/src/main/res/drawable-hdpi/navigation_refresh.png similarity index 100% rename from res/drawable-hdpi/navigation_refresh.png rename to app/src/main/res/drawable-hdpi/navigation_refresh.png diff --git a/res/drawable-hdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-hdpi/navigation_refresh_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_refresh_dark.png rename to app/src/main/res/drawable-hdpi/navigation_refresh_dark.png diff --git a/res/drawable-hdpi/navigation_shownotes.png b/app/src/main/res/drawable-hdpi/navigation_shownotes.png similarity index 100% rename from res/drawable-hdpi/navigation_shownotes.png rename to app/src/main/res/drawable-hdpi/navigation_shownotes.png diff --git a/res/drawable-hdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-hdpi/navigation_shownotes_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_shownotes_dark.png rename to app/src/main/res/drawable-hdpi/navigation_shownotes_dark.png diff --git a/res/drawable-hdpi/navigation_up.png b/app/src/main/res/drawable-hdpi/navigation_up.png similarity index 100% rename from res/drawable-hdpi/navigation_up.png rename to app/src/main/res/drawable-hdpi/navigation_up.png diff --git a/res/drawable-hdpi/navigation_up_dark.png b/app/src/main/res/drawable-hdpi/navigation_up_dark.png similarity index 100% rename from res/drawable-hdpi/navigation_up_dark.png rename to app/src/main/res/drawable-hdpi/navigation_up_dark.png diff --git a/res/drawable-hdpi/social_share.png b/app/src/main/res/drawable-hdpi/social_share.png similarity index 100% rename from res/drawable-hdpi/social_share.png rename to app/src/main/res/drawable-hdpi/social_share.png diff --git a/res/drawable-hdpi/social_share_dark.png b/app/src/main/res/drawable-hdpi/social_share_dark.png similarity index 100% rename from res/drawable-hdpi/social_share_dark.png rename to app/src/main/res/drawable-hdpi/social_share_dark.png diff --git a/res/drawable-hdpi/spinner_button.9.png b/app/src/main/res/drawable-hdpi/spinner_button.9.png similarity index 100% rename from res/drawable-hdpi/spinner_button.9.png rename to app/src/main/res/drawable-hdpi/spinner_button.9.png diff --git a/res/drawable-hdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-hdpi/spinner_button_dark.9.png similarity index 100% rename from res/drawable-hdpi/spinner_button_dark.9.png rename to app/src/main/res/drawable-hdpi/spinner_button_dark.9.png diff --git a/res/drawable-hdpi/stat_notify_sync.png b/app/src/main/res/drawable-hdpi/stat_notify_sync.png similarity index 100% rename from res/drawable-hdpi/stat_notify_sync.png rename to app/src/main/res/drawable-hdpi/stat_notify_sync.png diff --git a/res/drawable-hdpi/stat_notify_sync_error.png b/app/src/main/res/drawable-hdpi/stat_notify_sync_error.png similarity index 100% rename from res/drawable-hdpi/stat_notify_sync_error.png rename to app/src/main/res/drawable-hdpi/stat_notify_sync_error.png diff --git a/res/drawable-hdpi/stat_playlist.png b/app/src/main/res/drawable-hdpi/stat_playlist.png similarity index 100% rename from res/drawable-hdpi/stat_playlist.png rename to app/src/main/res/drawable-hdpi/stat_playlist.png diff --git a/res/drawable-hdpi/stat_playlist_dark.png b/app/src/main/res/drawable-hdpi/stat_playlist_dark.png similarity index 100% rename from res/drawable-hdpi/stat_playlist_dark.png rename to app/src/main/res/drawable-hdpi/stat_playlist_dark.png diff --git a/res/drawable-hdpi/type_audio.png b/app/src/main/res/drawable-hdpi/type_audio.png similarity index 100% rename from res/drawable-hdpi/type_audio.png rename to app/src/main/res/drawable-hdpi/type_audio.png diff --git a/res/drawable-hdpi/type_audio_dark.png b/app/src/main/res/drawable-hdpi/type_audio_dark.png similarity index 100% rename from res/drawable-hdpi/type_audio_dark.png rename to app/src/main/res/drawable-hdpi/type_audio_dark.png diff --git a/res/drawable-hdpi/type_video.png b/app/src/main/res/drawable-hdpi/type_video.png similarity index 100% rename from res/drawable-hdpi/type_video.png rename to app/src/main/res/drawable-hdpi/type_video.png diff --git a/res/drawable-hdpi/type_video_dark.png b/app/src/main/res/drawable-hdpi/type_video_dark.png similarity index 100% rename from res/drawable-hdpi/type_video_dark.png rename to app/src/main/res/drawable-hdpi/type_video_dark.png diff --git a/res/drawable-ldpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_antenna.png similarity index 100% rename from res/drawable-ldpi-v11/ic_stat_antenna.png rename to app/src/main/res/drawable-ldpi-v11/ic_stat_antenna.png diff --git a/res/drawable-ldpi/action_stream.png b/app/src/main/res/drawable-ldpi/action_stream.png similarity index 100% rename from res/drawable-ldpi/action_stream.png rename to app/src/main/res/drawable-ldpi/action_stream.png diff --git a/res/drawable-ldpi/action_stream_dark.png b/app/src/main/res/drawable-ldpi/action_stream_dark.png similarity index 100% rename from res/drawable-ldpi/action_stream_dark.png rename to app/src/main/res/drawable-ldpi/action_stream_dark.png diff --git a/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from res/drawable-ldpi/ic_launcher.png rename to app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-ldpi/ic_stat_antenna.png b/app/src/main/res/drawable-ldpi/ic_stat_antenna.png similarity index 100% rename from res/drawable-ldpi/ic_stat_antenna.png rename to app/src/main/res/drawable-ldpi/ic_stat_antenna.png diff --git a/res/drawable-ldpi/stat_playlist.png b/app/src/main/res/drawable-ldpi/stat_playlist.png similarity index 100% rename from res/drawable-ldpi/stat_playlist.png rename to app/src/main/res/drawable-ldpi/stat_playlist.png diff --git a/res/drawable-ldpi/stat_playlist_dark.png b/app/src/main/res/drawable-ldpi/stat_playlist_dark.png similarity index 100% rename from res/drawable-ldpi/stat_playlist_dark.png rename to app/src/main/res/drawable-ldpi/stat_playlist_dark.png diff --git a/res/drawable-mdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_antenna.png similarity index 100% rename from res/drawable-mdpi-v11/ic_stat_antenna.png rename to app/src/main/res/drawable-mdpi-v11/ic_stat_antenna.png diff --git a/res/drawable-mdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png similarity index 100% rename from res/drawable-mdpi-v11/ic_stat_authentication.png rename to app/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png diff --git a/res/drawable-mdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync.png similarity index 100% rename from res/drawable-mdpi-v11/stat_notify_sync.png rename to app/src/main/res/drawable-mdpi-v11/stat_notify_sync.png diff --git a/res/drawable-mdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-mdpi-v11/stat_notify_sync_error.png similarity index 100% rename from res/drawable-mdpi-v11/stat_notify_sync_error.png rename to app/src/main/res/drawable-mdpi-v11/stat_notify_sync_error.png diff --git a/res/drawable-mdpi/action_about.png b/app/src/main/res/drawable-mdpi/action_about.png similarity index 100% rename from res/drawable-mdpi/action_about.png rename to app/src/main/res/drawable-mdpi/action_about.png diff --git a/res/drawable-mdpi/action_about_dark.png b/app/src/main/res/drawable-mdpi/action_about_dark.png similarity index 100% rename from res/drawable-mdpi/action_about_dark.png rename to app/src/main/res/drawable-mdpi/action_about_dark.png diff --git a/res/drawable-mdpi/action_search.png b/app/src/main/res/drawable-mdpi/action_search.png similarity index 100% rename from res/drawable-mdpi/action_search.png rename to app/src/main/res/drawable-mdpi/action_search.png diff --git a/res/drawable-mdpi/action_search_dark.png b/app/src/main/res/drawable-mdpi/action_search_dark.png similarity index 100% rename from res/drawable-mdpi/action_search_dark.png rename to app/src/main/res/drawable-mdpi/action_search_dark.png diff --git a/res/drawable-mdpi/action_settings.png b/app/src/main/res/drawable-mdpi/action_settings.png similarity index 100% rename from res/drawable-mdpi/action_settings.png rename to app/src/main/res/drawable-mdpi/action_settings.png diff --git a/res/drawable-mdpi/action_settings_dark.png b/app/src/main/res/drawable-mdpi/action_settings_dark.png similarity index 100% rename from res/drawable-mdpi/action_settings_dark.png rename to app/src/main/res/drawable-mdpi/action_settings_dark.png diff --git a/res/drawable-mdpi/action_stream.png b/app/src/main/res/drawable-mdpi/action_stream.png similarity index 100% rename from res/drawable-mdpi/action_stream.png rename to app/src/main/res/drawable-mdpi/action_stream.png diff --git a/res/drawable-mdpi/action_stream_dark.png b/app/src/main/res/drawable-mdpi/action_stream_dark.png similarity index 100% rename from res/drawable-mdpi/action_stream_dark.png rename to app/src/main/res/drawable-mdpi/action_stream_dark.png diff --git a/res/drawable-mdpi/av_download.png b/app/src/main/res/drawable-mdpi/av_download.png similarity index 100% rename from res/drawable-mdpi/av_download.png rename to app/src/main/res/drawable-mdpi/av_download.png diff --git a/res/drawable-mdpi/av_download_dark.png b/app/src/main/res/drawable-mdpi/av_download_dark.png similarity index 100% rename from res/drawable-mdpi/av_download_dark.png rename to app/src/main/res/drawable-mdpi/av_download_dark.png diff --git a/res/drawable-mdpi/av_fast_forward.png b/app/src/main/res/drawable-mdpi/av_fast_forward.png similarity index 100% rename from res/drawable-mdpi/av_fast_forward.png rename to app/src/main/res/drawable-mdpi/av_fast_forward.png diff --git a/res/drawable-mdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-mdpi/av_fast_forward_dark.png similarity index 100% rename from res/drawable-mdpi/av_fast_forward_dark.png rename to app/src/main/res/drawable-mdpi/av_fast_forward_dark.png diff --git a/res/drawable-mdpi/av_pause.png b/app/src/main/res/drawable-mdpi/av_pause.png similarity index 100% rename from res/drawable-mdpi/av_pause.png rename to app/src/main/res/drawable-mdpi/av_pause.png diff --git a/res/drawable-mdpi/av_pause_dark.png b/app/src/main/res/drawable-mdpi/av_pause_dark.png similarity index 100% rename from res/drawable-mdpi/av_pause_dark.png rename to app/src/main/res/drawable-mdpi/av_pause_dark.png diff --git a/res/drawable-mdpi/av_play.png b/app/src/main/res/drawable-mdpi/av_play.png similarity index 100% rename from res/drawable-mdpi/av_play.png rename to app/src/main/res/drawable-mdpi/av_play.png diff --git a/res/drawable-mdpi/av_play_dark.png b/app/src/main/res/drawable-mdpi/av_play_dark.png similarity index 100% rename from res/drawable-mdpi/av_play_dark.png rename to app/src/main/res/drawable-mdpi/av_play_dark.png diff --git a/res/drawable-mdpi/av_rewind.png b/app/src/main/res/drawable-mdpi/av_rewind.png similarity index 100% rename from res/drawable-mdpi/av_rewind.png rename to app/src/main/res/drawable-mdpi/av_rewind.png diff --git a/res/drawable-mdpi/av_rewind_dark.png b/app/src/main/res/drawable-mdpi/av_rewind_dark.png similarity index 100% rename from res/drawable-mdpi/av_rewind_dark.png rename to app/src/main/res/drawable-mdpi/av_rewind_dark.png diff --git a/res/drawable-mdpi/content_discard.png b/app/src/main/res/drawable-mdpi/content_discard.png similarity index 100% rename from res/drawable-mdpi/content_discard.png rename to app/src/main/res/drawable-mdpi/content_discard.png diff --git a/res/drawable-mdpi/content_discard_dark.png b/app/src/main/res/drawable-mdpi/content_discard_dark.png similarity index 100% rename from res/drawable-mdpi/content_discard_dark.png rename to app/src/main/res/drawable-mdpi/content_discard_dark.png diff --git a/res/drawable-mdpi/content_new.png b/app/src/main/res/drawable-mdpi/content_new.png similarity index 100% rename from res/drawable-mdpi/content_new.png rename to app/src/main/res/drawable-mdpi/content_new.png diff --git a/res/drawable-mdpi/content_new_dark.png b/app/src/main/res/drawable-mdpi/content_new_dark.png similarity index 100% rename from res/drawable-mdpi/content_new_dark.png rename to app/src/main/res/drawable-mdpi/content_new_dark.png diff --git a/res/drawable-mdpi/default_cover.png b/app/src/main/res/drawable-mdpi/default_cover.png similarity index 100% rename from res/drawable-mdpi/default_cover.png rename to app/src/main/res/drawable-mdpi/default_cover.png diff --git a/res/drawable-mdpi/default_cover_dark.png b/app/src/main/res/drawable-mdpi/default_cover_dark.png similarity index 100% rename from res/drawable-mdpi/default_cover_dark.png rename to app/src/main/res/drawable-mdpi/default_cover_dark.png diff --git a/res/drawable-mdpi/device_access_time.png b/app/src/main/res/drawable-mdpi/device_access_time.png similarity index 100% rename from res/drawable-mdpi/device_access_time.png rename to app/src/main/res/drawable-mdpi/device_access_time.png diff --git a/res/drawable-mdpi/device_access_time_dark.png b/app/src/main/res/drawable-mdpi/device_access_time_dark.png similarity index 100% rename from res/drawable-mdpi/device_access_time_dark.png rename to app/src/main/res/drawable-mdpi/device_access_time_dark.png diff --git a/res/drawable-mdpi/ic_action_overflow.png b/app/src/main/res/drawable-mdpi/ic_action_overflow.png similarity index 100% rename from res/drawable-mdpi/ic_action_overflow.png rename to app/src/main/res/drawable-mdpi/ic_action_overflow.png diff --git a/res/drawable-mdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-mdpi/ic_action_overflow_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_overflow_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_overflow_dark.png diff --git a/res/drawable-mdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png similarity index 100% rename from res/drawable-mdpi/ic_action_pause_over_video.png rename to app/src/main/res/drawable-mdpi/ic_action_pause_over_video.png diff --git a/res/drawable-mdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-mdpi/ic_action_play_over_video.png similarity index 100% rename from res/drawable-mdpi/ic_action_play_over_video.png rename to app/src/main/res/drawable-mdpi/ic_action_play_over_video.png diff --git a/res/drawable-mdpi/ic_drag_handle.png b/app/src/main/res/drawable-mdpi/ic_drag_handle.png similarity index 100% rename from res/drawable-mdpi/ic_drag_handle.png rename to app/src/main/res/drawable-mdpi/ic_drag_handle.png diff --git a/res/drawable-mdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-mdpi/ic_drag_handle_dark.png similarity index 100% rename from res/drawable-mdpi/ic_drag_handle_dark.png rename to app/src/main/res/drawable-mdpi/ic_drag_handle_dark.png diff --git a/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from res/drawable-mdpi/ic_drawer.png rename to app/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/res/drawable-mdpi/ic_drawer_dark.png b/app/src/main/res/drawable-mdpi/ic_drawer_dark.png similarity index 100% rename from res/drawable-mdpi/ic_drawer_dark.png rename to app/src/main/res/drawable-mdpi/ic_drawer_dark.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_new.png b/app/src/main/res/drawable-mdpi/ic_new.png similarity index 100% rename from res/drawable-mdpi/ic_new.png rename to app/src/main/res/drawable-mdpi/ic_new.png diff --git a/res/drawable-mdpi/ic_new_dark.png b/app/src/main/res/drawable-mdpi/ic_new_dark.png similarity index 100% rename from res/drawable-mdpi/ic_new_dark.png rename to app/src/main/res/drawable-mdpi/ic_new_dark.png diff --git a/res/drawable-mdpi/ic_stat_antenna.png b/app/src/main/res/drawable-mdpi/ic_stat_antenna.png similarity index 100% rename from res/drawable-mdpi/ic_stat_antenna.png rename to app/src/main/res/drawable-mdpi/ic_stat_antenna.png diff --git a/res/drawable-mdpi/ic_stat_authentication.png b/app/src/main/res/drawable-mdpi/ic_stat_authentication.png similarity index 100% rename from res/drawable-mdpi/ic_stat_authentication.png rename to app/src/main/res/drawable-mdpi/ic_stat_authentication.png diff --git a/res/drawable-mdpi/location_web_site.png b/app/src/main/res/drawable-mdpi/location_web_site.png similarity index 100% rename from res/drawable-mdpi/location_web_site.png rename to app/src/main/res/drawable-mdpi/location_web_site.png diff --git a/res/drawable-mdpi/location_web_site_dark.png b/app/src/main/res/drawable-mdpi/location_web_site_dark.png similarity index 100% rename from res/drawable-mdpi/location_web_site_dark.png rename to app/src/main/res/drawable-mdpi/location_web_site_dark.png diff --git a/res/drawable-mdpi/navigation_accept.png b/app/src/main/res/drawable-mdpi/navigation_accept.png similarity index 100% rename from res/drawable-mdpi/navigation_accept.png rename to app/src/main/res/drawable-mdpi/navigation_accept.png diff --git a/res/drawable-mdpi/navigation_accept_dark.png b/app/src/main/res/drawable-mdpi/navigation_accept_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_accept_dark.png rename to app/src/main/res/drawable-mdpi/navigation_accept_dark.png diff --git a/res/drawable-mdpi/navigation_cancel.png b/app/src/main/res/drawable-mdpi/navigation_cancel.png similarity index 100% rename from res/drawable-mdpi/navigation_cancel.png rename to app/src/main/res/drawable-mdpi/navigation_cancel.png diff --git a/res/drawable-mdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-mdpi/navigation_cancel_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_cancel_dark.png rename to app/src/main/res/drawable-mdpi/navigation_cancel_dark.png diff --git a/res/drawable-mdpi/navigation_chapters.png b/app/src/main/res/drawable-mdpi/navigation_chapters.png similarity index 100% rename from res/drawable-mdpi/navigation_chapters.png rename to app/src/main/res/drawable-mdpi/navigation_chapters.png diff --git a/res/drawable-mdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-mdpi/navigation_chapters_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_chapters_dark.png rename to app/src/main/res/drawable-mdpi/navigation_chapters_dark.png diff --git a/res/drawable-mdpi/navigation_collapse.png b/app/src/main/res/drawable-mdpi/navigation_collapse.png similarity index 100% rename from res/drawable-mdpi/navigation_collapse.png rename to app/src/main/res/drawable-mdpi/navigation_collapse.png diff --git a/res/drawable-mdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-mdpi/navigation_collapse_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_collapse_dark.png rename to app/src/main/res/drawable-mdpi/navigation_collapse_dark.png diff --git a/res/drawable-mdpi/navigation_expand.png b/app/src/main/res/drawable-mdpi/navigation_expand.png similarity index 100% rename from res/drawable-mdpi/navigation_expand.png rename to app/src/main/res/drawable-mdpi/navigation_expand.png diff --git a/res/drawable-mdpi/navigation_expand_dark.png b/app/src/main/res/drawable-mdpi/navigation_expand_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_expand_dark.png rename to app/src/main/res/drawable-mdpi/navigation_expand_dark.png diff --git a/res/drawable-mdpi/navigation_refresh.png b/app/src/main/res/drawable-mdpi/navigation_refresh.png similarity index 100% rename from res/drawable-mdpi/navigation_refresh.png rename to app/src/main/res/drawable-mdpi/navigation_refresh.png diff --git a/res/drawable-mdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-mdpi/navigation_refresh_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_refresh_dark.png rename to app/src/main/res/drawable-mdpi/navigation_refresh_dark.png diff --git a/res/drawable-mdpi/navigation_shownotes.png b/app/src/main/res/drawable-mdpi/navigation_shownotes.png similarity index 100% rename from res/drawable-mdpi/navigation_shownotes.png rename to app/src/main/res/drawable-mdpi/navigation_shownotes.png diff --git a/res/drawable-mdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-mdpi/navigation_shownotes_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_shownotes_dark.png rename to app/src/main/res/drawable-mdpi/navigation_shownotes_dark.png diff --git a/res/drawable-mdpi/navigation_up.png b/app/src/main/res/drawable-mdpi/navigation_up.png similarity index 100% rename from res/drawable-mdpi/navigation_up.png rename to app/src/main/res/drawable-mdpi/navigation_up.png diff --git a/res/drawable-mdpi/navigation_up_dark.png b/app/src/main/res/drawable-mdpi/navigation_up_dark.png similarity index 100% rename from res/drawable-mdpi/navigation_up_dark.png rename to app/src/main/res/drawable-mdpi/navigation_up_dark.png diff --git a/res/drawable-mdpi/social_share.png b/app/src/main/res/drawable-mdpi/social_share.png similarity index 100% rename from res/drawable-mdpi/social_share.png rename to app/src/main/res/drawable-mdpi/social_share.png diff --git a/res/drawable-mdpi/social_share_dark.png b/app/src/main/res/drawable-mdpi/social_share_dark.png similarity index 100% rename from res/drawable-mdpi/social_share_dark.png rename to app/src/main/res/drawable-mdpi/social_share_dark.png diff --git a/res/drawable-mdpi/spinner_button.9.png b/app/src/main/res/drawable-mdpi/spinner_button.9.png similarity index 100% rename from res/drawable-mdpi/spinner_button.9.png rename to app/src/main/res/drawable-mdpi/spinner_button.9.png diff --git a/res/drawable-mdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-mdpi/spinner_button_dark.9.png similarity index 100% rename from res/drawable-mdpi/spinner_button_dark.9.png rename to app/src/main/res/drawable-mdpi/spinner_button_dark.9.png diff --git a/res/drawable-mdpi/stat_notify_sync.png b/app/src/main/res/drawable-mdpi/stat_notify_sync.png similarity index 100% rename from res/drawable-mdpi/stat_notify_sync.png rename to app/src/main/res/drawable-mdpi/stat_notify_sync.png diff --git a/res/drawable-mdpi/stat_notify_sync_error.png b/app/src/main/res/drawable-mdpi/stat_notify_sync_error.png similarity index 100% rename from res/drawable-mdpi/stat_notify_sync_error.png rename to app/src/main/res/drawable-mdpi/stat_notify_sync_error.png diff --git a/res/drawable-mdpi/stat_playlist.png b/app/src/main/res/drawable-mdpi/stat_playlist.png similarity index 100% rename from res/drawable-mdpi/stat_playlist.png rename to app/src/main/res/drawable-mdpi/stat_playlist.png diff --git a/res/drawable-mdpi/stat_playlist_dark.png b/app/src/main/res/drawable-mdpi/stat_playlist_dark.png similarity index 100% rename from res/drawable-mdpi/stat_playlist_dark.png rename to app/src/main/res/drawable-mdpi/stat_playlist_dark.png diff --git a/res/drawable-mdpi/type_audio.png b/app/src/main/res/drawable-mdpi/type_audio.png similarity index 100% rename from res/drawable-mdpi/type_audio.png rename to app/src/main/res/drawable-mdpi/type_audio.png diff --git a/res/drawable-mdpi/type_audio_dark.png b/app/src/main/res/drawable-mdpi/type_audio_dark.png similarity index 100% rename from res/drawable-mdpi/type_audio_dark.png rename to app/src/main/res/drawable-mdpi/type_audio_dark.png diff --git a/res/drawable-mdpi/type_video.png b/app/src/main/res/drawable-mdpi/type_video.png similarity index 100% rename from res/drawable-mdpi/type_video.png rename to app/src/main/res/drawable-mdpi/type_video.png diff --git a/res/drawable-mdpi/type_video_dark.png b/app/src/main/res/drawable-mdpi/type_video_dark.png similarity index 100% rename from res/drawable-mdpi/type_video_dark.png rename to app/src/main/res/drawable-mdpi/type_video_dark.png diff --git a/res/drawable-xhdpi-v11/ic_stat_antenna.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_antenna.png similarity index 100% rename from res/drawable-xhdpi-v11/ic_stat_antenna.png rename to app/src/main/res/drawable-xhdpi-v11/ic_stat_antenna.png diff --git a/res/drawable-xhdpi-v11/ic_stat_authentication.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png similarity index 100% rename from res/drawable-xhdpi-v11/ic_stat_authentication.png rename to app/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png diff --git a/res/drawable-xhdpi-v11/stat_notify_sync.png b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync.png similarity index 100% rename from res/drawable-xhdpi-v11/stat_notify_sync.png rename to app/src/main/res/drawable-xhdpi-v11/stat_notify_sync.png diff --git a/res/drawable-xhdpi-v11/stat_notify_sync_error.png b/app/src/main/res/drawable-xhdpi-v11/stat_notify_sync_error.png similarity index 100% rename from res/drawable-xhdpi-v11/stat_notify_sync_error.png rename to app/src/main/res/drawable-xhdpi-v11/stat_notify_sync_error.png diff --git a/res/drawable-xhdpi/action_about.png b/app/src/main/res/drawable-xhdpi/action_about.png similarity index 100% rename from res/drawable-xhdpi/action_about.png rename to app/src/main/res/drawable-xhdpi/action_about.png diff --git a/res/drawable-xhdpi/action_about_dark.png b/app/src/main/res/drawable-xhdpi/action_about_dark.png similarity index 100% rename from res/drawable-xhdpi/action_about_dark.png rename to app/src/main/res/drawable-xhdpi/action_about_dark.png diff --git a/res/drawable-xhdpi/action_search.png b/app/src/main/res/drawable-xhdpi/action_search.png similarity index 100% rename from res/drawable-xhdpi/action_search.png rename to app/src/main/res/drawable-xhdpi/action_search.png diff --git a/res/drawable-xhdpi/action_search_dark.png b/app/src/main/res/drawable-xhdpi/action_search_dark.png similarity index 100% rename from res/drawable-xhdpi/action_search_dark.png rename to app/src/main/res/drawable-xhdpi/action_search_dark.png diff --git a/res/drawable-xhdpi/action_settings.png b/app/src/main/res/drawable-xhdpi/action_settings.png similarity index 100% rename from res/drawable-xhdpi/action_settings.png rename to app/src/main/res/drawable-xhdpi/action_settings.png diff --git a/res/drawable-xhdpi/action_settings_dark.png b/app/src/main/res/drawable-xhdpi/action_settings_dark.png similarity index 100% rename from res/drawable-xhdpi/action_settings_dark.png rename to app/src/main/res/drawable-xhdpi/action_settings_dark.png diff --git a/res/drawable-xhdpi/action_stream.png b/app/src/main/res/drawable-xhdpi/action_stream.png similarity index 100% rename from res/drawable-xhdpi/action_stream.png rename to app/src/main/res/drawable-xhdpi/action_stream.png diff --git a/res/drawable-xhdpi/action_stream_dark.png b/app/src/main/res/drawable-xhdpi/action_stream_dark.png similarity index 100% rename from res/drawable-xhdpi/action_stream_dark.png rename to app/src/main/res/drawable-xhdpi/action_stream_dark.png diff --git a/res/drawable-xhdpi/av_download.png b/app/src/main/res/drawable-xhdpi/av_download.png similarity index 100% rename from res/drawable-xhdpi/av_download.png rename to app/src/main/res/drawable-xhdpi/av_download.png diff --git a/res/drawable-xhdpi/av_download_dark.png b/app/src/main/res/drawable-xhdpi/av_download_dark.png similarity index 100% rename from res/drawable-xhdpi/av_download_dark.png rename to app/src/main/res/drawable-xhdpi/av_download_dark.png diff --git a/res/drawable-xhdpi/av_fast_forward.png b/app/src/main/res/drawable-xhdpi/av_fast_forward.png similarity index 100% rename from res/drawable-xhdpi/av_fast_forward.png rename to app/src/main/res/drawable-xhdpi/av_fast_forward.png diff --git a/res/drawable-xhdpi/av_fast_forward_dark.png b/app/src/main/res/drawable-xhdpi/av_fast_forward_dark.png similarity index 100% rename from res/drawable-xhdpi/av_fast_forward_dark.png rename to app/src/main/res/drawable-xhdpi/av_fast_forward_dark.png diff --git a/res/drawable-xhdpi/av_pause.png b/app/src/main/res/drawable-xhdpi/av_pause.png similarity index 100% rename from res/drawable-xhdpi/av_pause.png rename to app/src/main/res/drawable-xhdpi/av_pause.png diff --git a/res/drawable-xhdpi/av_pause_dark.png b/app/src/main/res/drawable-xhdpi/av_pause_dark.png similarity index 100% rename from res/drawable-xhdpi/av_pause_dark.png rename to app/src/main/res/drawable-xhdpi/av_pause_dark.png diff --git a/res/drawable-xhdpi/av_play.png b/app/src/main/res/drawable-xhdpi/av_play.png similarity index 100% rename from res/drawable-xhdpi/av_play.png rename to app/src/main/res/drawable-xhdpi/av_play.png diff --git a/res/drawable-xhdpi/av_play_dark.png b/app/src/main/res/drawable-xhdpi/av_play_dark.png similarity index 100% rename from res/drawable-xhdpi/av_play_dark.png rename to app/src/main/res/drawable-xhdpi/av_play_dark.png diff --git a/res/drawable-xhdpi/av_rewind.png b/app/src/main/res/drawable-xhdpi/av_rewind.png similarity index 100% rename from res/drawable-xhdpi/av_rewind.png rename to app/src/main/res/drawable-xhdpi/av_rewind.png diff --git a/res/drawable-xhdpi/av_rewind_dark.png b/app/src/main/res/drawable-xhdpi/av_rewind_dark.png similarity index 100% rename from res/drawable-xhdpi/av_rewind_dark.png rename to app/src/main/res/drawable-xhdpi/av_rewind_dark.png diff --git a/res/drawable-xhdpi/content_discard.png b/app/src/main/res/drawable-xhdpi/content_discard.png similarity index 100% rename from res/drawable-xhdpi/content_discard.png rename to app/src/main/res/drawable-xhdpi/content_discard.png diff --git a/res/drawable-xhdpi/content_discard_dark.png b/app/src/main/res/drawable-xhdpi/content_discard_dark.png similarity index 100% rename from res/drawable-xhdpi/content_discard_dark.png rename to app/src/main/res/drawable-xhdpi/content_discard_dark.png diff --git a/res/drawable-xhdpi/content_new.png b/app/src/main/res/drawable-xhdpi/content_new.png similarity index 100% rename from res/drawable-xhdpi/content_new.png rename to app/src/main/res/drawable-xhdpi/content_new.png diff --git a/res/drawable-xhdpi/content_new_dark.png b/app/src/main/res/drawable-xhdpi/content_new_dark.png similarity index 100% rename from res/drawable-xhdpi/content_new_dark.png rename to app/src/main/res/drawable-xhdpi/content_new_dark.png diff --git a/res/drawable-xhdpi/content_remove.png b/app/src/main/res/drawable-xhdpi/content_remove.png similarity index 100% rename from res/drawable-xhdpi/content_remove.png rename to app/src/main/res/drawable-xhdpi/content_remove.png diff --git a/res/drawable-xhdpi/content_remove_dark.png b/app/src/main/res/drawable-xhdpi/content_remove_dark.png similarity index 100% rename from res/drawable-xhdpi/content_remove_dark.png rename to app/src/main/res/drawable-xhdpi/content_remove_dark.png diff --git a/res/drawable-xhdpi/default_cover.png b/app/src/main/res/drawable-xhdpi/default_cover.png similarity index 100% rename from res/drawable-xhdpi/default_cover.png rename to app/src/main/res/drawable-xhdpi/default_cover.png diff --git a/res/drawable-xhdpi/default_cover_dark.png b/app/src/main/res/drawable-xhdpi/default_cover_dark.png similarity index 100% rename from res/drawable-xhdpi/default_cover_dark.png rename to app/src/main/res/drawable-xhdpi/default_cover_dark.png diff --git a/res/drawable-xhdpi/device_access_time.png b/app/src/main/res/drawable-xhdpi/device_access_time.png similarity index 100% rename from res/drawable-xhdpi/device_access_time.png rename to app/src/main/res/drawable-xhdpi/device_access_time.png diff --git a/res/drawable-xhdpi/device_access_time_dark.png b/app/src/main/res/drawable-xhdpi/device_access_time_dark.png similarity index 100% rename from res/drawable-xhdpi/device_access_time_dark.png rename to app/src/main/res/drawable-xhdpi/device_access_time_dark.png diff --git a/res/drawable-xhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xhdpi/ic_action_overflow.png similarity index 100% rename from res/drawable-xhdpi/ic_action_overflow.png rename to app/src/main/res/drawable-xhdpi/ic_action_overflow.png diff --git a/res/drawable-xhdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_overflow_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png diff --git a/res/drawable-xhdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png similarity index 100% rename from res/drawable-xhdpi/ic_action_pause_over_video.png rename to app/src/main/res/drawable-xhdpi/ic_action_pause_over_video.png diff --git a/res/drawable-xhdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png similarity index 100% rename from res/drawable-xhdpi/ic_action_play_over_video.png rename to app/src/main/res/drawable-xhdpi/ic_action_play_over_video.png diff --git a/res/drawable-xhdpi/ic_drag_handle.png b/app/src/main/res/drawable-xhdpi/ic_drag_handle.png similarity index 100% rename from res/drawable-xhdpi/ic_drag_handle.png rename to app/src/main/res/drawable-xhdpi/ic_drag_handle.png diff --git a/res/drawable-xhdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-xhdpi/ic_drag_handle_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_drag_handle_dark.png rename to app/src/main/res/drawable-xhdpi/ic_drag_handle_dark.png diff --git a/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from res/drawable-xhdpi/ic_drawer.png rename to app/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/res/drawable-xhdpi/ic_drawer_dark.png b/app/src/main/res/drawable-xhdpi/ic_drawer_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_drawer_dark.png rename to app/src/main/res/drawable-xhdpi/ic_drawer_dark.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_new.png b/app/src/main/res/drawable-xhdpi/ic_new.png similarity index 100% rename from res/drawable-xhdpi/ic_new.png rename to app/src/main/res/drawable-xhdpi/ic_new.png diff --git a/res/drawable-xhdpi/ic_new_dark.png b/app/src/main/res/drawable-xhdpi/ic_new_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_new_dark.png rename to app/src/main/res/drawable-xhdpi/ic_new_dark.png diff --git a/res/drawable-xhdpi/ic_stat_antenna.png b/app/src/main/res/drawable-xhdpi/ic_stat_antenna.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_antenna.png rename to app/src/main/res/drawable-xhdpi/ic_stat_antenna.png diff --git a/res/drawable-xhdpi/ic_stat_authentication.png b/app/src/main/res/drawable-xhdpi/ic_stat_authentication.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_authentication.png rename to app/src/main/res/drawable-xhdpi/ic_stat_authentication.png diff --git a/res/drawable-xhdpi/ic_undobar_undo.png b/app/src/main/res/drawable-xhdpi/ic_undobar_undo.png similarity index 100% rename from res/drawable-xhdpi/ic_undobar_undo.png rename to app/src/main/res/drawable-xhdpi/ic_undobar_undo.png diff --git a/res/drawable-xhdpi/location_web_site.png b/app/src/main/res/drawable-xhdpi/location_web_site.png similarity index 100% rename from res/drawable-xhdpi/location_web_site.png rename to app/src/main/res/drawable-xhdpi/location_web_site.png diff --git a/res/drawable-xhdpi/location_web_site_dark.png b/app/src/main/res/drawable-xhdpi/location_web_site_dark.png similarity index 100% rename from res/drawable-xhdpi/location_web_site_dark.png rename to app/src/main/res/drawable-xhdpi/location_web_site_dark.png diff --git a/res/drawable-xhdpi/navigation_accept.png b/app/src/main/res/drawable-xhdpi/navigation_accept.png similarity index 100% rename from res/drawable-xhdpi/navigation_accept.png rename to app/src/main/res/drawable-xhdpi/navigation_accept.png diff --git a/res/drawable-xhdpi/navigation_accept_dark.png b/app/src/main/res/drawable-xhdpi/navigation_accept_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_accept_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_accept_dark.png diff --git a/res/drawable-xhdpi/navigation_cancel.png b/app/src/main/res/drawable-xhdpi/navigation_cancel.png similarity index 100% rename from res/drawable-xhdpi/navigation_cancel.png rename to app/src/main/res/drawable-xhdpi/navigation_cancel.png diff --git a/res/drawable-xhdpi/navigation_cancel_dark.png b/app/src/main/res/drawable-xhdpi/navigation_cancel_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_cancel_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_cancel_dark.png diff --git a/res/drawable-xhdpi/navigation_chapters.png b/app/src/main/res/drawable-xhdpi/navigation_chapters.png similarity index 100% rename from res/drawable-xhdpi/navigation_chapters.png rename to app/src/main/res/drawable-xhdpi/navigation_chapters.png diff --git a/res/drawable-xhdpi/navigation_chapters_dark.png b/app/src/main/res/drawable-xhdpi/navigation_chapters_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_chapters_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_chapters_dark.png diff --git a/res/drawable-xhdpi/navigation_collapse.png b/app/src/main/res/drawable-xhdpi/navigation_collapse.png similarity index 100% rename from res/drawable-xhdpi/navigation_collapse.png rename to app/src/main/res/drawable-xhdpi/navigation_collapse.png diff --git a/res/drawable-xhdpi/navigation_collapse_dark.png b/app/src/main/res/drawable-xhdpi/navigation_collapse_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_collapse_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_collapse_dark.png diff --git a/res/drawable-xhdpi/navigation_expand.png b/app/src/main/res/drawable-xhdpi/navigation_expand.png similarity index 100% rename from res/drawable-xhdpi/navigation_expand.png rename to app/src/main/res/drawable-xhdpi/navigation_expand.png diff --git a/res/drawable-xhdpi/navigation_expand_dark.png b/app/src/main/res/drawable-xhdpi/navigation_expand_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_expand_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_expand_dark.png diff --git a/res/drawable-xhdpi/navigation_refresh.png b/app/src/main/res/drawable-xhdpi/navigation_refresh.png similarity index 100% rename from res/drawable-xhdpi/navigation_refresh.png rename to app/src/main/res/drawable-xhdpi/navigation_refresh.png diff --git a/res/drawable-xhdpi/navigation_refresh_dark.png b/app/src/main/res/drawable-xhdpi/navigation_refresh_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_refresh_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_refresh_dark.png diff --git a/res/drawable-xhdpi/navigation_shownotes.png b/app/src/main/res/drawable-xhdpi/navigation_shownotes.png similarity index 100% rename from res/drawable-xhdpi/navigation_shownotes.png rename to app/src/main/res/drawable-xhdpi/navigation_shownotes.png diff --git a/res/drawable-xhdpi/navigation_shownotes_dark.png b/app/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_shownotes_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png diff --git a/res/drawable-xhdpi/navigation_up.png b/app/src/main/res/drawable-xhdpi/navigation_up.png similarity index 100% rename from res/drawable-xhdpi/navigation_up.png rename to app/src/main/res/drawable-xhdpi/navigation_up.png diff --git a/res/drawable-xhdpi/navigation_up_dark.png b/app/src/main/res/drawable-xhdpi/navigation_up_dark.png similarity index 100% rename from res/drawable-xhdpi/navigation_up_dark.png rename to app/src/main/res/drawable-xhdpi/navigation_up_dark.png diff --git a/res/drawable-xhdpi/social_share.png b/app/src/main/res/drawable-xhdpi/social_share.png similarity index 100% rename from res/drawable-xhdpi/social_share.png rename to app/src/main/res/drawable-xhdpi/social_share.png diff --git a/res/drawable-xhdpi/social_share_dark.png b/app/src/main/res/drawable-xhdpi/social_share_dark.png similarity index 100% rename from res/drawable-xhdpi/social_share_dark.png rename to app/src/main/res/drawable-xhdpi/social_share_dark.png diff --git a/res/drawable-xhdpi/spinner_button.9.png b/app/src/main/res/drawable-xhdpi/spinner_button.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_button.9.png rename to app/src/main/res/drawable-xhdpi/spinner_button.9.png diff --git a/res/drawable-xhdpi/spinner_button_dark.9.png b/app/src/main/res/drawable-xhdpi/spinner_button_dark.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_button_dark.9.png rename to app/src/main/res/drawable-xhdpi/spinner_button_dark.9.png diff --git a/res/drawable-xhdpi/stat_playlist.png b/app/src/main/res/drawable-xhdpi/stat_playlist.png similarity index 100% rename from res/drawable-xhdpi/stat_playlist.png rename to app/src/main/res/drawable-xhdpi/stat_playlist.png diff --git a/res/drawable-xhdpi/stat_playlist_dark.png b/app/src/main/res/drawable-xhdpi/stat_playlist_dark.png similarity index 100% rename from res/drawable-xhdpi/stat_playlist_dark.png rename to app/src/main/res/drawable-xhdpi/stat_playlist_dark.png diff --git a/res/drawable-xhdpi/type_audio.png b/app/src/main/res/drawable-xhdpi/type_audio.png similarity index 100% rename from res/drawable-xhdpi/type_audio.png rename to app/src/main/res/drawable-xhdpi/type_audio.png diff --git a/res/drawable-xhdpi/type_audio_dark.png b/app/src/main/res/drawable-xhdpi/type_audio_dark.png similarity index 100% rename from res/drawable-xhdpi/type_audio_dark.png rename to app/src/main/res/drawable-xhdpi/type_audio_dark.png diff --git a/res/drawable-xhdpi/type_video.png b/app/src/main/res/drawable-xhdpi/type_video.png similarity index 100% rename from res/drawable-xhdpi/type_video.png rename to app/src/main/res/drawable-xhdpi/type_video.png diff --git a/res/drawable-xhdpi/type_video_dark.png b/app/src/main/res/drawable-xhdpi/type_video_dark.png similarity index 100% rename from res/drawable-xhdpi/type_video_dark.png rename to app/src/main/res/drawable-xhdpi/type_video_dark.png diff --git a/res/drawable-xhdpi/undobar.9.png b/app/src/main/res/drawable-xhdpi/undobar.9.png similarity index 100% rename from res/drawable-xhdpi/undobar.9.png rename to app/src/main/res/drawable-xhdpi/undobar.9.png diff --git a/res/drawable-xhdpi/undobar_button_focused.9.png b/app/src/main/res/drawable-xhdpi/undobar_button_focused.9.png similarity index 100% rename from res/drawable-xhdpi/undobar_button_focused.9.png rename to app/src/main/res/drawable-xhdpi/undobar_button_focused.9.png diff --git a/res/drawable-xhdpi/undobar_button_pressed.9.png b/app/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/undobar_button_pressed.9.png rename to app/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png diff --git a/res/drawable-xhdpi/undobar_divider.9.png b/app/src/main/res/drawable-xhdpi/undobar_divider.9.png similarity index 100% rename from res/drawable-xhdpi/undobar_divider.9.png rename to app/src/main/res/drawable-xhdpi/undobar_divider.9.png diff --git a/res/drawable-xxhdpi/ic_action_overflow.png b/app/src/main/res/drawable-xxhdpi/ic_action_overflow.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_overflow.png rename to app/src/main/res/drawable-xxhdpi/ic_action_overflow.png diff --git a/res/drawable-xxhdpi/ic_action_overflow_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_overflow_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png diff --git a/res/drawable-xxhdpi/ic_action_pause_over_video.png b/app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_pause_over_video.png rename to app/src/main/res/drawable-xxhdpi/ic_action_pause_over_video.png diff --git a/res/drawable-xxhdpi/ic_action_play_over_video.png b/app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_play_over_video.png rename to app/src/main/res/drawable-xxhdpi/ic_action_play_over_video.png diff --git a/res/drawable-xxhdpi/ic_drag_handle.png b/app/src/main/res/drawable-xxhdpi/ic_drag_handle.png similarity index 100% rename from res/drawable-xxhdpi/ic_drag_handle.png rename to app/src/main/res/drawable-xxhdpi/ic_drag_handle.png diff --git a/res/drawable-xxhdpi/ic_drag_handle_dark.png b/app/src/main/res/drawable-xxhdpi/ic_drag_handle_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_drag_handle_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_drag_handle_dark.png diff --git a/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png similarity index 100% rename from res/drawable-xxhdpi/ic_drawer.png rename to app/src/main/res/drawable-xxhdpi/ic_drawer.png diff --git a/res/drawable-xxhdpi/ic_drawer_dark.png b/app/src/main/res/drawable-xxhdpi/ic_drawer_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_drawer_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_drawer_dark.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_new.png b/app/src/main/res/drawable-xxhdpi/ic_new.png similarity index 100% rename from res/drawable-xxhdpi/ic_new.png rename to app/src/main/res/drawable-xxhdpi/ic_new.png diff --git a/res/drawable-xxhdpi/ic_new_dark.png b/app/src/main/res/drawable-xxhdpi/ic_new_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_new_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_new_dark.png diff --git a/res/drawable-xxhdpi/ic_stat_authentication.png b/app/src/main/res/drawable-xxhdpi/ic_stat_authentication.png similarity index 100% rename from res/drawable-xxhdpi/ic_stat_authentication.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_authentication.png diff --git a/res/drawable/badge.xml b/app/src/main/res/drawable/badge.xml similarity index 100% rename from res/drawable/badge.xml rename to app/src/main/res/drawable/badge.xml diff --git a/res/drawable/borderless_button.xml b/app/src/main/res/drawable/borderless_button.xml similarity index 100% rename from res/drawable/borderless_button.xml rename to app/src/main/res/drawable/borderless_button.xml diff --git a/res/drawable/borderless_button_dark.xml b/app/src/main/res/drawable/borderless_button_dark.xml similarity index 100% rename from res/drawable/borderless_button_dark.xml rename to app/src/main/res/drawable/borderless_button_dark.xml diff --git a/res/drawable/horizontal_divider.9.png b/app/src/main/res/drawable/horizontal_divider.9.png similarity index 100% rename from res/drawable/horizontal_divider.9.png rename to app/src/main/res/drawable/horizontal_divider.9.png diff --git a/res/drawable/overlay_button_circle_background.xml b/app/src/main/res/drawable/overlay_button_circle_background.xml similarity index 100% rename from res/drawable/overlay_button_circle_background.xml rename to app/src/main/res/drawable/overlay_button_circle_background.xml diff --git a/res/drawable/overlay_drawable.xml b/app/src/main/res/drawable/overlay_drawable.xml similarity index 100% rename from res/drawable/overlay_drawable.xml rename to app/src/main/res/drawable/overlay_drawable.xml diff --git a/res/drawable/overlay_drawable_dark.xml b/app/src/main/res/drawable/overlay_drawable_dark.xml similarity index 100% rename from res/drawable/overlay_drawable_dark.xml rename to app/src/main/res/drawable/overlay_drawable_dark.xml diff --git a/res/drawable/type_audio.png b/app/src/main/res/drawable/type_audio.png similarity index 100% rename from res/drawable/type_audio.png rename to app/src/main/res/drawable/type_audio.png diff --git a/res/drawable/type_video.png b/app/src/main/res/drawable/type_video.png similarity index 100% rename from res/drawable/type_video.png rename to app/src/main/res/drawable/type_video.png diff --git a/res/drawable/undobar_button.xml b/app/src/main/res/drawable/undobar_button.xml similarity index 100% rename from res/drawable/undobar_button.xml rename to app/src/main/res/drawable/undobar_button.xml diff --git a/res/drawable/vertical_divider.9.png b/app/src/main/res/drawable/vertical_divider.9.png similarity index 100% rename from res/drawable/vertical_divider.9.png rename to app/src/main/res/drawable/vertical_divider.9.png diff --git a/res/drawable/white_circle.xml b/app/src/main/res/drawable/white_circle.xml similarity index 100% rename from res/drawable/white_circle.xml rename to app/src/main/res/drawable/white_circle.xml diff --git a/res/layout-land/audioplayer_activity.xml b/app/src/main/res/layout-land/audioplayer_activity.xml similarity index 100% rename from res/layout-land/audioplayer_activity.xml rename to app/src/main/res/layout-land/audioplayer_activity.xml diff --git a/res/layout-land/videoplayer_activity.xml b/app/src/main/res/layout-land/videoplayer_activity.xml similarity index 100% rename from res/layout-land/videoplayer_activity.xml rename to app/src/main/res/layout-land/videoplayer_activity.xml diff --git a/res/layout-v14/authentication_dialog.xml b/app/src/main/res/layout-v14/authentication_dialog.xml similarity index 100% rename from res/layout-v14/authentication_dialog.xml rename to app/src/main/res/layout-v14/authentication_dialog.xml diff --git a/res/layout-v14/directory_chooser.xml b/app/src/main/res/layout-v14/directory_chooser.xml similarity index 100% rename from res/layout-v14/directory_chooser.xml rename to app/src/main/res/layout-v14/directory_chooser.xml diff --git a/res/layout-v14/download_authentication_activity.xml b/app/src/main/res/layout-v14/download_authentication_activity.xml similarity index 100% rename from res/layout-v14/download_authentication_activity.xml rename to app/src/main/res/layout-v14/download_authentication_activity.xml diff --git a/res/layout-v14/opml_selection.xml b/app/src/main/res/layout-v14/opml_selection.xml similarity index 100% rename from res/layout-v14/opml_selection.xml rename to app/src/main/res/layout-v14/opml_selection.xml diff --git a/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml similarity index 100% rename from res/layout-v14/time_dialog.xml rename to app/src/main/res/layout-v14/time_dialog.xml diff --git a/res/layout/about.xml b/app/src/main/res/layout/about.xml similarity index 100% rename from res/layout/about.xml rename to app/src/main/res/layout/about.xml diff --git a/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml similarity index 100% rename from res/layout/addfeed.xml rename to app/src/main/res/layout/addfeed.xml diff --git a/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml similarity index 100% rename from res/layout/audioplayer_activity.xml rename to app/src/main/res/layout/audioplayer_activity.xml diff --git a/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml similarity index 100% rename from res/layout/authentication_dialog.xml rename to app/src/main/res/layout/authentication_dialog.xml diff --git a/res/layout/autoflattr_preference_dialog.xml b/app/src/main/res/layout/autoflattr_preference_dialog.xml similarity index 100% rename from res/layout/autoflattr_preference_dialog.xml rename to app/src/main/res/layout/autoflattr_preference_dialog.xml diff --git a/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml similarity index 100% rename from res/layout/cover_fragment.xml rename to app/src/main/res/layout/cover_fragment.xml diff --git a/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml similarity index 100% rename from res/layout/directory_chooser.xml rename to app/src/main/res/layout/directory_chooser.xml diff --git a/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml similarity index 100% rename from res/layout/download_authentication_activity.xml rename to app/src/main/res/layout/download_authentication_activity.xml diff --git a/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml similarity index 100% rename from res/layout/downloaded_episodeslist_item.xml rename to app/src/main/res/layout/downloaded_episodeslist_item.xml diff --git a/res/layout/downloadlist_item.xml b/app/src/main/res/layout/downloadlist_item.xml similarity index 100% rename from res/layout/downloadlist_item.xml rename to app/src/main/res/layout/downloadlist_item.xml diff --git a/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml similarity index 100% rename from res/layout/downloadlog_item.xml rename to app/src/main/res/layout/downloadlog_item.xml diff --git a/res/layout/ellipsize_start_listitem.xml b/app/src/main/res/layout/ellipsize_start_listitem.xml similarity index 100% rename from res/layout/ellipsize_start_listitem.xml rename to app/src/main/res/layout/ellipsize_start_listitem.xml diff --git a/res/layout/external_itemlist_item.xml b/app/src/main/res/layout/external_itemlist_item.xml similarity index 100% rename from res/layout/external_itemlist_item.xml rename to app/src/main/res/layout/external_itemlist_item.xml diff --git a/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml similarity index 100% rename from res/layout/external_player_fragment.xml rename to app/src/main/res/layout/external_player_fragment.xml diff --git a/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml similarity index 100% rename from res/layout/feedinfo.xml rename to app/src/main/res/layout/feedinfo.xml diff --git a/res/layout/feeditem_dialog.xml b/app/src/main/res/layout/feeditem_dialog.xml similarity index 100% rename from res/layout/feeditem_dialog.xml rename to app/src/main/res/layout/feeditem_dialog.xml diff --git a/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml similarity index 100% rename from res/layout/feeditemlist_header.xml rename to app/src/main/res/layout/feeditemlist_header.xml diff --git a/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml similarity index 100% rename from res/layout/feeditemlist_item.xml rename to app/src/main/res/layout/feeditemlist_item.xml diff --git a/res/layout/flattr_auth.xml b/app/src/main/res/layout/flattr_auth.xml similarity index 100% rename from res/layout/flattr_auth.xml rename to app/src/main/res/layout/flattr_auth.xml diff --git a/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml similarity index 100% rename from res/layout/gpodnet_podcast_list.xml rename to app/src/main/res/layout/gpodnet_podcast_list.xml diff --git a/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml similarity index 100% rename from res/layout/gpodnet_podcast_listitem.xml rename to app/src/main/res/layout/gpodnet_podcast_listitem.xml diff --git a/res/layout/gpodnetauth_activity.xml b/app/src/main/res/layout/gpodnetauth_activity.xml similarity index 100% rename from res/layout/gpodnetauth_activity.xml rename to app/src/main/res/layout/gpodnetauth_activity.xml diff --git a/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml similarity index 100% rename from res/layout/gpodnetauth_credentials.xml rename to app/src/main/res/layout/gpodnetauth_credentials.xml diff --git a/res/layout/gpodnetauth_device.xml b/app/src/main/res/layout/gpodnetauth_device.xml similarity index 100% rename from res/layout/gpodnetauth_device.xml rename to app/src/main/res/layout/gpodnetauth_device.xml diff --git a/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml similarity index 100% rename from res/layout/gpodnetauth_finish.xml rename to app/src/main/res/layout/gpodnetauth_finish.xml diff --git a/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml similarity index 100% rename from res/layout/itemdescription_listitem.xml rename to app/src/main/res/layout/itemdescription_listitem.xml diff --git a/res/layout/listview_activity.xml b/app/src/main/res/layout/listview_activity.xml similarity index 100% rename from res/layout/listview_activity.xml rename to app/src/main/res/layout/listview_activity.xml diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml similarity index 100% rename from res/layout/nav_feedlistitem.xml rename to app/src/main/res/layout/nav_feedlistitem.xml diff --git a/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml similarity index 100% rename from res/layout/nav_listitem.xml rename to app/src/main/res/layout/nav_listitem.xml diff --git a/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml similarity index 100% rename from res/layout/nav_section_item.xml rename to app/src/main/res/layout/nav_section_item.xml diff --git a/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml similarity index 100% rename from res/layout/new_episodes_fragment.xml rename to app/src/main/res/layout/new_episodes_fragment.xml diff --git a/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml similarity index 100% rename from res/layout/new_episodes_listitem.xml rename to app/src/main/res/layout/new_episodes_listitem.xml diff --git a/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml similarity index 100% rename from res/layout/onlinefeedview_header.xml rename to app/src/main/res/layout/onlinefeedview_header.xml diff --git a/res/layout/opml_import.xml b/app/src/main/res/layout/opml_import.xml similarity index 100% rename from res/layout/opml_import.xml rename to app/src/main/res/layout/opml_import.xml diff --git a/res/layout/opml_selection.xml b/app/src/main/res/layout/opml_selection.xml similarity index 100% rename from res/layout/opml_selection.xml rename to app/src/main/res/layout/opml_selection.xml diff --git a/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml similarity index 100% rename from res/layout/pager_fragment.xml rename to app/src/main/res/layout/pager_fragment.xml diff --git a/res/layout/player_widget.xml b/app/src/main/res/layout/player_widget.xml similarity index 100% rename from res/layout/player_widget.xml rename to app/src/main/res/layout/player_widget.xml diff --git a/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml similarity index 100% rename from res/layout/queue_fragment.xml rename to app/src/main/res/layout/queue_fragment.xml diff --git a/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml similarity index 100% rename from res/layout/queue_listitem.xml rename to app/src/main/res/layout/queue_listitem.xml diff --git a/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml similarity index 100% rename from res/layout/searchlist_item.xml rename to app/src/main/res/layout/searchlist_item.xml diff --git a/res/layout/simplechapter_item.xml b/app/src/main/res/layout/simplechapter_item.xml similarity index 100% rename from res/layout/simplechapter_item.xml rename to app/src/main/res/layout/simplechapter_item.xml diff --git a/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml similarity index 100% rename from res/layout/storage_error.xml rename to app/src/main/res/layout/storage_error.xml diff --git a/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml similarity index 100% rename from res/layout/time_dialog.xml rename to app/src/main/res/layout/time_dialog.xml diff --git a/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml similarity index 100% rename from res/menu/directory_chooser.xml rename to app/src/main/res/menu/directory_chooser.xml diff --git a/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml similarity index 100% rename from res/menu/feedinfo.xml rename to app/src/main/res/menu/feedinfo.xml diff --git a/res/menu/feeditem.xml b/app/src/main/res/menu/feeditem.xml similarity index 100% rename from res/menu/feeditem.xml rename to app/src/main/res/menu/feeditem.xml diff --git a/res/menu/feeditem_dialog.xml b/app/src/main/res/menu/feeditem_dialog.xml similarity index 100% rename from res/menu/feeditem_dialog.xml rename to app/src/main/res/menu/feeditem_dialog.xml diff --git a/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml similarity index 100% rename from res/menu/feedlist.xml rename to app/src/main/res/menu/feedlist.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml similarity index 100% rename from res/menu/mediaplayer.xml rename to app/src/main/res/menu/mediaplayer.xml diff --git a/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml similarity index 100% rename from res/menu/new_episodes.xml rename to app/src/main/res/menu/new_episodes.xml diff --git a/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml similarity index 100% rename from res/menu/queue_context.xml rename to app/src/main/res/menu/queue_context.xml diff --git a/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml similarity index 100% rename from res/values-az/strings.xml rename to app/src/main/res/values-az/strings.xml diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from res/values-cs-rCZ/strings.xml rename to app/src/main/res/values-cs-rCZ/strings.xml diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml similarity index 100% rename from res/values-es-rES/strings.xml rename to app/src/main/res/values-es-rES/strings.xml diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml similarity index 100% rename from res/values-hi-rIN/strings.xml rename to app/src/main/res/values-hi-rIN/strings.xml diff --git a/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from res/values-it-rIT/strings.xml rename to app/src/main/res/values-it-rIT/strings.xml diff --git a/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from res/values-iw-rIL/strings.xml rename to app/src/main/res/values-iw-rIL/strings.xml diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml diff --git a/res/values-land/styles.xml b/app/src/main/res/values-land/styles.xml similarity index 100% rename from res/values-land/styles.xml rename to app/src/main/res/values-land/styles.xml diff --git a/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml similarity index 100% rename from res/values-large/dimens.xml rename to app/src/main/res/values-large/dimens.xml diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from res/values-pl-rPL/strings.xml rename to app/src/main/res/values-pl-rPL/strings.xml diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from res/values-ro-rRO/strings.xml rename to app/src/main/res/values-ro-rRO/strings.xml diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from res/values-sv-rSE/strings.xml rename to app/src/main/res/values-sv-rSE/strings.xml diff --git a/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml similarity index 100% rename from res/values-uk-rUA/strings.xml rename to app/src/main/res/values-uk-rUA/strings.xml diff --git a/res/values-v11/colors.xml b/app/src/main/res/values-v11/colors.xml similarity index 100% rename from res/values-v11/colors.xml rename to app/src/main/res/values-v11/colors.xml diff --git a/res/values-v14/dimens.xml b/app/src/main/res/values-v14/dimens.xml similarity index 100% rename from res/values-v14/dimens.xml rename to app/src/main/res/values-v14/dimens.xml diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml similarity index 100% rename from res/values-v16/styles.xml rename to app/src/main/res/values-v16/styles.xml diff --git a/res/values-v19/colors.xml b/app/src/main/res/values-v19/colors.xml similarity index 100% rename from res/values-v19/colors.xml rename to app/src/main/res/values-v19/colors.xml diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/ids.xml b/app/src/main/res/values/ids.xml similarity index 100% rename from res/values/ids.xml rename to app/src/main/res/values/ids.xml diff --git a/res/values/integers.xml b/app/src/main/res/values/integers.xml similarity index 100% rename from res/values/integers.xml rename to app/src/main/res/values/integers.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml similarity index 100% rename from res/xml/player_widget_info.xml rename to app/src/main/res/xml/player_widget_info.xml diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml similarity index 100% rename from res/xml/searchable.xml rename to app/src/main/res/xml/searchable.xml diff --git a/build.gradle b/build.gradle index 441b17385..48f4e4684 100644 --- a/build.gradle +++ b/build.gradle @@ -1,129 +1,19 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} -apply plugin: 'com.android.application' + classpath 'com.android.tools.build:gradle:0.12.2' -repositories { - mavenCentral() -} -dependencies { - def libsdir = new File('libs'); - if (!libsdir.exists()) { - println "Creating libs directory" - libsdir.mkdir() - } - compile 'com.android.support:support-v4:19.1.+' - compile 'com.android.support:appcompat-v7:19.1.+' - 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(':submodules: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.+' - compile 'com.squareup.okhttp:okhttp:2.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 "instrumentationTest.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" - } - } - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - } - - 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 + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files } } -task wrapper(type: Wrapper) { - gradleVersion = '1.12' -} +allprojects { + repositories { + jcenter() + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 6de43d84c..d33586960 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ -include ':submodules:dslv:library' +include ':app' +include ':app:dslv:library' diff --git a/tests/.classpath b/tests/.classpath deleted file mode 100644 index 62d428f2b..000000000 --- a/tests/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/tests/.project b/tests/.project deleted file mode 100644 index 22c678688..000000000 --- a/tests/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - AntennaPodTest - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml deleted file mode 100644 index d2d661e83..000000000 --- a/tests/AndroidManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/lint.xml b/tests/lint.xml deleted file mode 100644 index ee0eead5b..000000000 --- a/tests/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/tests/proguard-project.txt b/tests/proguard-project.txt deleted file mode 100644 index f2fe1559a..000000000 --- a/tests/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/tests/project.properties b/tests/project.properties deleted file mode 100644 index 0840b4a05..000000000 --- a/tests/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-15 diff --git a/tests/res/drawable-hdpi/ic_launcher.png b/tests/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 96a442e5b..000000000 Binary files a/tests/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/tests/res/drawable-ldpi/ic_launcher.png b/tests/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 99238729d..000000000 Binary files a/tests/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/tests/res/drawable-mdpi/ic_launcher.png b/tests/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 359047dfa..000000000 Binary files a/tests/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/tests/res/drawable-xhdpi/ic_launcher.png b/tests/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 71c6d760f..000000000 Binary files a/tests/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml deleted file mode 100644 index 8f0a2c82b..000000000 --- a/tests/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - AntennapodTestTest - - \ No newline at end of file