diff --git a/droidklavier/.gitignore b/app/.gitignore similarity index 100% rename from droidklavier/.gitignore rename to app/.gitignore diff --git a/droidklavier/build.gradle b/app/build.gradle similarity index 91% rename from droidklavier/build.gradle rename to app/build.gradle index 2428eeb..b0afde3 100644 --- a/droidklavier/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "25" defaultConfig { - applicationId "org.droidklavier.Droidklavier" + applicationId "org.droidklavier" minSdkVersion 19 targetSdkVersion 23 versionCode 5 diff --git a/droidklavier/libs/bouncycastle.jar b/app/libs/bouncycastle.jar similarity index 100% rename from droidklavier/libs/bouncycastle.jar rename to app/libs/bouncycastle.jar diff --git a/droidklavier/libs/clink210.jar b/app/libs/clink210.jar similarity index 100% rename from droidklavier/libs/clink210.jar rename to app/libs/clink210.jar diff --git a/droidklavier/libs/pg74.216.jdbc3.jar b/app/libs/pg74.216.jdbc3.jar similarity index 100% rename from droidklavier/libs/pg74.216.jdbc3.jar rename to app/libs/pg74.216.jdbc3.jar diff --git a/droidklavier/proguard-rules.txt b/app/proguard-rules.txt similarity index 100% rename from droidklavier/proguard-rules.txt rename to app/proguard-rules.txt diff --git a/droidklavier/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from droidklavier/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/droidklavier/src/main/java/org/droidklavier/Droidklavier.java b/app/src/main/java/org/droidklavier/Droidklavier.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/Droidklavier.java rename to app/src/main/java/org/droidklavier/Droidklavier.java diff --git a/droidklavier/src/main/java/org/droidklavier/activity/AlbumList.java b/app/src/main/java/org/droidklavier/activity/AlbumList.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/activity/AlbumList.java rename to app/src/main/java/org/droidklavier/activity/AlbumList.java diff --git a/droidklavier/src/main/java/org/droidklavier/activity/Player.java b/app/src/main/java/org/droidklavier/activity/Player.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/activity/Player.java rename to app/src/main/java/org/droidklavier/activity/Player.java diff --git a/droidklavier/src/main/java/org/droidklavier/activity/SettingsActivity.java b/app/src/main/java/org/droidklavier/activity/SettingsActivity.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/activity/SettingsActivity.java rename to app/src/main/java/org/droidklavier/activity/SettingsActivity.java diff --git a/droidklavier/src/main/java/org/droidklavier/activity/SongList.java b/app/src/main/java/org/droidklavier/activity/SongList.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/activity/SongList.java rename to app/src/main/java/org/droidklavier/activity/SongList.java diff --git a/droidklavier/src/main/java/org/droidklavier/crypto/Crypto.java b/app/src/main/java/org/droidklavier/crypto/Crypto.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/crypto/Crypto.java rename to app/src/main/java/org/droidklavier/crypto/Crypto.java diff --git a/droidklavier/src/main/java/org/droidklavier/db/Album.java b/app/src/main/java/org/droidklavier/db/Album.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/db/Album.java rename to app/src/main/java/org/droidklavier/db/Album.java diff --git a/droidklavier/src/main/java/org/droidklavier/db/DAO.java b/app/src/main/java/org/droidklavier/db/DAO.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/db/DAO.java rename to app/src/main/java/org/droidklavier/db/DAO.java diff --git a/droidklavier/src/main/java/org/droidklavier/db/DBClient.java b/app/src/main/java/org/droidklavier/db/DBClient.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/db/DBClient.java rename to app/src/main/java/org/droidklavier/db/DBClient.java diff --git a/droidklavier/src/main/java/org/droidklavier/db/Song.java b/app/src/main/java/org/droidklavier/db/Song.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/db/Song.java rename to app/src/main/java/org/droidklavier/db/Song.java diff --git a/droidklavier/src/main/java/org/droidklavier/dialog/BalanceDialog.java b/app/src/main/java/org/droidklavier/dialog/BalanceDialog.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/dialog/BalanceDialog.java rename to app/src/main/java/org/droidklavier/dialog/BalanceDialog.java diff --git a/droidklavier/src/main/java/org/droidklavier/dialog/ConnectDialog.java b/app/src/main/java/org/droidklavier/dialog/ConnectDialog.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/dialog/ConnectDialog.java rename to app/src/main/java/org/droidklavier/dialog/ConnectDialog.java diff --git a/droidklavier/src/main/java/org/droidklavier/dialog/MainVolumeDialog.java b/app/src/main/java/org/droidklavier/dialog/MainVolumeDialog.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/dialog/MainVolumeDialog.java rename to app/src/main/java/org/droidklavier/dialog/MainVolumeDialog.java diff --git a/droidklavier/src/main/java/org/droidklavier/dialog/SearchDialog.java b/app/src/main/java/org/droidklavier/dialog/SearchDialog.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/dialog/SearchDialog.java rename to app/src/main/java/org/droidklavier/dialog/SearchDialog.java diff --git a/droidklavier/src/main/java/org/droidklavier/rc/RC.java b/app/src/main/java/org/droidklavier/rc/RC.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/rc/RC.java rename to app/src/main/java/org/droidklavier/rc/RC.java diff --git a/droidklavier/src/main/java/org/droidklavier/rc/VolStatus.java b/app/src/main/java/org/droidklavier/rc/VolStatus.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/rc/VolStatus.java rename to app/src/main/java/org/droidklavier/rc/VolStatus.java diff --git a/droidklavier/src/main/java/org/droidklavier/tcp/TCPClient.java b/app/src/main/java/org/droidklavier/tcp/TCPClient.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/tcp/TCPClient.java rename to app/src/main/java/org/droidklavier/tcp/TCPClient.java diff --git a/droidklavier/src/main/java/org/droidklavier/tcp/TCPHandler.java b/app/src/main/java/org/droidklavier/tcp/TCPHandler.java similarity index 100% rename from droidklavier/src/main/java/org/droidklavier/tcp/TCPHandler.java rename to app/src/main/java/org/droidklavier/tcp/TCPHandler.java diff --git a/droidklavier/src/main/res/drawable-hdpi/acoustic.png b/app/src/main/res/drawable-hdpi/acoustic.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/acoustic.png rename to app/src/main/res/drawable-hdpi/acoustic.png diff --git a/droidklavier/src/main/res/drawable-hdpi/balance.png b/app/src/main/res/drawable-hdpi/balance.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/balance.png rename to app/src/main/res/drawable-hdpi/balance.png diff --git a/droidklavier/src/main/res/drawable-hdpi/ic_menu_preferences.png b/app/src/main/res/drawable-hdpi/ic_menu_preferences.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/ic_menu_preferences.png rename to app/src/main/res/drawable-hdpi/ic_menu_preferences.png diff --git a/droidklavier/src/main/res/drawable-hdpi/ic_menu_refresh.png b/app/src/main/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/ic_menu_refresh.png rename to app/src/main/res/drawable-hdpi/ic_menu_refresh.png diff --git a/droidklavier/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/icon.png rename to app/src/main/res/drawable-hdpi/icon.png diff --git a/droidklavier/src/main/res/drawable-hdpi/library.png b/app/src/main/res/drawable-hdpi/library.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/library.png rename to app/src/main/res/drawable-hdpi/library.png diff --git a/droidklavier/src/main/res/drawable-hdpi/next.png b/app/src/main/res/drawable-hdpi/next.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/next.png rename to app/src/main/res/drawable-hdpi/next.png diff --git a/droidklavier/src/main/res/drawable-hdpi/pause.png b/app/src/main/res/drawable-hdpi/pause.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/pause.png rename to app/src/main/res/drawable-hdpi/pause.png diff --git a/droidklavier/src/main/res/drawable-hdpi/play.png b/app/src/main/res/drawable-hdpi/play.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/play.png rename to app/src/main/res/drawable-hdpi/play.png diff --git a/droidklavier/src/main/res/drawable-hdpi/previous.png b/app/src/main/res/drawable-hdpi/previous.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/previous.png rename to app/src/main/res/drawable-hdpi/previous.png diff --git a/droidklavier/src/main/res/drawable-hdpi/quiet.png b/app/src/main/res/drawable-hdpi/quiet.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/quiet.png rename to app/src/main/res/drawable-hdpi/quiet.png diff --git a/droidklavier/src/main/res/drawable-hdpi/search.png b/app/src/main/res/drawable-hdpi/search.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/search.png rename to app/src/main/res/drawable-hdpi/search.png diff --git a/droidklavier/src/main/res/drawable-hdpi/volume.png b/app/src/main/res/drawable-hdpi/volume.png similarity index 100% rename from droidklavier/src/main/res/drawable-hdpi/volume.png rename to app/src/main/res/drawable-hdpi/volume.png diff --git a/droidklavier/src/main/res/drawable-ldpi/balance.png b/app/src/main/res/drawable-ldpi/balance.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/balance.png rename to app/src/main/res/drawable-ldpi/balance.png diff --git a/droidklavier/src/main/res/drawable-ldpi/ic_menu_preferences.png b/app/src/main/res/drawable-ldpi/ic_menu_preferences.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/ic_menu_preferences.png rename to app/src/main/res/drawable-ldpi/ic_menu_preferences.png diff --git a/droidklavier/src/main/res/drawable-ldpi/ic_menu_refresh.png b/app/src/main/res/drawable-ldpi/ic_menu_refresh.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/ic_menu_refresh.png rename to app/src/main/res/drawable-ldpi/ic_menu_refresh.png diff --git a/droidklavier/src/main/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/icon.png rename to app/src/main/res/drawable-ldpi/icon.png diff --git a/droidklavier/src/main/res/drawable-ldpi/lirbary.png b/app/src/main/res/drawable-ldpi/lirbary.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/lirbary.png rename to app/src/main/res/drawable-ldpi/lirbary.png diff --git a/droidklavier/src/main/res/drawable-ldpi/next.png b/app/src/main/res/drawable-ldpi/next.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/next.png rename to app/src/main/res/drawable-ldpi/next.png diff --git a/droidklavier/src/main/res/drawable-ldpi/pause.png b/app/src/main/res/drawable-ldpi/pause.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/pause.png rename to app/src/main/res/drawable-ldpi/pause.png diff --git a/droidklavier/src/main/res/drawable-ldpi/play.png b/app/src/main/res/drawable-ldpi/play.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/play.png rename to app/src/main/res/drawable-ldpi/play.png diff --git a/droidklavier/src/main/res/drawable-ldpi/previous.png b/app/src/main/res/drawable-ldpi/previous.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/previous.png rename to app/src/main/res/drawable-ldpi/previous.png diff --git a/droidklavier/src/main/res/drawable-ldpi/search.png b/app/src/main/res/drawable-ldpi/search.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/search.png rename to app/src/main/res/drawable-ldpi/search.png diff --git a/droidklavier/src/main/res/drawable-ldpi/volume.png b/app/src/main/res/drawable-ldpi/volume.png similarity index 100% rename from droidklavier/src/main/res/drawable-ldpi/volume.png rename to app/src/main/res/drawable-ldpi/volume.png diff --git a/droidklavier/src/main/res/drawable-mdpi/acoustic.png b/app/src/main/res/drawable-mdpi/acoustic.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/acoustic.png rename to app/src/main/res/drawable-mdpi/acoustic.png diff --git a/droidklavier/src/main/res/drawable-mdpi/balance.png b/app/src/main/res/drawable-mdpi/balance.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/balance.png rename to app/src/main/res/drawable-mdpi/balance.png diff --git a/droidklavier/src/main/res/drawable-mdpi/ic_menu_preferences.png b/app/src/main/res/drawable-mdpi/ic_menu_preferences.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/ic_menu_preferences.png rename to app/src/main/res/drawable-mdpi/ic_menu_preferences.png diff --git a/droidklavier/src/main/res/drawable-mdpi/ic_menu_refresh.png b/app/src/main/res/drawable-mdpi/ic_menu_refresh.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/ic_menu_refresh.png rename to app/src/main/res/drawable-mdpi/ic_menu_refresh.png diff --git a/droidklavier/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/icon.png rename to app/src/main/res/drawable-mdpi/icon.png diff --git a/droidklavier/src/main/res/drawable-mdpi/library.png b/app/src/main/res/drawable-mdpi/library.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/library.png rename to app/src/main/res/drawable-mdpi/library.png diff --git a/droidklavier/src/main/res/drawable-mdpi/next.png b/app/src/main/res/drawable-mdpi/next.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/next.png rename to app/src/main/res/drawable-mdpi/next.png diff --git a/droidklavier/src/main/res/drawable-mdpi/pause.png b/app/src/main/res/drawable-mdpi/pause.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/pause.png rename to app/src/main/res/drawable-mdpi/pause.png diff --git a/droidklavier/src/main/res/drawable-mdpi/play.png b/app/src/main/res/drawable-mdpi/play.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/play.png rename to app/src/main/res/drawable-mdpi/play.png diff --git a/droidklavier/src/main/res/drawable-mdpi/previous.png b/app/src/main/res/drawable-mdpi/previous.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/previous.png rename to app/src/main/res/drawable-mdpi/previous.png diff --git a/droidklavier/src/main/res/drawable-mdpi/quiet.png b/app/src/main/res/drawable-mdpi/quiet.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/quiet.png rename to app/src/main/res/drawable-mdpi/quiet.png diff --git a/droidklavier/src/main/res/drawable-mdpi/search.png b/app/src/main/res/drawable-mdpi/search.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/search.png rename to app/src/main/res/drawable-mdpi/search.png diff --git a/droidklavier/src/main/res/drawable-mdpi/volume.png b/app/src/main/res/drawable-mdpi/volume.png similarity index 100% rename from droidklavier/src/main/res/drawable-mdpi/volume.png rename to app/src/main/res/drawable-mdpi/volume.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/acoustic.png b/app/src/main/res/drawable-xhdpi/acoustic.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/acoustic.png rename to app/src/main/res/drawable-xhdpi/acoustic.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/balance.png b/app/src/main/res/drawable-xhdpi/balance.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/balance.png rename to app/src/main/res/drawable-xhdpi/balance.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/ic_menu_preferences.png b/app/src/main/res/drawable-xhdpi/ic_menu_preferences.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/ic_menu_preferences.png rename to app/src/main/res/drawable-xhdpi/ic_menu_preferences.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/ic_menu_refresh.png b/app/src/main/res/drawable-xhdpi/ic_menu_refresh.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/ic_menu_refresh.png rename to app/src/main/res/drawable-xhdpi/ic_menu_refresh.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/icon.png rename to app/src/main/res/drawable-xhdpi/icon.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/library.png b/app/src/main/res/drawable-xhdpi/library.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/library.png rename to app/src/main/res/drawable-xhdpi/library.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/next.png b/app/src/main/res/drawable-xhdpi/next.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/next.png rename to app/src/main/res/drawable-xhdpi/next.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/pause.png b/app/src/main/res/drawable-xhdpi/pause.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/pause.png rename to app/src/main/res/drawable-xhdpi/pause.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/play.png b/app/src/main/res/drawable-xhdpi/play.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/play.png rename to app/src/main/res/drawable-xhdpi/play.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/previous.png b/app/src/main/res/drawable-xhdpi/previous.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/previous.png rename to app/src/main/res/drawable-xhdpi/previous.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/quiet.png b/app/src/main/res/drawable-xhdpi/quiet.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/quiet.png rename to app/src/main/res/drawable-xhdpi/quiet.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/search.png b/app/src/main/res/drawable-xhdpi/search.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/search.png rename to app/src/main/res/drawable-xhdpi/search.png diff --git a/droidklavier/src/main/res/drawable-xhdpi/volume.png b/app/src/main/res/drawable-xhdpi/volume.png similarity index 100% rename from droidklavier/src/main/res/drawable-xhdpi/volume.png rename to app/src/main/res/drawable-xhdpi/volume.png diff --git a/droidklavier/src/main/res/drawable/btn_quiet.xml b/app/src/main/res/drawable/btn_quiet.xml similarity index 100% rename from droidklavier/src/main/res/drawable/btn_quiet.xml rename to app/src/main/res/drawable/btn_quiet.xml diff --git a/droidklavier/src/main/res/drawable/custom_button.xml b/app/src/main/res/drawable/custom_button.xml similarity index 100% rename from droidklavier/src/main/res/drawable/custom_button.xml rename to app/src/main/res/drawable/custom_button.xml diff --git a/droidklavier/src/main/res/drawable/ic_btn_songlist.png b/app/src/main/res/drawable/ic_btn_songlist.png similarity index 100% rename from droidklavier/src/main/res/drawable/ic_btn_songlist.png rename to app/src/main/res/drawable/ic_btn_songlist.png diff --git a/droidklavier/src/main/res/drawable/ic_folder.png b/app/src/main/res/drawable/ic_folder.png similarity index 100% rename from droidklavier/src/main/res/drawable/ic_folder.png rename to app/src/main/res/drawable/ic_folder.png diff --git a/droidklavier/src/main/res/drawable/ic_musical_note.png b/app/src/main/res/drawable/ic_musical_note.png similarity index 100% rename from droidklavier/src/main/res/drawable/ic_musical_note.png rename to app/src/main/res/drawable/ic_musical_note.png diff --git a/droidklavier/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml similarity index 100% rename from droidklavier/src/main/res/layout-land/main.xml rename to app/src/main/res/layout-land/main.xml diff --git a/droidklavier/src/main/res/layout/album_list.xml b/app/src/main/res/layout/album_list.xml similarity index 100% rename from droidklavier/src/main/res/layout/album_list.xml rename to app/src/main/res/layout/album_list.xml diff --git a/droidklavier/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml similarity index 100% rename from droidklavier/src/main/res/layout/album_list_item.xml rename to app/src/main/res/layout/album_list_item.xml diff --git a/droidklavier/src/main/res/layout/custom_title.xml b/app/src/main/res/layout/custom_title.xml similarity index 100% rename from droidklavier/src/main/res/layout/custom_title.xml rename to app/src/main/res/layout/custom_title.xml diff --git a/droidklavier/src/main/res/layout/fragment_balance.xml b/app/src/main/res/layout/fragment_balance.xml similarity index 100% rename from droidklavier/src/main/res/layout/fragment_balance.xml rename to app/src/main/res/layout/fragment_balance.xml diff --git a/droidklavier/src/main/res/layout/fragment_connect.xml b/app/src/main/res/layout/fragment_connect.xml similarity index 100% rename from droidklavier/src/main/res/layout/fragment_connect.xml rename to app/src/main/res/layout/fragment_connect.xml diff --git a/droidklavier/src/main/res/layout/fragment_main_volume.xml b/app/src/main/res/layout/fragment_main_volume.xml similarity index 100% rename from droidklavier/src/main/res/layout/fragment_main_volume.xml rename to app/src/main/res/layout/fragment_main_volume.xml diff --git a/droidklavier/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml similarity index 100% rename from droidklavier/src/main/res/layout/fragment_search.xml rename to app/src/main/res/layout/fragment_search.xml diff --git a/droidklavier/src/main/res/layout/list_position.xml b/app/src/main/res/layout/list_position.xml similarity index 100% rename from droidklavier/src/main/res/layout/list_position.xml rename to app/src/main/res/layout/list_position.xml diff --git a/droidklavier/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from droidklavier/src/main/res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/droidklavier/src/main/res/layout/song_list.xml b/app/src/main/res/layout/song_list.xml similarity index 100% rename from droidklavier/src/main/res/layout/song_list.xml rename to app/src/main/res/layout/song_list.xml diff --git a/droidklavier/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml similarity index 100% rename from droidklavier/src/main/res/layout/song_list_item.xml rename to app/src/main/res/layout/song_list_item.xml diff --git a/droidklavier/src/main/res/menu/option_menu.xml b/app/src/main/res/menu/option_menu.xml similarity index 100% rename from droidklavier/src/main/res/menu/option_menu.xml rename to app/src/main/res/menu/option_menu.xml diff --git a/droidklavier/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from droidklavier/src/main/res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/droidklavier/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from droidklavier/src/main/res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/droidklavier/src/main/res/values/color.xml b/app/src/main/res/values/color.xml similarity index 100% rename from droidklavier/src/main/res/values/color.xml rename to app/src/main/res/values/color.xml diff --git a/droidklavier/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from droidklavier/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/droidklavier/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from droidklavier/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/droidklavier/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from droidklavier/src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/settings.gradle b/settings.gradle index ad20a0c..e7b4def 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':droidklavier' +include ':app'