diff --git a/build.gradle b/build.gradle index 3bf7600..5c2e661 100644 --- a/build.gradle +++ b/build.gradle @@ -33,13 +33,4 @@ android { packageNameSuffix ".debug" } } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - aidl.srcDirs = ['src'] - res.srcDirs = ['res'] - } - } } diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/src/android/os/Messenger.aidl b/src/main/aidl/android/os/Messenger.aidl similarity index 100% rename from src/android/os/Messenger.aidl rename to src/main/aidl/android/os/Messenger.aidl diff --git a/src/com/github/nutomic/controldlna/upnp/IRemotePlayService.aidl b/src/main/aidl/com/github/nutomic/controldlna/upnp/IRemotePlayService.aidl similarity index 100% rename from src/com/github/nutomic/controldlna/upnp/IRemotePlayService.aidl rename to src/main/aidl/com/github/nutomic/controldlna/upnp/IRemotePlayService.aidl diff --git a/src/com/github/nutomic/controldlna/gui/MainActivity.java b/src/main/java/com/github/nutomic/controldlna/gui/MainActivity.java similarity index 100% rename from src/com/github/nutomic/controldlna/gui/MainActivity.java rename to src/main/java/com/github/nutomic/controldlna/gui/MainActivity.java diff --git a/src/com/github/nutomic/controldlna/gui/PreferencesActivity.java b/src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java similarity index 100% rename from src/com/github/nutomic/controldlna/gui/PreferencesActivity.java rename to src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java diff --git a/src/com/github/nutomic/controldlna/gui/RouteFragment.java b/src/main/java/com/github/nutomic/controldlna/gui/RouteFragment.java similarity index 100% rename from src/com/github/nutomic/controldlna/gui/RouteFragment.java rename to src/main/java/com/github/nutomic/controldlna/gui/RouteFragment.java diff --git a/src/com/github/nutomic/controldlna/gui/ServerFragment.java b/src/main/java/com/github/nutomic/controldlna/gui/ServerFragment.java similarity index 100% rename from src/com/github/nutomic/controldlna/gui/ServerFragment.java rename to src/main/java/com/github/nutomic/controldlna/gui/ServerFragment.java diff --git a/src/com/github/nutomic/controldlna/localroute/Controller.java b/src/main/java/com/github/nutomic/controldlna/localroute/Controller.java similarity index 100% rename from src/com/github/nutomic/controldlna/localroute/Controller.java rename to src/main/java/com/github/nutomic/controldlna/localroute/Controller.java diff --git a/src/com/github/nutomic/controldlna/localroute/Provider.java b/src/main/java/com/github/nutomic/controldlna/localroute/Provider.java similarity index 100% rename from src/com/github/nutomic/controldlna/localroute/Provider.java rename to src/main/java/com/github/nutomic/controldlna/localroute/Provider.java diff --git a/src/com/github/nutomic/controldlna/localroute/ProviderService.java b/src/main/java/com/github/nutomic/controldlna/localroute/ProviderService.java similarity index 100% rename from src/com/github/nutomic/controldlna/localroute/ProviderService.java rename to src/main/java/com/github/nutomic/controldlna/localroute/ProviderService.java diff --git a/src/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java b/src/main/java/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java similarity index 100% rename from src/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java rename to src/main/java/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java diff --git a/src/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayServiceBinder.java b/src/main/java/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayServiceBinder.java similarity index 100% rename from src/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayServiceBinder.java rename to src/main/java/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayServiceBinder.java diff --git a/src/com/github/nutomic/controldlna/upnp/Provider.java b/src/main/java/com/github/nutomic/controldlna/upnp/Provider.java similarity index 100% rename from src/com/github/nutomic/controldlna/upnp/Provider.java rename to src/main/java/com/github/nutomic/controldlna/upnp/Provider.java diff --git a/src/com/github/nutomic/controldlna/upnp/ProviderService.java b/src/main/java/com/github/nutomic/controldlna/upnp/ProviderService.java similarity index 100% rename from src/com/github/nutomic/controldlna/upnp/ProviderService.java rename to src/main/java/com/github/nutomic/controldlna/upnp/ProviderService.java diff --git a/src/com/github/nutomic/controldlna/upnp/RemotePlayService.java b/src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayService.java similarity index 100% rename from src/com/github/nutomic/controldlna/upnp/RemotePlayService.java rename to src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayService.java diff --git a/src/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java b/src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java similarity index 100% rename from src/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java rename to src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java diff --git a/src/com/github/nutomic/controldlna/utility/DeviceArrayAdapter.java b/src/main/java/com/github/nutomic/controldlna/utility/DeviceArrayAdapter.java similarity index 100% rename from src/com/github/nutomic/controldlna/utility/DeviceArrayAdapter.java rename to src/main/java/com/github/nutomic/controldlna/utility/DeviceArrayAdapter.java diff --git a/src/com/github/nutomic/controldlna/utility/FileArrayAdapter.java b/src/main/java/com/github/nutomic/controldlna/utility/FileArrayAdapter.java similarity index 100% rename from src/com/github/nutomic/controldlna/utility/FileArrayAdapter.java rename to src/main/java/com/github/nutomic/controldlna/utility/FileArrayAdapter.java diff --git a/src/com/github/nutomic/controldlna/utility/LoadImageTask.java b/src/main/java/com/github/nutomic/controldlna/utility/LoadImageTask.java similarity index 100% rename from src/com/github/nutomic/controldlna/utility/LoadImageTask.java rename to src/main/java/com/github/nutomic/controldlna/utility/LoadImageTask.java diff --git a/src/com/github/nutomic/controldlna/utility/RemoteImageView.java b/src/main/java/com/github/nutomic/controldlna/utility/RemoteImageView.java similarity index 100% rename from src/com/github/nutomic/controldlna/utility/RemoteImageView.java rename to src/main/java/com/github/nutomic/controldlna/utility/RemoteImageView.java diff --git a/src/com/github/nutomic/controldlna/utility/RouteAdapter.java b/src/main/java/com/github/nutomic/controldlna/utility/RouteAdapter.java similarity index 100% rename from src/com/github/nutomic/controldlna/utility/RouteAdapter.java rename to src/main/java/com/github/nutomic/controldlna/utility/RouteAdapter.java diff --git a/res/drawable-hdpi/ic_action_next.png b/src/main/res/drawable-hdpi/ic_action_next.png similarity index 100% rename from res/drawable-hdpi/ic_action_next.png rename to src/main/res/drawable-hdpi/ic_action_next.png diff --git a/res/drawable-hdpi/ic_action_pause.png b/src/main/res/drawable-hdpi/ic_action_pause.png similarity index 100% rename from res/drawable-hdpi/ic_action_pause.png rename to src/main/res/drawable-hdpi/ic_action_pause.png diff --git a/res/drawable-hdpi/ic_action_play.png b/src/main/res/drawable-hdpi/ic_action_play.png similarity index 100% rename from res/drawable-hdpi/ic_action_play.png rename to src/main/res/drawable-hdpi/ic_action_play.png diff --git a/res/drawable-hdpi/ic_action_previous.png b/src/main/res/drawable-hdpi/ic_action_previous.png similarity index 100% rename from res/drawable-hdpi/ic_action_previous.png rename to src/main/res/drawable-hdpi/ic_action_previous.png diff --git a/res/drawable-hdpi/ic_action_repeat.png b/src/main/res/drawable-hdpi/ic_action_repeat.png similarity index 100% rename from res/drawable-hdpi/ic_action_repeat.png rename to src/main/res/drawable-hdpi/ic_action_repeat.png diff --git a/res/drawable-hdpi/ic_action_shuffle.png b/src/main/res/drawable-hdpi/ic_action_shuffle.png similarity index 100% rename from res/drawable-hdpi/ic_action_shuffle.png rename to src/main/res/drawable-hdpi/ic_action_shuffle.png diff --git a/res/drawable-hdpi/ic_doc_album.png b/src/main/res/drawable-hdpi/ic_doc_album.png similarity index 100% rename from res/drawable-hdpi/ic_doc_album.png rename to src/main/res/drawable-hdpi/ic_doc_album.png diff --git a/res/drawable-hdpi/ic_doc_audio_am.png b/src/main/res/drawable-hdpi/ic_doc_audio_am.png similarity index 100% rename from res/drawable-hdpi/ic_doc_audio_am.png rename to src/main/res/drawable-hdpi/ic_doc_audio_am.png diff --git a/res/drawable-hdpi/ic_doc_image.png b/src/main/res/drawable-hdpi/ic_doc_image.png similarity index 100% rename from res/drawable-hdpi/ic_doc_image.png rename to src/main/res/drawable-hdpi/ic_doc_image.png diff --git a/res/drawable-hdpi/ic_doc_video_am.png b/src/main/res/drawable-hdpi/ic_doc_video_am.png similarity index 100% rename from res/drawable-hdpi/ic_doc_video_am.png rename to src/main/res/drawable-hdpi/ic_doc_video_am.png diff --git a/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_root_folder_am.png b/src/main/res/drawable-hdpi/ic_root_folder_am.png similarity index 100% rename from res/drawable-hdpi/ic_root_folder_am.png rename to src/main/res/drawable-hdpi/ic_root_folder_am.png diff --git a/res/drawable-ldpi/ic_launcher.png b/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from res/drawable-ldpi/ic_launcher.png rename to src/main/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_action_next.png b/src/main/res/drawable-mdpi/ic_action_next.png similarity index 100% rename from res/drawable-mdpi/ic_action_next.png rename to src/main/res/drawable-mdpi/ic_action_next.png diff --git a/res/drawable-mdpi/ic_action_pause.png b/src/main/res/drawable-mdpi/ic_action_pause.png similarity index 100% rename from res/drawable-mdpi/ic_action_pause.png rename to src/main/res/drawable-mdpi/ic_action_pause.png diff --git a/res/drawable-mdpi/ic_action_play.png b/src/main/res/drawable-mdpi/ic_action_play.png similarity index 100% rename from res/drawable-mdpi/ic_action_play.png rename to src/main/res/drawable-mdpi/ic_action_play.png diff --git a/res/drawable-mdpi/ic_action_previous.png b/src/main/res/drawable-mdpi/ic_action_previous.png similarity index 100% rename from res/drawable-mdpi/ic_action_previous.png rename to src/main/res/drawable-mdpi/ic_action_previous.png diff --git a/res/drawable-mdpi/ic_action_repeat.png b/src/main/res/drawable-mdpi/ic_action_repeat.png similarity index 100% rename from res/drawable-mdpi/ic_action_repeat.png rename to src/main/res/drawable-mdpi/ic_action_repeat.png diff --git a/res/drawable-mdpi/ic_action_shuffle.png b/src/main/res/drawable-mdpi/ic_action_shuffle.png similarity index 100% rename from res/drawable-mdpi/ic_action_shuffle.png rename to src/main/res/drawable-mdpi/ic_action_shuffle.png diff --git a/res/drawable-mdpi/ic_doc_album.png b/src/main/res/drawable-mdpi/ic_doc_album.png similarity index 100% rename from res/drawable-mdpi/ic_doc_album.png rename to src/main/res/drawable-mdpi/ic_doc_album.png diff --git a/res/drawable-mdpi/ic_doc_audio_am.png b/src/main/res/drawable-mdpi/ic_doc_audio_am.png similarity index 100% rename from res/drawable-mdpi/ic_doc_audio_am.png rename to src/main/res/drawable-mdpi/ic_doc_audio_am.png diff --git a/res/drawable-mdpi/ic_doc_image.png b/src/main/res/drawable-mdpi/ic_doc_image.png similarity index 100% rename from res/drawable-mdpi/ic_doc_image.png rename to src/main/res/drawable-mdpi/ic_doc_image.png diff --git a/res/drawable-mdpi/ic_doc_video_am.png b/src/main/res/drawable-mdpi/ic_doc_video_am.png similarity index 100% rename from res/drawable-mdpi/ic_doc_video_am.png rename to src/main/res/drawable-mdpi/ic_doc_video_am.png diff --git a/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_root_folder_am.png b/src/main/res/drawable-mdpi/ic_root_folder_am.png similarity index 100% rename from res/drawable-mdpi/ic_root_folder_am.png rename to src/main/res/drawable-mdpi/ic_root_folder_am.png diff --git a/res/drawable-xhdpi/ic_action_next.png b/src/main/res/drawable-xhdpi/ic_action_next.png similarity index 100% rename from res/drawable-xhdpi/ic_action_next.png rename to src/main/res/drawable-xhdpi/ic_action_next.png diff --git a/res/drawable-xhdpi/ic_action_pause.png b/src/main/res/drawable-xhdpi/ic_action_pause.png similarity index 100% rename from res/drawable-xhdpi/ic_action_pause.png rename to src/main/res/drawable-xhdpi/ic_action_pause.png diff --git a/res/drawable-xhdpi/ic_action_play.png b/src/main/res/drawable-xhdpi/ic_action_play.png similarity index 100% rename from res/drawable-xhdpi/ic_action_play.png rename to src/main/res/drawable-xhdpi/ic_action_play.png diff --git a/res/drawable-xhdpi/ic_action_previous.png b/src/main/res/drawable-xhdpi/ic_action_previous.png similarity index 100% rename from res/drawable-xhdpi/ic_action_previous.png rename to src/main/res/drawable-xhdpi/ic_action_previous.png diff --git a/res/drawable-xhdpi/ic_action_repeat.png b/src/main/res/drawable-xhdpi/ic_action_repeat.png similarity index 100% rename from res/drawable-xhdpi/ic_action_repeat.png rename to src/main/res/drawable-xhdpi/ic_action_repeat.png diff --git a/res/drawable-xhdpi/ic_action_shuffle.png b/src/main/res/drawable-xhdpi/ic_action_shuffle.png similarity index 100% rename from res/drawable-xhdpi/ic_action_shuffle.png rename to src/main/res/drawable-xhdpi/ic_action_shuffle.png diff --git a/res/drawable-xhdpi/ic_doc_album.png b/src/main/res/drawable-xhdpi/ic_doc_album.png similarity index 100% rename from res/drawable-xhdpi/ic_doc_album.png rename to src/main/res/drawable-xhdpi/ic_doc_album.png diff --git a/res/drawable-xhdpi/ic_doc_audio_am.png b/src/main/res/drawable-xhdpi/ic_doc_audio_am.png similarity index 100% rename from res/drawable-xhdpi/ic_doc_audio_am.png rename to src/main/res/drawable-xhdpi/ic_doc_audio_am.png diff --git a/res/drawable-xhdpi/ic_doc_image.png b/src/main/res/drawable-xhdpi/ic_doc_image.png similarity index 100% rename from res/drawable-xhdpi/ic_doc_image.png rename to src/main/res/drawable-xhdpi/ic_doc_image.png diff --git a/res/drawable-xhdpi/ic_doc_video_am.png b/src/main/res/drawable-xhdpi/ic_doc_video_am.png similarity index 100% rename from res/drawable-xhdpi/ic_doc_video_am.png rename to src/main/res/drawable-xhdpi/ic_doc_video_am.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_root_folder_am.png b/src/main/res/drawable-xhdpi/ic_root_folder_am.png similarity index 100% rename from res/drawable-xhdpi/ic_root_folder_am.png rename to src/main/res/drawable-xhdpi/ic_root_folder_am.png diff --git a/res/drawable-xxhdpi/ic_action_next.png b/src/main/res/drawable-xxhdpi/ic_action_next.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_next.png rename to src/main/res/drawable-xxhdpi/ic_action_next.png diff --git a/res/drawable-xxhdpi/ic_action_pause.png b/src/main/res/drawable-xxhdpi/ic_action_pause.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_pause.png rename to src/main/res/drawable-xxhdpi/ic_action_pause.png diff --git a/res/drawable-xxhdpi/ic_action_play.png b/src/main/res/drawable-xxhdpi/ic_action_play.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_play.png rename to src/main/res/drawable-xxhdpi/ic_action_play.png diff --git a/res/drawable-xxhdpi/ic_action_previous.png b/src/main/res/drawable-xxhdpi/ic_action_previous.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_previous.png rename to src/main/res/drawable-xxhdpi/ic_action_previous.png diff --git a/res/drawable-xxhdpi/ic_action_repeat.png b/src/main/res/drawable-xxhdpi/ic_action_repeat.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_repeat.png rename to src/main/res/drawable-xxhdpi/ic_action_repeat.png diff --git a/res/drawable-xxhdpi/ic_action_shuffle.png b/src/main/res/drawable-xxhdpi/ic_action_shuffle.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_shuffle.png rename to src/main/res/drawable-xxhdpi/ic_action_shuffle.png diff --git a/res/drawable-xxhdpi/ic_doc_album.png b/src/main/res/drawable-xxhdpi/ic_doc_album.png similarity index 100% rename from res/drawable-xxhdpi/ic_doc_album.png rename to src/main/res/drawable-xxhdpi/ic_doc_album.png diff --git a/res/drawable-xxhdpi/ic_doc_audio_am.png b/src/main/res/drawable-xxhdpi/ic_doc_audio_am.png similarity index 100% rename from res/drawable-xxhdpi/ic_doc_audio_am.png rename to src/main/res/drawable-xxhdpi/ic_doc_audio_am.png diff --git a/res/drawable-xxhdpi/ic_doc_image.png b/src/main/res/drawable-xxhdpi/ic_doc_image.png similarity index 100% rename from res/drawable-xxhdpi/ic_doc_image.png rename to src/main/res/drawable-xxhdpi/ic_doc_image.png diff --git a/res/drawable-xxhdpi/ic_doc_video_am.png b/src/main/res/drawable-xxhdpi/ic_doc_video_am.png similarity index 100% rename from res/drawable-xxhdpi/ic_doc_video_am.png rename to src/main/res/drawable-xxhdpi/ic_doc_video_am.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_root_folder_am.png b/src/main/res/drawable-xxhdpi/ic_root_folder_am.png similarity index 100% rename from res/drawable-xxhdpi/ic_root_folder_am.png rename to src/main/res/drawable-xxhdpi/ic_root_folder_am.png diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxxhdpi/ic_launcher.png rename to src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml similarity index 100% rename from res/layout/activity_main.xml rename to src/main/res/layout/activity_main.xml diff --git a/res/layout/list_item.xml b/src/main/res/layout/list_item.xml similarity index 100% rename from res/layout/list_item.xml rename to src/main/res/layout/list_item.xml diff --git a/res/layout/route_fragment.xml b/src/main/res/layout/route_fragment.xml similarity index 100% rename from res/layout/route_fragment.xml rename to src/main/res/layout/route_fragment.xml diff --git a/res/layout/server_fragment.xml b/src/main/res/layout/server_fragment.xml similarity index 100% rename from res/layout/server_fragment.xml rename to src/main/res/layout/server_fragment.xml diff --git a/res/menu/menu.xml b/src/main/res/menu/menu.xml similarity index 100% rename from res/menu/menu.xml rename to src/main/res/menu/menu.xml diff --git a/res/values/arrays.xml b/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to src/main/res/values/arrays.xml diff --git a/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to src/main/res/values/colors.xml diff --git a/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to src/main/res/values/styles.xml diff --git a/res/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to src/main/res/xml/preferences.xml