From c28a75c61a31a9868901d883b7bf5c9d98c3868e Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 5 Mar 2015 16:50:16 +0100 Subject: [PATCH] Renamed package to gramophone --- app/build.gradle | 2 +- app/manifest-merger-release-report.txt | 18 ++++----- .../ApplicationTest.java | 2 +- app/src/main/AndroidManifest.xml | 24 ++++++------ .../{materialmusic => gramophone}/App.java | 8 ++-- .../adapter/AlbumViewGridAdapter.java | 14 +++---- .../adapter/ArtistViewListAdapter.java | 8 ++-- .../adapter/NavigationDrawerItemAdapter.java | 8 ++-- .../adapter/PlayingQueueAdapter.java | 18 ++++----- .../adapter/SearchAdapter.java | 9 ++--- .../adapter/songadapter/SongAdapter.java | 16 ++++---- .../songadapter/SongViewListAdapter.java | 18 ++++----- .../comparator/AlbumAlphabeticComparator.java | 4 +- .../ArtistAlphabeticComparator.java | 4 +- .../comparator/SongAlphabeticComparator.java | 4 +- .../comparator/SongTrackNumberComparator.java | 4 +- .../helper/AboutDeveloperDialogHelper.java | 4 +- .../helper/MusicPlayerRemote.java | 16 ++++---- .../helper/PlayingNotificationHelper.java | 12 +++--- .../helper/PlayingQueueDialogHelper.java | 12 +++--- .../helper/ShuffleHelper.java | 4 +- .../helper/SongDetailDialogHelper.java | 8 ++-- .../interfaces/KabSearchAbleFragment.java | 2 +- .../interfaces/KabViewsDisableAble.java | 2 +- .../OnMusicRemoteEventListener.java | 4 +- .../lastfm/LastFMUtil.java | 2 +- .../lastfm/album/LastFMAlbumImageLoader.java | 8 ++-- .../lastfm/album/LastFMAlbumInfoUtil.java | 6 +-- .../artist/LastFMArtistBiographyLoader.java | 6 +-- .../artist/LastFMArtistImageLoader.java | 8 ++-- .../lastfm/artist/LastFMArtistInfoUtil.java | 6 +-- .../artist/LastFMArtistThumbnailLoader.java | 8 ++-- .../loader/AlbumLoader.java | 4 +- .../loader/AlbumSongLoader.java | 4 +- .../loader/ArtistAlbumLoader.java | 4 +- .../loader/ArtistLoader.java | 4 +- .../loader/ArtistSongLoader.java | 4 +- .../loader/SongFilePathLoader.java | 2 +- .../loader/SongLoader.java | 4 +- .../kabouzeid/gramophone/misc/AppKeys.java | 26 +++++++++++++ .../misc/SmallAnimatorListener.java | 2 +- .../SmallObservableScrollViewCallbacks.java | 2 +- .../misc/SmallOnGestureListener.java | 2 +- .../misc/SmallTransitionListener.java | 2 +- .../model/Album.java | 6 +-- .../model/Artist.java | 6 +-- .../model/MusicRemoteEvent.java | 2 +- .../model/NavigationDrawerItem.java | 2 +- .../model/SearchEntry.java | 2 +- .../model/Song.java | 6 +-- .../provider/AlbumJSONStore.java | 2 +- .../provider/ArtistJSONStore.java | 2 +- .../service/MediaButtonIntentReceiver.java | 2 +- .../service/MusicService.java | 34 ++++++++--------- .../ui/activities/AlbumDetailActivity.java | 36 +++++++++--------- .../ui/activities/ArtistDetailActivity.java | 34 ++++++++--------- .../ui/activities/MainActivity.java | 38 +++++++++---------- .../activities/MusicControllerActivity.java | 32 ++++++++-------- .../ui/activities/SearchActivity.java | 24 ++++++------ .../ui/activities/base/AbsBaseActivity.java | 20 +++++----- .../ui/activities/base/AbsFabActivity.java | 10 ++--- .../tageditor/AbsTagEditorActivity.java | 16 ++++---- .../tageditor/AlbumTagEditorActivity.java | 16 ++++---- .../tageditor/SongTagEditorActivity.java | 7 ++-- .../fragments/NavigationDrawerFragment.java | 12 +++--- .../AbsViewPagerTabArtistListFragment.java | 12 +++--- .../ViewPagerTabArtistAlbumFragment.java | 18 ++++----- .../ViewPagerTabArtistBioFragment.java | 6 +-- .../ViewPagerTabArtistSongListFragment.java | 12 +++--- .../AlbumViewFragment.java | 14 +++---- .../ArtistViewFragment.java | 21 +++++----- .../MainActivityFragment.java | 14 +++---- .../SongViewFragment.java | 16 ++++---- .../util/ImageLoaderUtil.java | 4 +- .../util/InternalStorageUtil.java | 2 +- .../util/MusicUtil.java | 2 +- .../util/Util.java | 8 ++-- .../util/ViewUtil.java | 2 +- .../view/SquareImageView.java | 2 +- .../kabouzeid/materialmusic/misc/AppKeys.java | 26 ------------- .../layout-land/activity_music_controller.xml | 2 +- .../res/layout/activity_album_tag_editor.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- .../res/layout/activity_music_controller.xml | 2 +- .../res/layout/activity_song_tag_editor.xml | 2 +- app/src/main/res/layout/album_tile.xml | 2 +- app/src/main/res/layout/item_artist_view.xml | 2 +- app/src/main/res/layout/item_search.xml | 2 +- app/src/main/res/layout/item_song_view.xml | 2 +- app/src/main/res/menu/menu_album_detail.xml | 2 +- app/src/main/res/menu/menu_artist_detail.xml | 2 +- app/src/main/res/menu/menu_search.xml | 2 +- app/src/main/res/menu/menu_tab_test.xml | 2 +- app/src/main/res/menu/menu_tag_editor.xml | 2 +- app/src/main/res/menu/menu_title_playing.xml | 2 +- 95 files changed, 412 insertions(+), 415 deletions(-) rename app/src/androidTest/java/com/kabouzeid/{materialmusic => gramophone}/ApplicationTest.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/App.java (91%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/AlbumViewGridAdapter.java (92%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/ArtistViewListAdapter.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/NavigationDrawerItemAdapter.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/PlayingQueueAdapter.java (88%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/SearchAdapter.java (88%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/songadapter/SongAdapter.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/adapter/songadapter/SongViewListAdapter.java (86%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/comparator/AlbumAlphabeticComparator.java (74%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/comparator/ArtistAlphabeticComparator.java (74%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/comparator/SongAlphabeticComparator.java (74%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/comparator/SongTrackNumberComparator.java (83%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/AboutDeveloperDialogHelper.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/MusicPlayerRemote.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/PlayingNotificationHelper.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/PlayingQueueDialogHelper.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/ShuffleHelper.java (83%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/helper/SongDetailDialogHelper.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/interfaces/KabSearchAbleFragment.java (77%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/interfaces/KabViewsDisableAble.java (79%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/interfaces/OnMusicRemoteEventListener.java (58%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/LastFMUtil.java (82%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/album/LastFMAlbumImageLoader.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/album/LastFMAlbumInfoUtil.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/artist/LastFMArtistBiographyLoader.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/artist/LastFMArtistImageLoader.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/artist/LastFMArtistInfoUtil.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/lastfm/artist/LastFMArtistThumbnailLoader.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/AlbumLoader.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/AlbumSongLoader.java (96%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/ArtistAlbumLoader.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/ArtistLoader.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/ArtistSongLoader.java (96%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/SongFilePathLoader.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/loader/SongLoader.java (97%) create mode 100644 app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/misc/SmallAnimatorListener.java (93%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/misc/SmallObservableScrollViewCallbacks.java (92%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/misc/SmallOnGestureListener.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/misc/SmallTransitionListener.java (93%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/Album.java (89%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/Artist.java (90%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/MusicRemoteEvent.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/NavigationDrawerItem.java (85%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/SearchEntry.java (86%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/model/Song.java (91%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/provider/AlbumJSONStore.java (98%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/provider/ArtistJSONStore.java (98%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/service/MediaButtonIntentReceiver.java (98%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/service/MusicService.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/AlbumDetailActivity.java (93%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/ArtistDetailActivity.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/MainActivity.java (90%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/MusicControllerActivity.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/SearchActivity.java (91%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/base/AbsBaseActivity.java (87%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/base/AbsFabActivity.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/tageditor/AbsTagEditorActivity.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/tageditor/AlbumTagEditorActivity.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/activities/tageditor/SongTagEditorActivity.java (94%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/NavigationDrawerFragment.java (95%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java (93%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java (85%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java (93%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java (74%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/mainactivityfragments/AlbumViewFragment.java (88%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/mainactivityfragments/ArtistViewFragment.java (84%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/mainactivityfragments/MainActivityFragment.java (80%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/ui/fragments/mainactivityfragments/SongViewFragment.java (86%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/util/ImageLoaderUtil.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/util/InternalStorageUtil.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/util/MusicUtil.java (98%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/util/Util.java (97%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/util/ViewUtil.java (98%) rename app/src/main/java/com/kabouzeid/{materialmusic => gramophone}/view/SquareImageView.java (94%) delete mode 100644 app/src/main/java/com/kabouzeid/materialmusic/misc/AppKeys.java diff --git a/app/build.gradle b/app/build.gradle index 6007a2b8..0d0ac07f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { buildToolsVersion "21.1.2" defaultConfig { - applicationId "com.kabouzeid.materialmusic" + applicationId "com.kabouzeid.gramophone" minSdkVersion 16 targetSdkVersion 21 versionCode 1 diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt index 9940dd67..22dce5e1 100644 --- a/app/manifest-merger-release-report.txt +++ b/app/manifest-merger-release-report.txt @@ -74,7 +74,7 @@ MERGED from com.android.support:support-v4:21.0.3:16:5 ADDED from AndroidManifest.xml:16:9 android:name ADDED from AndroidManifest.xml:12:9 -activity#com.kabouzeid.materialmusic.ui.activities.MainActivity +activity#gramophone.ui.activities.MainActivity ADDED from AndroidManifest.xml:17:9 android:label ADDED from AndroidManifest.xml:19:13 @@ -90,27 +90,27 @@ category#android.intent.category.LAUNCHER ADDED from AndroidManifest.xml:23:17 android:name ADDED from AndroidManifest.xml:23:27 -activity#com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity +activity#gramophone.ui.activities.AlbumDetailActivity ADDED from AndroidManifest.xml:26:9 android:name ADDED from AndroidManifest.xml:26:19 -activity#com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity +activity#gramophone.ui.activities.ArtistDetailActivity ADDED from AndroidManifest.xml:28:9 android:name ADDED from AndroidManifest.xml:28:19 -activity#com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity +activity#gramophone.ui.activities.MusicControllerActivity ADDED from AndroidManifest.xml:30:9 android:parentActivityName ADDED from AndroidManifest.xml:32:13 android:name ADDED from AndroidManifest.xml:31:13 -service#com.kabouzeid.materialmusic.service.MusicService +service#gramophone.service.MusicService ADDED from AndroidManifest.xml:35:9 android:enabled ADDED from AndroidManifest.xml:37:13 android:name ADDED from AndroidManifest.xml:36:13 -receiver#com.kabouzeid.materialmusic.service.MediaButtonIntentReceiver +receiver#gramophone.service.MediaButtonIntentReceiver ADDED from AndroidManifest.xml:40:9 android:name ADDED from AndroidManifest.xml:40:19 @@ -126,7 +126,7 @@ ADDED from AndroidManifest.xml:46:9 ADDED from AndroidManifest.xml:48:13 android:name ADDED from AndroidManifest.xml:47:13 -activity#com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity +activity#gramophone.ui.activities.tageditor.SongTagEditorActivity ADDED from AndroidManifest.xml:50:9 android:label ADDED from AndroidManifest.xml:52:13 @@ -134,13 +134,13 @@ ADDED from AndroidManifest.xml:50:9 ADDED from AndroidManifest.xml:53:13 android:name ADDED from AndroidManifest.xml:51:13 -activity#com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity +activity#gramophone.ui.activities.tageditor.AlbumTagEditorActivity ADDED from AndroidManifest.xml:55:9 android:label ADDED from AndroidManifest.xml:57:13 android:name ADDED from AndroidManifest.xml:56:13 -activity#com.kabouzeid.materialmusic.ui.activities.SearchActivity +activity#gramophone.ui.activities.SearchActivity ADDED from AndroidManifest.xml:59:9 android:label ADDED from AndroidManifest.xml:61:13 diff --git a/app/src/androidTest/java/com/kabouzeid/materialmusic/ApplicationTest.java b/app/src/androidTest/java/com/kabouzeid/gramophone/ApplicationTest.java similarity index 89% rename from app/src/androidTest/java/com/kabouzeid/materialmusic/ApplicationTest.java rename to app/src/androidTest/java/com/kabouzeid/gramophone/ApplicationTest.java index 59b8d703..57e2b4d6 100644 --- a/app/src/androidTest/java/com/kabouzeid/materialmusic/ApplicationTest.java +++ b/app/src/androidTest/java/com/kabouzeid/gramophone/ApplicationTest.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic; +package com.kabouzeid.gramophone; import android.app.Application; import android.test.ApplicationTestCase; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b97384c9..ee756d26 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.kabouzeid.gramophone" > @@ -9,13 +9,13 @@ @@ -23,21 +23,21 @@ - + - + + android:name="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity" + android:parentActivityName="com.kabouzeid.gramophone.ui.activities.MainActivity" > - + @@ -48,16 +48,16 @@ android:value="b23725bd3d266aa65c5a3dd1816b2f801524a189" /> diff --git a/app/src/main/java/com/kabouzeid/materialmusic/App.java b/app/src/main/java/com/kabouzeid/gramophone/App.java similarity index 91% rename from app/src/main/java/com/kabouzeid/materialmusic/App.java rename to app/src/main/java/com/kabouzeid/gramophone/App.java index 144819d1..ac23aafc 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/App.java +++ b/app/src/main/java/com/kabouzeid/gramophone/App.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic; +package com.kabouzeid.gramophone; import android.app.Application; import android.content.SharedPreferences; @@ -9,9 +9,9 @@ import com.android.volley.Request; import com.android.volley.RequestQueue; import com.android.volley.toolbox.Volley; import com.crashlytics.android.Crashlytics; -import com.kabouzeid.materialmusic.helper.MusicPlayerRemote; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.helper.MusicPlayerRemote; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; import io.fabric.sdk.android.Fabric; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumViewGridAdapter.java similarity index 92% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumViewGridAdapter.java index fe1270c9..4853a5a5 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/AlbumViewGridAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumViewGridAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter; +package com.kabouzeid.gramophone.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -9,12 +9,12 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.model.Album; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; -import com.kabouzeid.materialmusic.view.SquareImageView; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.model.Album; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; +import com.kabouzeid.gramophone.view.SquareImageView; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/ArtistViewListAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/ArtistViewListAdapter.java similarity index 89% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/ArtistViewListAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/ArtistViewListAdapter.java index 37d1488a..2e1931d3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/ArtistViewListAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/ArtistViewListAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter; +package com.kabouzeid.gramophone.adapter; import android.content.Context; import android.graphics.Bitmap; @@ -9,9 +9,9 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.lastfm.artist.LastFMArtistThumbnailLoader; -import com.kabouzeid.materialmusic.model.Artist; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistThumbnailLoader; +import com.kabouzeid.gramophone.model.Artist; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/NavigationDrawerItemAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java similarity index 89% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/NavigationDrawerItemAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java index e2e82a76..043b13d9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/NavigationDrawerItemAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/NavigationDrawerItemAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter; +package com.kabouzeid.gramophone.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,9 +8,9 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.model.NavigationDrawerItem; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.model.NavigationDrawerItem; +import com.kabouzeid.gramophone.util.Util; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/PlayingQueueAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java similarity index 88% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/PlayingQueueAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java index e95a0254..4e18bf42 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/PlayingQueueAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlayingQueueAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter; +package com.kabouzeid.gramophone.adapter; import android.content.Context; import android.content.Intent; @@ -11,14 +11,14 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.songadapter.SongAdapter; -import com.kabouzeid.materialmusic.helper.SongDetailDialogHelper; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter; +import com.kabouzeid.gramophone.helper.SongDetailDialogHelper; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java similarity index 88% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java index 13995bed..b3a0832f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/SearchAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter; +package com.kabouzeid.gramophone.adapter; import android.content.Context; import android.graphics.Color; @@ -10,10 +10,9 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.model.SearchEntry; -import com.kabouzeid.materialmusic.ui.activities.SearchActivity; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.model.SearchEntry; +import com.kabouzeid.gramophone.ui.activities.SearchActivity; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java similarity index 89% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java index c2f310ab..8ab21310 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter.songadapter; +package com.kabouzeid.gramophone.adapter.songadapter; import android.content.Context; import android.content.Intent; @@ -11,13 +11,13 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.helper.SongDetailDialogHelper; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.SongDetailDialogHelper; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity; +import com.kabouzeid.gramophone.util.MusicUtil; import java.io.File; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongViewListAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongViewListAdapter.java similarity index 86% rename from app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongViewListAdapter.java rename to app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongViewListAdapter.java index 484c07bd..086a6a5b 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/adapter/songadapter/SongViewListAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/SongViewListAdapter.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.adapter.songadapter; +package com.kabouzeid.gramophone.adapter.songadapter; import android.content.Context; import android.content.Intent; @@ -10,14 +10,14 @@ import android.widget.ImageView; import android.widget.PopupMenu; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.helper.SongDetailDialogHelper; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.SongDetailDialogHelper; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.util.MusicUtil; import com.nostra13.universalimageloader.core.ImageLoader; import java.io.File; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/comparator/AlbumAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java similarity index 74% rename from app/src/main/java/com/kabouzeid/materialmusic/comparator/AlbumAlphabeticComparator.java rename to app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java index 7a5a91eb..05fd6ac9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/comparator/AlbumAlphabeticComparator.java +++ b/app/src/main/java/com/kabouzeid/gramophone/comparator/AlbumAlphabeticComparator.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.comparator; +package com.kabouzeid.gramophone.comparator; -import com.kabouzeid.materialmusic.model.Album; +import com.kabouzeid.gramophone.model.Album; import java.util.Comparator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/comparator/ArtistAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java similarity index 74% rename from app/src/main/java/com/kabouzeid/materialmusic/comparator/ArtistAlphabeticComparator.java rename to app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java index 8ce27f05..55209fe9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/comparator/ArtistAlphabeticComparator.java +++ b/app/src/main/java/com/kabouzeid/gramophone/comparator/ArtistAlphabeticComparator.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.comparator; +package com.kabouzeid.gramophone.comparator; -import com.kabouzeid.materialmusic.model.Artist; +import com.kabouzeid.gramophone.model.Artist; import java.util.Comparator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/comparator/SongAlphabeticComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java similarity index 74% rename from app/src/main/java/com/kabouzeid/materialmusic/comparator/SongAlphabeticComparator.java rename to app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java index 09040db3..c7ff301d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/comparator/SongAlphabeticComparator.java +++ b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongAlphabeticComparator.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.comparator; +package com.kabouzeid.gramophone.comparator; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.Comparator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/comparator/SongTrackNumberComparator.java b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java similarity index 83% rename from app/src/main/java/com/kabouzeid/materialmusic/comparator/SongTrackNumberComparator.java rename to app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java index 0765d522..220e2baa 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/comparator/SongTrackNumberComparator.java +++ b/app/src/main/java/com/kabouzeid/gramophone/comparator/SongTrackNumberComparator.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.comparator; +package com.kabouzeid.gramophone.comparator; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.Comparator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/AboutDeveloperDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/AboutDeveloperDialogHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java index 58e1cd7c..02387fb3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/AboutDeveloperDialogHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; import android.content.Context; import android.content.pm.PackageManager; import android.util.Log; import com.afollestad.materialdialogs.MaterialDialog; -import com.kabouzeid.materialmusic.R; +import com.kabouzeid.gramophone.R; /** * Created by karim on 05.02.15. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/MusicPlayerRemote.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/MusicPlayerRemote.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java index b7ad9410..82c7a2af 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/MusicPlayerRemote.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; import android.content.ComponentName; import android.content.Context; @@ -7,13 +7,13 @@ import android.content.ServiceConnection; import android.os.IBinder; import android.util.Log; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.service.MusicService; -import com.kabouzeid.materialmusic.util.InternalStorageUtil; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.service.MusicService; +import com.kabouzeid.gramophone.util.InternalStorageUtil; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingNotificationHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java index 53bfac78..7d2bc664 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingNotificationHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; /** * Created by karim on 27.12.14. @@ -15,11 +15,11 @@ import android.graphics.Bitmap; import android.support.v4.app.NotificationCompat; import android.widget.RemoteViews; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.service.MusicService; -import com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.service.MusicService; +import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity; +import com.kabouzeid.gramophone.util.MusicUtil; import com.nostra13.universalimageloader.core.ImageLoader; public class PlayingNotificationHelper { diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingQueueDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java similarity index 89% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingQueueDialogHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java index 66075554..6cb97836 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/PlayingQueueDialogHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java @@ -1,15 +1,15 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; import android.content.Context; import android.view.View; import android.widget.AdapterView; import com.afollestad.materialdialogs.MaterialDialog; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.PlayingQueueAdapter; -import com.kabouzeid.materialmusic.adapter.songadapter.SongAdapter; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.PlayingQueueAdapter; +import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter; +import com.kabouzeid.gramophone.model.Song; import com.mobeta.android.dslv.DragSortListView; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/ShuffleHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java similarity index 83% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/ShuffleHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java index 6fc21740..865aaf98 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/ShuffleHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/helper/SongDetailDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/SongDetailDialogHelper.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/helper/SongDetailDialogHelper.java rename to app/src/main/java/com/kabouzeid/gramophone/helper/SongDetailDialogHelper.java index a8485e02..fcffb921 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/helper/SongDetailDialogHelper.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/SongDetailDialogHelper.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.helper; +package com.kabouzeid.gramophone.helper; import android.content.Context; import android.text.Html; @@ -8,9 +8,9 @@ import android.view.View; import android.widget.TextView; import com.afollestad.materialdialogs.MaterialDialog; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; import org.jaudiotagger.audio.AudioFile; import org.jaudiotagger.audio.AudioFileIO; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabSearchAbleFragment.java b/app/src/main/java/com/kabouzeid/gramophone/interfaces/KabSearchAbleFragment.java similarity index 77% rename from app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabSearchAbleFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/interfaces/KabSearchAbleFragment.java index b74cfe53..0fb54cbf 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabSearchAbleFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/interfaces/KabSearchAbleFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.interfaces; +package com.kabouzeid.gramophone.interfaces; /** * Created by karim on 29.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabViewsDisableAble.java b/app/src/main/java/com/kabouzeid/gramophone/interfaces/KabViewsDisableAble.java similarity index 79% rename from app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabViewsDisableAble.java rename to app/src/main/java/com/kabouzeid/gramophone/interfaces/KabViewsDisableAble.java index 9703383d..c8e795b4 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/KabViewsDisableAble.java +++ b/app/src/main/java/com/kabouzeid/gramophone/interfaces/KabViewsDisableAble.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.interfaces; +package com.kabouzeid.gramophone.interfaces; /** * Created by karim on 23.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/OnMusicRemoteEventListener.java b/app/src/main/java/com/kabouzeid/gramophone/interfaces/OnMusicRemoteEventListener.java similarity index 58% rename from app/src/main/java/com/kabouzeid/materialmusic/interfaces/OnMusicRemoteEventListener.java rename to app/src/main/java/com/kabouzeid/gramophone/interfaces/OnMusicRemoteEventListener.java index 8d931d2a..7456e47f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/interfaces/OnMusicRemoteEventListener.java +++ b/app/src/main/java/com/kabouzeid/gramophone/interfaces/OnMusicRemoteEventListener.java @@ -1,6 +1,6 @@ -package com.kabouzeid.materialmusic.interfaces; +package com.kabouzeid.gramophone.interfaces; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; /** * Created by karim on 19.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/LastFMUtil.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/LastFMUtil.java similarity index 82% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/LastFMUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/LastFMUtil.java index c58900a1..d829b4a3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/LastFMUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/LastFMUtil.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.lastfm; +package com.kabouzeid.gramophone.lastfm; /** * Created by karim on 15.01.15. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumImageLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumImageLoader.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumImageLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumImageLoader.java index 841f1517..9ed6adb8 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumImageLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumImageLoader.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.lastfm.album; +package com.kabouzeid.gramophone.lastfm.album; import android.content.Context; import android.graphics.Bitmap; @@ -8,9 +8,9 @@ import android.view.View; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.provider.AlbumJSONStore; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.provider.AlbumJSONStore; +import com.kabouzeid.gramophone.util.Util; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumInfoUtil.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumInfoUtil.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumInfoUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumInfoUtil.java index 02849be9..f3ea7a8e 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/album/LastFMAlbumInfoUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/album/LastFMAlbumInfoUtil.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.lastfm.album; +package com.kabouzeid.gramophone.lastfm.album; import android.content.Context; import android.net.Uri; import android.util.Log; -import com.kabouzeid.materialmusic.lastfm.LastFMUtil; -import com.kabouzeid.materialmusic.provider.AlbumJSONStore; +import com.kabouzeid.gramophone.lastfm.LastFMUtil; +import com.kabouzeid.gramophone.provider.AlbumJSONStore; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistBiographyLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistBiographyLoader.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistBiographyLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistBiographyLoader.java index 22519de1..d67afeab 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistBiographyLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistBiographyLoader.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.lastfm.artist; +package com.kabouzeid.gramophone.lastfm.artist; import android.content.Context; import android.util.Log; @@ -6,8 +6,8 @@ import android.util.Log; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.provider.ArtistJSONStore; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.provider.ArtistJSONStore; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistImageLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageLoader.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistImageLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageLoader.java index 51d9f1aa..7f64bd41 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistImageLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistImageLoader.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.lastfm.artist; +package com.kabouzeid.gramophone.lastfm.artist; import android.content.Context; import android.graphics.Bitmap; @@ -8,9 +8,9 @@ import android.view.View; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.provider.ArtistJSONStore; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.provider.ArtistJSONStore; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistInfoUtil.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistInfoUtil.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistInfoUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistInfoUtil.java index 11ae10b2..7866418d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistInfoUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistInfoUtil.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.lastfm.artist; +package com.kabouzeid.gramophone.lastfm.artist; import android.content.Context; import android.net.Uri; import android.util.Log; -import com.kabouzeid.materialmusic.lastfm.LastFMUtil; -import com.kabouzeid.materialmusic.provider.ArtistJSONStore; +import com.kabouzeid.gramophone.lastfm.LastFMUtil; +import com.kabouzeid.gramophone.provider.ArtistJSONStore; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistThumbnailLoader.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailLoader.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistThumbnailLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailLoader.java index a96b3c88..f9157ad7 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/lastfm/artist/LastFMArtistThumbnailLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/artist/LastFMArtistThumbnailLoader.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.lastfm.artist; +package com.kabouzeid.gramophone.lastfm.artist; import android.content.Context; import android.graphics.Bitmap; @@ -8,9 +8,9 @@ import android.view.View; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.provider.ArtistJSONStore; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.provider.ArtistJSONStore; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java index 493357a4..e4e45e0c 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Album; +import com.kabouzeid.gramophone.model.Album; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumSongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java similarity index 96% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumSongLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java index ec89f00a..3b09916d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/AlbumSongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistAlbumLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistAlbumLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java index 3ba17b59..10672b9b 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistAlbumLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Album; +import com.kabouzeid.gramophone.model.Album; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java index ffdb7c26..2a12265a 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Artist; +import com.kabouzeid.gramophone.model.Artist; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistSongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java similarity index 96% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistSongLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java index b89cb4ac..6ffd8935 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/ArtistSongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/SongFilePathLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/SongFilePathLoader.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/SongFilePathLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/SongFilePathLoader.java index a41fc2d4..72d0c11a 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/SongFilePathLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/SongFilePathLoader.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/loader/SongLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/loader/SongLoader.java rename to app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java index 302f5229..638383d7 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/loader/SongLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.loader; +package com.kabouzeid.gramophone.loader; import android.content.Context; import android.database.Cursor; import android.provider.BaseColumns; import android.provider.MediaStore; -import com.kabouzeid.materialmusic.model.Song; +import com.kabouzeid.gramophone.model.Song; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java b/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java new file mode 100644 index 00000000..305a4a97 --- /dev/null +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/AppKeys.java @@ -0,0 +1,26 @@ +package com.kabouzeid.gramophone.misc; + +/** + * Created by karim on 22.12.14. + */ +public final class AppKeys { + public static final String CL_CURRENT_ACTIVITY = "Current activity"; + + public static final String SP_THEME = "com.kabouzeid.gramophone.THEME"; + public static final String SP_VIEWPAGER_ITEM_POSITION = "com.kabouzeid.gramophone.NAVIGATION_DRAWER_ITEM_POSITION"; + public static final String SP_USER_LEARNED_DRAWER = "com.kabouzeid.gramophone.NAVIGATION_DRAWER_LEARNED"; + public static final String SP_ONLY_ON_WIFI = "com.kabouzeid.gramophone.ONLY_ON_WIFI"; + public static final String SP_SHUFFLE_MODE = "com.kabouzeid.gramophone.SHUFFLE_MODE"; + public static final String SP_REPEAT_MODE = "com.kabouzeid.gramophone.REPEAT_MODE"; + + public static final String IS_ORIGINAL_PLAYING_QUEUE = "com.kabouzeid.gramophone.ORIGINAL_PLAYING_QUEUE"; + public static final String IS_PLAYING_QUEUE = "com.kabouzeid.gramophone.PLAYING_QUEUE"; + public static final String IS_POSITION_IN_QUEUE = "com.kabouzeid.gramophone.POSITION_IN_QUEUE"; + public static final String IS_ARTIST_JSON_INFO_CACHE = "com.kabouzeid.gramophone.ARTIST_JSON_INFO_CACHE"; + + public static final String E_ALBUM = "com.kabouzeid.gramophone.ALBUM"; + public static final String E_ARTIST = "com.kabouzeid.gramophone.ARTIST"; + public static final String E_SONG = "com.kabouzeid.gramophone.SONG"; + public static final String E_TAG_EDIT_MODE = "com.kabouzeid.gramophone.TAG_EDIT_MODE"; + public static final String E_ID = "com.kabouzeid.gramophone.ID"; +} diff --git a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallAnimatorListener.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallAnimatorListener.java similarity index 93% rename from app/src/main/java/com/kabouzeid/materialmusic/misc/SmallAnimatorListener.java rename to app/src/main/java/com/kabouzeid/gramophone/misc/SmallAnimatorListener.java index d9dd6242..62d510e3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallAnimatorListener.java +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallAnimatorListener.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.misc; +package com.kabouzeid.gramophone.misc; /** * Created by karim on 20.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallObservableScrollViewCallbacks.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallObservableScrollViewCallbacks.java similarity index 92% rename from app/src/main/java/com/kabouzeid/materialmusic/misc/SmallObservableScrollViewCallbacks.java rename to app/src/main/java/com/kabouzeid/gramophone/misc/SmallObservableScrollViewCallbacks.java index a60aca83..2639fa9d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallObservableScrollViewCallbacks.java +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallObservableScrollViewCallbacks.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.misc; +package com.kabouzeid.gramophone.misc; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ScrollState; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallOnGestureListener.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallOnGestureListener.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/misc/SmallOnGestureListener.java rename to app/src/main/java/com/kabouzeid/gramophone/misc/SmallOnGestureListener.java index 1153a0da..4be14809 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallOnGestureListener.java +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallOnGestureListener.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.misc; +package com.kabouzeid.gramophone.misc; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallTransitionListener.java b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallTransitionListener.java similarity index 93% rename from app/src/main/java/com/kabouzeid/materialmusic/misc/SmallTransitionListener.java rename to app/src/main/java/com/kabouzeid/gramophone/misc/SmallTransitionListener.java index a9c6af2e..29676799 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/misc/SmallTransitionListener.java +++ b/app/src/main/java/com/kabouzeid/gramophone/misc/SmallTransitionListener.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.misc; +package com.kabouzeid.gramophone.misc; import android.annotation.TargetApi; import android.transition.Transition; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/Album.java b/app/src/main/java/com/kabouzeid/gramophone/model/Album.java similarity index 89% rename from app/src/main/java/com/kabouzeid/materialmusic/model/Album.java rename to app/src/main/java/com/kabouzeid/gramophone/model/Album.java index dcc59698..01a8a3f5 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/Album.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Album.java @@ -1,10 +1,10 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; import android.content.Context; import android.widget.ImageView; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.util.MusicUtil; import com.nostra13.universalimageloader.core.ImageLoader; /** diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/Artist.java b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java similarity index 90% rename from app/src/main/java/com/kabouzeid/materialmusic/model/Artist.java rename to app/src/main/java/com/kabouzeid/gramophone/model/Artist.java index b9c6769f..2d7562ab 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/Artist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; import android.content.Context; import android.graphics.Bitmap; import android.widget.ImageView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.lastfm.artist.LastFMArtistThumbnailLoader; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistThumbnailLoader; /** * Created by karim on 29.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/MusicRemoteEvent.java b/app/src/main/java/com/kabouzeid/gramophone/model/MusicRemoteEvent.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/model/MusicRemoteEvent.java rename to app/src/main/java/com/kabouzeid/gramophone/model/MusicRemoteEvent.java index 74b57baa..630bcac9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/MusicRemoteEvent.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/MusicRemoteEvent.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; /** * Created by karim on 19.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/NavigationDrawerItem.java b/app/src/main/java/com/kabouzeid/gramophone/model/NavigationDrawerItem.java similarity index 85% rename from app/src/main/java/com/kabouzeid/materialmusic/model/NavigationDrawerItem.java rename to app/src/main/java/com/kabouzeid/gramophone/model/NavigationDrawerItem.java index 9c8974ed..9568a595 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/NavigationDrawerItem.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/NavigationDrawerItem.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; /** * Created by karim on 23.11.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/SearchEntry.java b/app/src/main/java/com/kabouzeid/gramophone/model/SearchEntry.java similarity index 86% rename from app/src/main/java/com/kabouzeid/materialmusic/model/SearchEntry.java rename to app/src/main/java/com/kabouzeid/gramophone/model/SearchEntry.java index 5b6fc035..e67d0887 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/SearchEntry.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/SearchEntry.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; import android.content.Context; import android.widget.ImageView; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/model/Song.java b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java similarity index 91% rename from app/src/main/java/com/kabouzeid/materialmusic/model/Song.java rename to app/src/main/java/com/kabouzeid/gramophone/model/Song.java index 5841ef13..1b3b5442 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/model/Song.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Song.java @@ -1,10 +1,10 @@ -package com.kabouzeid.materialmusic.model; +package com.kabouzeid.gramophone.model; import android.content.Context; import android.widget.ImageView; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.util.MusicUtil; import com.nostra13.universalimageloader.core.ImageLoader; import java.io.Serializable; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java b/app/src/main/java/com/kabouzeid/gramophone/provider/AlbumJSONStore.java similarity index 98% rename from app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java rename to app/src/main/java/com/kabouzeid/gramophone/provider/AlbumJSONStore.java index f455b645..67419db0 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/provider/AlbumJSONStore.java +++ b/app/src/main/java/com/kabouzeid/gramophone/provider/AlbumJSONStore.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.provider; +package com.kabouzeid.gramophone.provider; import android.content.ContentValues; import android.content.Context; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java b/app/src/main/java/com/kabouzeid/gramophone/provider/ArtistJSONStore.java similarity index 98% rename from app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java rename to app/src/main/java/com/kabouzeid/gramophone/provider/ArtistJSONStore.java index be6954f8..8df13fd9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/provider/ArtistJSONStore.java +++ b/app/src/main/java/com/kabouzeid/gramophone/provider/ArtistJSONStore.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.provider; +package com.kabouzeid.gramophone.provider; import android.content.ContentValues; import android.content.Context; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/service/MediaButtonIntentReceiver.java b/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java similarity index 98% rename from app/src/main/java/com/kabouzeid/materialmusic/service/MediaButtonIntentReceiver.java rename to app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java index 84f02d87..b95533d5 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/service/MediaButtonIntentReceiver.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MediaButtonIntentReceiver.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.service; +package com.kabouzeid.gramophone.service; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java rename to app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java index e05073b3..c8387575 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.service; +package com.kabouzeid.gramophone.service; import android.app.PendingIntent; import android.app.Service; @@ -21,15 +21,15 @@ import android.preference.PreferenceManager; import android.util.Log; import android.widget.Toast; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.helper.PlayingNotificationHelper; -import com.kabouzeid.materialmusic.helper.ShuffleHelper; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.util.InternalStorageUtil; -import com.kabouzeid.materialmusic.util.MusicUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.PlayingNotificationHelper; +import com.kabouzeid.gramophone.helper.ShuffleHelper; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.util.InternalStorageUtil; +import com.kabouzeid.gramophone.util.MusicUtil; import com.nostra13.universalimageloader.core.ImageLoader; import java.io.IOException; @@ -37,13 +37,13 @@ import java.util.ArrayList; import java.util.List; public class MusicService extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener, AudioManager.OnAudioFocusChangeListener { - public static final String ACTION_TOGGLE_PLAYBACK = "com.kabouzeid.materialmusic.action.TOGGLE_PLAYBACK"; - public static final String ACTION_PLAY = "com.kabouzeid.materialmusic.action.PLAY"; - public static final String ACTION_PAUSE = "com.kabouzeid.materialmusic.action.PAUSE"; - public static final String ACTION_STOP = "com.kabouzeid.materialmusic.action.STOP"; - public static final String ACTION_SKIP = "com.kabouzeid.materialmusic.action.SKIP"; - public static final String ACTION_REWIND = "com.kabouzeid.materialmusic.action.REWIND"; - public static final String ACTION_QUIT = "com.kabouzeid.materialmusic.action.QUIT"; + public static final String ACTION_TOGGLE_PLAYBACK = "com.kabouzeid.gramophone.action.TOGGLE_PLAYBACK"; + public static final String ACTION_PLAY = "com.kabouzeid.gramophone.action.PLAY"; + public static final String ACTION_PAUSE = "com.kabouzeid.gramophone.action.PAUSE"; + public static final String ACTION_STOP = "com.kabouzeid.gramophone.action.STOP"; + public static final String ACTION_SKIP = "com.kabouzeid.gramophone.action.SKIP"; + public static final String ACTION_REWIND = "com.kabouzeid.gramophone.action.REWIND"; + public static final String ACTION_QUIT = "com.kabouzeid.gramophone.action.QUIT"; public static final int SHUFFLE_MODE_NONE = 0; public static final int SHUFFLE_MODE_SHUFFLE = 1; public static final int REPEAT_MODE_NONE = 0; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java similarity index 93% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 647b2b3f..d7c5af05 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities; +package com.kabouzeid.gramophone.ui.activities; import android.annotation.SuppressLint; import android.content.Intent; @@ -19,23 +19,23 @@ import android.widget.ImageView; import android.widget.TextView; import com.github.ksoichiro.android.observablescrollview.ObservableListView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.songadapter.SongAdapter; -import com.kabouzeid.materialmusic.comparator.SongTrackNumberComparator; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.loader.AlbumLoader; -import com.kabouzeid.materialmusic.loader.AlbumSongLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.misc.SmallObservableScrollViewCallbacks; -import com.kabouzeid.materialmusic.model.Album; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.base.AbsFabActivity; -import com.kabouzeid.materialmusic.ui.activities.tageditor.AlbumTagEditorActivity; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter; +import com.kabouzeid.gramophone.comparator.SongTrackNumberComparator; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.loader.AlbumLoader; +import com.kabouzeid.gramophone.loader.AlbumSongLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks; +import com.kabouzeid.gramophone.model.Album; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; +import com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; import com.nhaarman.listviewanimations.appearance.AnimationAdapter; import com.nhaarman.listviewanimations.appearance.simple.ScaleInAnimationAdapter; import com.nineoldandroids.view.ViewHelper; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 833afe17..7820a98b 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities; +package com.kabouzeid.gramophone.ui.activities; import android.annotation.SuppressLint; import android.app.Activity; @@ -25,20 +25,20 @@ import android.widget.Toast; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ScrollState; import com.google.samples.apps.iosched.ui.widget.SlidingTabLayout; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.lastfm.artist.LastFMArtistImageLoader; -import com.kabouzeid.materialmusic.loader.ArtistLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Artist; -import com.kabouzeid.materialmusic.ui.activities.base.AbsFabActivity; -import com.kabouzeid.materialmusic.ui.fragments.artistviewpager.AbsViewPagerTabArtistListFragment; -import com.kabouzeid.materialmusic.ui.fragments.artistviewpager.ViewPagerTabArtistAlbumFragment; -import com.kabouzeid.materialmusic.ui.fragments.artistviewpager.ViewPagerTabArtistBioFragment; -import com.kabouzeid.materialmusic.ui.fragments.artistviewpager.ViewPagerTabArtistSongListFragment; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistImageLoader; +import com.kabouzeid.gramophone.loader.ArtistLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Artist; +import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; +import com.kabouzeid.gramophone.ui.fragments.artistviewpager.AbsViewPagerTabArtistListFragment; +import com.kabouzeid.gramophone.ui.fragments.artistviewpager.ViewPagerTabArtistAlbumFragment; +import com.kabouzeid.gramophone.ui.fragments.artistviewpager.ViewPagerTabArtistBioFragment; +import com.kabouzeid.gramophone.ui.fragments.artistviewpager.ViewPagerTabArtistSongListFragment; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; import com.nineoldandroids.animation.Animator; import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewPropertyAnimator; @@ -54,8 +54,8 @@ import com.nineoldandroids.view.ViewPropertyAnimator; public class ArtistDetailActivity extends AbsFabActivity implements OnMusicRemoteEventListener, KabViewsDisableAble, ObservableScrollViewCallbacks { public static final String TAG = ArtistDetailActivity.class.getSimpleName(); - public static final String ARG_ARTIST_ID = "com.kabouzeid.materialmusic.artist.id"; - public static final String ARG_ARTIST_NAME = "com.kabouzeid.materialmusic.artist.name"; + public static final String ARG_ARTIST_ID = "com.kabouzeid.gramophone.artist.id"; + public static final String ARG_ARTIST_NAME = "com.kabouzeid.gramophone.artist.name"; private static final boolean TOOLBAR_IS_STICKY = true; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java similarity index 90% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 3796fbfb..b69e58c3 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities; +package com.kabouzeid.gramophone.ui.activities; import android.app.Activity; import android.app.Fragment; @@ -24,24 +24,24 @@ import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; import com.google.samples.apps.iosched.ui.widget.SlidingTabLayout; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.helper.AboutDeveloperDialogHelper; -import com.kabouzeid.materialmusic.helper.PlayingQueueDialogHelper; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.base.AbsFabActivity; -import com.kabouzeid.materialmusic.ui.fragments.NavigationDrawerFragment; -import com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments.AlbumViewFragment; -import com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments.ArtistViewFragment; -import com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments.MainActivityFragment; -import com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments.SongViewFragment; -import com.kabouzeid.materialmusic.util.ImageLoaderUtil; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.AboutDeveloperDialogHelper; +import com.kabouzeid.gramophone.helper.PlayingQueueDialogHelper; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; +import com.kabouzeid.gramophone.ui.fragments.NavigationDrawerFragment; +import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.AlbumViewFragment; +import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.ArtistViewFragment; +import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.MainActivityFragment; +import com.kabouzeid.gramophone.ui.fragments.mainactivityfragments.SongViewFragment; +import com.kabouzeid.gramophone.util.ImageLoaderUtil; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; import com.nostra13.universalimageloader.core.ImageLoader; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index d20fbd4f..c7a94f91 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities; +package com.kabouzeid.gramophone.ui.activities; import android.content.Intent; import android.graphics.Bitmap; @@ -19,21 +19,21 @@ import android.widget.TextView; import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.helper.PlayingQueueDialogHelper; -import com.kabouzeid.materialmusic.helper.SongDetailDialogHelper; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.lastfm.artist.LastFMArtistImageLoader; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.service.MusicService; -import com.kabouzeid.materialmusic.ui.activities.base.AbsFabActivity; -import com.kabouzeid.materialmusic.ui.activities.tageditor.SongTagEditorActivity; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.helper.PlayingQueueDialogHelper; +import com.kabouzeid.gramophone.helper.SongDetailDialogHelper; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistImageLoader; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.service.MusicService; +import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; +import com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; import com.nineoldandroids.view.ViewPropertyAnimator; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java similarity index 91% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/SearchActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index bbdea978..18710345 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/SearchActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities; +package com.kabouzeid.gramophone.ui.activities; import android.annotation.SuppressLint; import android.app.ActionBar; @@ -17,17 +17,17 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.ListView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.SearchAdapter; -import com.kabouzeid.materialmusic.loader.AlbumLoader; -import com.kabouzeid.materialmusic.loader.ArtistLoader; -import com.kabouzeid.materialmusic.loader.SongLoader; -import com.kabouzeid.materialmusic.model.Album; -import com.kabouzeid.materialmusic.model.Artist; -import com.kabouzeid.materialmusic.model.SearchEntry; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.base.AbsBaseActivity; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.SearchAdapter; +import com.kabouzeid.gramophone.loader.AlbumLoader; +import com.kabouzeid.gramophone.loader.ArtistLoader; +import com.kabouzeid.gramophone.loader.SongLoader; +import com.kabouzeid.gramophone.model.Album; +import com.kabouzeid.gramophone.model.Artist; +import com.kabouzeid.gramophone.model.SearchEntry; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; +import com.kabouzeid.gramophone.util.Util; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java similarity index 87% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsBaseActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java index 146338ec..cddc20c6 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsBaseActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities.base; +package com.kabouzeid.gramophone.ui.activities.base; import android.content.Intent; import android.os.Build; @@ -10,15 +10,15 @@ import android.support.v7.app.ActionBarActivity; import android.widget.Toast; import com.crashlytics.android.Crashlytics; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.songadapter.SongAdapter; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity; -import com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity; -import com.kabouzeid.materialmusic.ui.activities.MusicControllerActivity; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity; +import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity; +import com.kabouzeid.gramophone.ui.activities.MusicControllerActivity; +import com.kabouzeid.gramophone.util.Util; /** * Created by karim on 20.01.15. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsFabActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsFabActivity.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsFabActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsFabActivity.java index c9b69dda..93fe8746 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/base/AbsFabActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsFabActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities.base; +package com.kabouzeid.gramophone.ui.activities.base; import android.os.Bundle; import android.support.v4.util.Pair; @@ -8,10 +8,10 @@ import android.view.MotionEvent; import android.view.View; import android.widget.Toast; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.interfaces.OnMusicRemoteEventListener; -import com.kabouzeid.materialmusic.misc.SmallOnGestureListener; -import com.kabouzeid.materialmusic.model.MusicRemoteEvent; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.interfaces.OnMusicRemoteEventListener; +import com.kabouzeid.gramophone.misc.SmallOnGestureListener; +import com.kabouzeid.gramophone.model.MusicRemoteEvent; import com.melnykov.fab.FloatingActionButton; /** diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java index 55e005c3..0a855ef9 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities.tageditor; +package com.kabouzeid.gramophone.ui.activities.tageditor; import android.app.SearchManager; import android.content.Intent; @@ -20,13 +20,13 @@ import android.widget.ImageView; import com.afollestad.materialdialogs.MaterialDialog; import com.github.ksoichiro.android.observablescrollview.ObservableScrollView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.misc.SmallObservableScrollViewCallbacks; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; -import com.kabouzeid.materialmusic.util.ViewUtil; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.misc.SmallObservableScrollViewCallbacks; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; +import com.kabouzeid.gramophone.util.ViewUtil; import com.melnykov.fab.FloatingActionButton; import com.nineoldandroids.view.ViewHelper; import com.nineoldandroids.view.ViewPropertyAnimator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AlbumTagEditorActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java index f3b6e682..88528363 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AlbumTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities.tageditor; +package com.kabouzeid.gramophone.ui.activities.tageditor; import android.graphics.Bitmap; import android.net.Uri; @@ -9,13 +9,13 @@ import android.util.Log; import android.widget.EditText; import android.widget.Toast; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.lastfm.album.LastFMAlbumImageLoader; -import com.kabouzeid.materialmusic.loader.AlbumSongLoader; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.util.MusicUtil; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.lastfm.album.LastFMAlbumImageLoader; +import com.kabouzeid.gramophone.loader.AlbumSongLoader; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.util.MusicUtil; +import com.kabouzeid.gramophone.util.Util; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.process.BitmapProcessor; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/SongTagEditorActivity.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java index c7053bac..a4a7f47f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/SongTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.activities.tageditor; +package com.kabouzeid.gramophone.ui.activities.tageditor; import android.net.Uri; import android.os.Bundle; @@ -6,12 +6,11 @@ import android.text.Editable; import android.text.TextWatcher; import android.widget.EditText; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.loader.SongFilePathLoader; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.loader.SongFilePathLoader; import org.jaudiotagger.tag.FieldKey; -import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java similarity index 95% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java index 3e110ab1..98c8c2e7 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/NavigationDrawerFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments; +package com.kabouzeid.gramophone.ui.fragments; import android.app.Activity; import android.app.Fragment; @@ -15,11 +15,11 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.NavigationDrawerItemAdapter; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.NavigationDrawerItem; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.NavigationDrawerItemAdapter; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.NavigationDrawerItem; import com.nhaarman.listviewanimations.appearance.simple.AlphaInAnimationAdapter; import java.util.ArrayList; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java similarity index 93% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java index 46c0b816..539a965d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/AbsViewPagerTabArtistListFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.artistviewpager; +package com.kabouzeid.gramophone.ui.fragments.artistviewpager; import android.app.Activity; import android.app.Fragment; @@ -12,11 +12,11 @@ import android.widget.ListAdapter; import com.github.ksoichiro.android.observablescrollview.ObservableGridView; import com.github.ksoichiro.android.observablescrollview.ObservableScrollViewCallbacks; import com.github.ksoichiro.android.observablescrollview.ScrollState; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity; +import com.kabouzeid.gramophone.util.Util; public abstract class AbsViewPagerTabArtistListFragment extends Fragment implements ObservableScrollViewCallbacks, KabViewsDisableAble { public static final String TAG = AbsViewPagerTabArtistListFragment.class.getSimpleName(); diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java similarity index 85% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java index 6b4c15c0..42eddc8b 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistAlbumFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.artistviewpager; +package com.kabouzeid.gramophone.ui.fragments.artistviewpager; import android.content.Intent; import android.os.Bundle; @@ -9,14 +9,14 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ListAdapter; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.AlbumViewGridAdapter; -import com.kabouzeid.materialmusic.comparator.AlbumAlphabeticComparator; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.loader.ArtistAlbumLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Album; -import com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.AlbumViewGridAdapter; +import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.loader.ArtistAlbumLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Album; +import com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity; import com.melnykov.fab.FloatingActionButton; import java.util.Collections; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java similarity index 93% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java index bc09ef85..079c3152 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistBioFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.artistviewpager; +package com.kabouzeid.gramophone.ui.fragments.artistviewpager; import android.content.Context; @@ -12,8 +12,8 @@ import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.TextView; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.lastfm.artist.LastFMArtistBiographyLoader; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.lastfm.artist.LastFMArtistBiographyLoader; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java similarity index 74% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java index 4d299446..5bab8027 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/artistviewpager/ViewPagerTabArtistSongListFragment.java @@ -1,14 +1,14 @@ -package com.kabouzeid.materialmusic.ui.fragments.artistviewpager; +package com.kabouzeid.gramophone.ui.fragments.artistviewpager; import android.view.View; import android.widget.AdapterView; import android.widget.ListAdapter; -import com.kabouzeid.materialmusic.adapter.songadapter.SongAdapter; -import com.kabouzeid.materialmusic.comparator.SongAlphabeticComparator; -import com.kabouzeid.materialmusic.loader.ArtistSongLoader; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.base.AbsBaseActivity; +import com.kabouzeid.gramophone.adapter.songadapter.SongAdapter; +import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator; +import com.kabouzeid.gramophone.loader.ArtistSongLoader; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/AlbumViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumViewFragment.java similarity index 88% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/AlbumViewFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumViewFragment.java index 785649a8..6ce9d961 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/AlbumViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AlbumViewFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments; +package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; import android.os.Bundle; import android.support.v4.util.Pair; @@ -8,12 +8,12 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AdapterView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.AlbumViewGridAdapter; -import com.kabouzeid.materialmusic.comparator.AlbumAlphabeticComparator; -import com.kabouzeid.materialmusic.loader.AlbumLoader; -import com.kabouzeid.materialmusic.model.Album; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.AlbumViewGridAdapter; +import com.kabouzeid.gramophone.comparator.AlbumAlphabeticComparator; +import com.kabouzeid.gramophone.loader.AlbumLoader; +import com.kabouzeid.gramophone.model.Album; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/ArtistViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistViewFragment.java similarity index 84% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/ArtistViewFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistViewFragment.java index 7422ace8..bc2340e1 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/ArtistViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/ArtistViewFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments; +package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; import android.app.Fragment; @@ -11,16 +11,15 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AdapterView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.ArtistViewListAdapter; -import com.kabouzeid.materialmusic.comparator.ArtistAlphabeticComparator; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.loader.ArtistLoader; -import com.kabouzeid.materialmusic.misc.AppKeys; -import com.kabouzeid.materialmusic.model.Artist; -import com.kabouzeid.materialmusic.ui.activities.ArtistDetailActivity; -import com.kabouzeid.materialmusic.ui.activities.base.AbsFabActivity; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.ArtistViewListAdapter; +import com.kabouzeid.gramophone.comparator.ArtistAlphabeticComparator; +import com.kabouzeid.gramophone.loader.ArtistLoader; +import com.kabouzeid.gramophone.misc.AppKeys; +import com.kabouzeid.gramophone.model.Artist; +import com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity; +import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/MainActivityFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/MainActivityFragment.java similarity index 80% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/MainActivityFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/MainActivityFragment.java index 6811673a..66ca2f1f 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/MainActivityFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/MainActivityFragment.java @@ -1,14 +1,14 @@ -package com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments; +package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; import android.app.Fragment; import android.os.Build; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.interfaces.KabSearchAbleFragment; -import com.kabouzeid.materialmusic.interfaces.KabViewsDisableAble; -import com.kabouzeid.materialmusic.ui.activities.MainActivity; -import com.kabouzeid.materialmusic.util.Util; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.interfaces.KabSearchAbleFragment; +import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble; +import com.kabouzeid.gramophone.ui.activities.MainActivity; +import com.kabouzeid.gramophone.util.Util; /** * Created by karim on 27.02.15. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/SongViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java similarity index 86% rename from app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/SongViewFragment.java rename to app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java index 5b1b023c..7c872be5 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/ui/fragments/mainactivityfragments/SongViewFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/SongViewFragment.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.ui.fragments.mainactivityfragments; +package com.kabouzeid.gramophone.ui.fragments.mainactivityfragments; import android.os.Bundle; @@ -8,13 +8,13 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.AdapterView; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.adapter.songadapter.SongViewListAdapter; -import com.kabouzeid.materialmusic.comparator.SongAlphabeticComparator; -import com.kabouzeid.materialmusic.loader.SongLoader; -import com.kabouzeid.materialmusic.model.Song; -import com.kabouzeid.materialmusic.ui.activities.base.AbsBaseActivity; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.adapter.songadapter.SongViewListAdapter; +import com.kabouzeid.gramophone.comparator.SongAlphabeticComparator; +import com.kabouzeid.gramophone.loader.SongLoader; +import com.kabouzeid.gramophone.model.Song; +import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/util/ImageLoaderUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ImageLoaderUtil.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/util/ImageLoaderUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/util/ImageLoaderUtil.java index 4e2cc064..cb4b3fe1 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/util/ImageLoaderUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ImageLoaderUtil.java @@ -1,11 +1,11 @@ -package com.kabouzeid.materialmusic.util; +package com.kabouzeid.gramophone.util; import android.content.Context; import android.graphics.Bitmap; import android.view.View; import android.widget.ImageView; -import com.kabouzeid.materialmusic.R; +import com.kabouzeid.gramophone.R; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/util/InternalStorageUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/InternalStorageUtil.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/util/InternalStorageUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/util/InternalStorageUtil.java index a1a449d6..b2dbb15b 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/util/InternalStorageUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/InternalStorageUtil.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.util; +package com.kabouzeid.gramophone.util; import android.content.Context; import android.util.Log; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java similarity index 98% rename from app/src/main/java/com/kabouzeid/materialmusic/util/MusicUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java index 5fe8bf09..1e3c4327 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/util/MusicUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.util; +package com.kabouzeid.gramophone.util; import android.content.ContentResolver; import android.content.ContentUris; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/util/Util.java b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java similarity index 97% rename from app/src/main/java/com/kabouzeid/materialmusic/util/Util.java rename to app/src/main/java/com/kabouzeid/gramophone/util/Util.java index d36f8890..f1400874 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/util/Util.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.util; +package com.kabouzeid.gramophone.util; import android.annotation.TargetApi; import android.app.Activity; @@ -17,9 +17,9 @@ import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; -import com.kabouzeid.materialmusic.App; -import com.kabouzeid.materialmusic.R; -import com.kabouzeid.materialmusic.misc.AppKeys; +import com.kabouzeid.gramophone.App; +import com.kabouzeid.gramophone.R; +import com.kabouzeid.gramophone.misc.AppKeys; /** * Created by karim on 12.12.14. diff --git a/app/src/main/java/com/kabouzeid/materialmusic/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java similarity index 98% rename from app/src/main/java/com/kabouzeid/materialmusic/util/ViewUtil.java rename to app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java index d04ad965..550c973d 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/util/ViewUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.util; +package com.kabouzeid.gramophone.util; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/view/SquareImageView.java b/app/src/main/java/com/kabouzeid/gramophone/view/SquareImageView.java similarity index 94% rename from app/src/main/java/com/kabouzeid/materialmusic/view/SquareImageView.java rename to app/src/main/java/com/kabouzeid/gramophone/view/SquareImageView.java index 75cb9375..be4530ce 100644 --- a/app/src/main/java/com/kabouzeid/materialmusic/view/SquareImageView.java +++ b/app/src/main/java/com/kabouzeid/gramophone/view/SquareImageView.java @@ -1,4 +1,4 @@ -package com.kabouzeid.materialmusic.view; +package com.kabouzeid.gramophone.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/kabouzeid/materialmusic/misc/AppKeys.java b/app/src/main/java/com/kabouzeid/materialmusic/misc/AppKeys.java deleted file mode 100644 index dafa6336..00000000 --- a/app/src/main/java/com/kabouzeid/materialmusic/misc/AppKeys.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.kabouzeid.materialmusic.misc; - -/** - * Created by karim on 22.12.14. - */ -public final class AppKeys { - public static final String CL_CURRENT_ACTIVITY = "Current activity"; - - public static final String SP_THEME = "com.kabouzeid.materialmusic.THEME"; - public static final String SP_VIEWPAGER_ITEM_POSITION = "com.kabouzeid.materialmusic.NAVIGATION_DRAWER_ITEM_POSITION"; - public static final String SP_USER_LEARNED_DRAWER = "com.kabouzeid.materialmusic.NAVIGATION_DRAWER_LEARNED"; - public static final String SP_ONLY_ON_WIFI = "com.kabouzeid.materialmusic.ONLY_ON_WIFI"; - public static final String SP_SHUFFLE_MODE = "com.kabouzeid.materialmusic.SHUFFLE_MODE"; - public static final String SP_REPEAT_MODE = "com.kabouzeid.materialmusic.REPEAT_MODE"; - - public static final String IS_ORIGINAL_PLAYING_QUEUE = "com.kabouzeid.materialmusic.ORIGINAL_PLAYING_QUEUE"; - public static final String IS_PLAYING_QUEUE = "com.kabouzeid.materialmusic.PLAYING_QUEUE"; - public static final String IS_POSITION_IN_QUEUE = "com.kabouzeid.materialmusic.POSITION_IN_QUEUE"; - public static final String IS_ARTIST_JSON_INFO_CACHE = "com.kabouzeid.materialmusic.ARTIST_JSON_INFO_CACHE"; - - public static final String E_ALBUM = "com.kabouzeid.materialmusic.ALBUM"; - public static final String E_ARTIST = "com.kabouzeid.materialmusic.ARTIST"; - public static final String E_SONG = "com.kabouzeid.materialmusic.SONG"; - public static final String E_TAG_EDIT_MODE = "com.kabouzeid.materialmusic.TAG_EDIT_MODE"; - public static final String E_ID = "com.kabouzeid.materialmusic.ID"; -} diff --git a/app/src/main/res/layout-land/activity_music_controller.xml b/app/src/main/res/layout-land/activity_music_controller.xml index 53c51e4f..1c41d032 100644 --- a/app/src/main/res/layout-land/activity_music_controller.xml +++ b/app/src/main/res/layout-land/activity_music_controller.xml @@ -2,7 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity$PlaceholderFragment"> + tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment"> - + tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity$PlaceholderFragment"> - - - - - + tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity"> + tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity"> + tools:context="com.kabouzeid.gramophone.ui.activities.SearchActivity"> + tools:context="com.kabouzeid.gramophone.ui.activities.TabTest"> + tools:context="com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity"> + tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">