From 39b0b4c931da6959606be1172b0a8d7a1952bc76 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Sat, 20 Apr 2019 10:59:45 +0530 Subject: [PATCH] Refactor packages --- app/src/main/AndroidManifest.xml | 42 +++---- .../{ui => }/activities/AboutActivity.kt | 6 +- .../activities/AlbumDetailsActivity.kt | 12 +- .../activities/ArtistDetailActivity.kt | 10 +- .../{ui => }/activities/EqualizerActivity.kt | 4 +- .../activities/GenreDetailsActivity.kt | 6 +- .../{ui => }/activities/LicenseActivity.kt | 4 +- .../{ui => }/activities/LockScreenActivity.kt | 6 +- .../{ui => }/activities/LyricsActivity.kt | 8 +- .../{ui => }/activities/MainActivity.kt | 8 +- .../activities/PlayingQueueActivity.kt | 6 +- .../activities/PlaylistDetailActivity.kt | 11 +- .../{ui => }/activities/PurchaseActivity.kt | 4 +- .../{ui => }/activities/SearchActivity.kt | 6 +- .../{ui => }/activities/SettingsActivity.kt | 6 +- .../activities/SupportDevelopmentActivity.kt | 4 +- .../{ui => }/activities/UserInfoActivity.kt | 5 +- .../{ui => }/activities/WhatsNewActivity.java | 7 +- .../activities/base/AbsBaseActivity.kt | 4 +- .../activities/base/AbsCrashCollector.kt | 2 +- .../base/AbsMusicServiceActivity.kt | 2 +- .../base/AbsSlidingMusicPanelActivity.kt | 36 +++--- .../activities/base/AbsThemeActivity.kt | 2 +- .../activities/bugreport/BugReportActivity.kt | 14 +-- .../bugreport/ErrorHandlerActivity.kt | 1 + .../bugreport/model/DeviceInfo.java | 2 +- .../activities/bugreport/model/Report.java | 4 +- .../bugreport/model/github/ExtraInfo.java | 2 +- .../bugreport/model/github/GithubLogin.java | 2 +- .../bugreport/model/github/GithubTarget.java | 2 +- .../tageditor/AbsTagEditorActivity.kt | 4 +- .../tageditor/AlbumTagEditorActivity.kt | 2 +- .../tageditor/SongTagEditorActivity.kt | 2 +- .../tageditor/WriteTagsAsyncTask.java | 2 +- .../{ui => }/adapter/CollageSongAdapter.kt | 6 +- .../{ui => }/adapter/ContributorAdapter.kt | 2 +- .../{ui => }/adapter/GenreAdapter.kt | 4 +- .../{ui => }/adapter/HomeAdapter.kt | 8 +- .../{ui => }/adapter/SearchAdapter.kt | 4 +- .../{ui => }/adapter/SongFileAdapter.kt | 6 +- .../{ui => }/adapter/SpanSongsAdapter.kt | 4 +- .../{ui => }/adapter/album/AlbumAdapter.kt | 6 +- .../adapter/album/AlbumCoverPagerAdapter.kt | 6 +- .../adapter/album/AlbumFullWidthAdapter.kt | 2 +- .../adapter/album/HorizontalAlbumAdapter.kt | 2 +- .../{ui => }/adapter/artist/ArtistAdapter.kt | 6 +- .../adapter/base/AbsMultiSelectAdapter.java | 2 +- .../adapter/base/MediaEntryViewHolder.kt | 4 +- .../adapter/playlist/AddToPlaylist.kt | 6 +- .../adapter/playlist/PlaylistAdapter.kt | 6 +- .../adapter/song/AbsOffsetSongAdapter.kt | 2 +- .../song/OrderablePlaylistSongAdapter.kt | 2 +- .../adapter/song/PlayingQueueAdapter.kt | 2 +- .../adapter/song/PlaylistSongAdapter.kt | 2 +- .../adapter/song/ShuffleButtonSongAdapter.kt | 2 +- .../adapter/song/SimpleSongAdapter.kt | 2 +- .../{ui => }/adapter/song/SongAdapter.kt | 6 +- .../AppShortcutLauncherActivity.kt | 2 +- .../retromusic/appwidgets/AppWidgetBig.kt | 2 +- .../retromusic/appwidgets/AppWidgetCard.kt | 2 +- .../retromusic/appwidgets/AppWidgetClassic.kt | 2 +- .../retromusic/appwidgets/AppWidgetSmall.kt | 2 +- .../retromusic/appwidgets/AppWidgetText.kt | 2 +- .../retromusic/dialogs/AddToPlaylistDialog.kt | 2 +- .../dialogs/OptionsSheetDialogFragment.kt | 6 +- .../{ui => }/fragments/AlbumCoverStyle.kt | 4 +- .../{ui => }/fragments/MiniPlayerFragment.kt | 4 +- .../{ui => }/fragments/NowPlayingScreen.kt | 2 +- .../{ui => }/fragments/VolumeFragment.kt | 3 +- .../fragments/base/AbsLibraryPagerFragment.kt | 4 +- ...PagerRecyclerViewCustomGridSizeFragment.kt | 2 +- .../AbsLibraryPagerRecyclerViewFragment.kt | 2 +- .../fragments/base/AbsMainActivityFragment.kt | 4 +- .../fragments/base/AbsMusicServiceFragment.kt | 4 +- .../base/AbsPlayerControlsFragment.kt | 4 +- .../fragments/base/AbsPlayerFragment.kt | 8 +- .../fragments/mainactivity/AlbumsFragment.kt | 6 +- .../fragments/mainactivity/ArtistsFragment.kt | 6 +- .../fragments/mainactivity/GenreFragment.kt | 6 +- .../mainactivity/LibraryFragment.java | 6 +- .../mainactivity/PlaylistsFragment.kt | 6 +- .../fragments/mainactivity/SongsFragment.kt | 8 +- .../mainactivity/folders/FoldersFragment.java | 6 +- .../mainactivity/home/BannerHomeFragment.kt | 6 +- .../player/PlayerAlbumCoverFragment.kt | 13 +-- .../player/adaptive/AdaptiveFragment.kt | 6 +- .../AdaptivePlaybackControlsFragment.kt | 4 +- .../blur/BlurPlaybackControlsFragment.kt | 5 +- .../player/blur/BlurPlayerFragment.kt | 6 +- .../fragments/player/card/CardFragment.kt | 8 +- .../card/CardPlaybackControlsFragment.kt | 5 +- .../player/cardblur/CardBlurFragment.kt | 8 +- .../CardBlurPlaybackControlsFragment.kt | 5 +- .../player/classic/ClassicPlayerFragment.kt | 12 +- .../ClassicPlayerPlaybackControlsFragment.kt | 6 +- .../fragments/player/color/ColorFragment.kt | 6 +- .../color/ColorPlaybackControlsFragment.kt | 4 +- .../fragments/player/fit/FitFragment.kt | 6 +- .../player/fit/FitPlaybackControlsFragment.kt | 5 +- .../flat/FlatPlaybackControlsFragment.kt | 5 +- .../player/flat/FlatPlayerFragment.kt | 6 +- .../full/FullPlaybackControlsFragment.kt | 4 +- .../player/full/FullPlayerFragment.kt | 6 +- .../LockScreenPlayerControlsFragment.kt | 4 +- .../material/MaterialControlsFragment.kt | 5 +- .../player/material/MaterialFragment.kt | 8 +- .../fragments/player/normal/PlayerFragment.kt | 8 +- .../normal/PlayerPlaybackControlsFragment.kt | 4 +- .../plain/PlainPlaybackControlsFragment.kt | 5 +- .../player/plain/PlainPlayerFragment.kt | 6 +- .../simple/SimplePlaybackControlsFragment.kt | 4 +- .../player/simple/SimplePlayerFragment.kt | 6 +- .../player/slide/SlidePlayerFragment.kt | 11 +- .../tiny/TinyPlaybackControlsFragment.kt | 4 +- .../player/tiny/TinyPlayerFragment.kt | 8 +- .../fragments/settings/AbsSettingsFragment.kt | 2 +- .../fragments/settings/AudioSettings.kt | 2 +- .../settings/ImageSettingFragment.kt | 2 +- .../settings/MainSettingsFragment.kt | 4 +- .../settings/NotificationSettingsFragment.kt | 2 +- .../settings/NowPlayingSettingsFragment.kt | 2 +- .../settings/OtherSettingsFragment.kt | 2 +- .../settings/PersonaizeSettingsFragment.kt | 2 +- .../settings/ThemeSettingsFragment.kt | 2 +- .../retromusic/helper/LastChanceHandler.kt | 2 +- .../retromusic/helper/menu/SongMenuHelper.kt | 4 +- .../code/name/monkey/retromusic/model/Home.kt | 2 +- .../mvp/presenter/ArtistDetailsPresenter.kt | 2 +- .../retromusic/mvp/presenter/HomePresenter.kt | 12 +- .../AlbumCoverStylePreferenceDialog.kt | 2 +- .../NowPlayingScreenPreferenceDialog.kt | 2 +- .../notification/PlayingNotificationImpl.kt | 2 +- .../notification/PlayingNotificationImpl24.kt | 2 +- .../notification/PlayingNotificationOreo.kt | 2 +- .../bugreport/ErrorHandlerActivity.kt | 1 - .../retromusic/util/NavigationUtil.java | 30 ++--- .../retromusic/util/PreferenceUtil.java | 8 +- .../views/MetalRecyclerViewPager.kt | 2 +- .../RoundedBottomSheetDialogFragment.java | 3 +- ...album_cover_circle.webp => np_circle.webp} | Bin app/src/main/res/drawable/promotional.webp | Bin 28738 -> 0 bytes .../main/res/layout-land/fragment_blur.xml | 4 +- .../layout-land/fragment_card_blur_player.xml | 4 +- .../res/layout-land/fragment_card_player.xml | 4 +- .../layout-land/fragment_classic_player.xml | 4 +- .../res/layout-land/fragment_color_player.xml | 2 +- .../res/layout-land/fragment_flat_player.xml | 4 +- .../res/layout-land/fragment_material.xml | 4 +- .../res/layout-land/fragment_plain_player.xml | 4 +- .../main/res/layout-land/fragment_player.xml | 4 +- .../layout-land/fragment_simple_player.xml | 4 +- .../res/layout-land/fragment_slide_player.xml | 2 +- .../res/layout-xlarge-land/fragment_blur.xml | 4 +- .../layout-xlarge-land/fragment_player.xml | 4 +- .../main/res/layout-xlarge/fragment_blur.xml | 4 +- .../res/layout-xlarge/fragment_player.xml | 4 +- .../layout/activity_lock_screen_old_style.xml | 2 +- .../main/res/layout/activity_whats_new.xml | 2 +- .../res/layout/fragment_adaptive_player.xml | 4 +- app/src/main/res/layout/fragment_blur.xml | 4 +- .../fragment_blur_playback_controls.xml | 2 +- .../res/layout/fragment_card_blur_player.xml | 4 +- .../main/res/layout/fragment_card_player.xml | 4 +- .../res/layout/fragment_classic_player.xml | 4 +- .../main/res/layout/fragment_color_player.xml | 2 +- app/src/main/res/layout/fragment_fit.xml | 4 +- .../main/res/layout/fragment_flat_player.xml | 4 +- app/src/main/res/layout/fragment_full.xml | 4 +- .../main/res/layout/fragment_main_options.xml | 57 ++++----- app/src/main/res/layout/fragment_material.xml | 4 +- .../main/res/layout/fragment_plain_player.xml | 4 +- app/src/main/res/layout/fragment_player.xml | 4 +- .../res/layout/fragment_simple_player.xml | 4 +- .../main/res/layout/fragment_slide_player.xml | 2 +- .../main/res/layout/fragment_tiny_player.xml | 4 +- .../res/layout/sliding_music_panel_layout.xml | 2 +- app/src/main/res/layout/volume_controls.xml | 2 +- app/src/main/res/values/strings.xml | 1 + .../common/prefs/ATECheckBoxPreference.kt | 80 ------------- .../common/prefs/ATEEditTextPreference.kt | 33 ------ .../common/prefs/ATEListPreference.kt | 36 ------ .../common/prefs/ATEMultiSelectPreference.kt | 32 ------ .../common/prefs/ATEPreference.kt | 32 ------ .../common/prefs/ATEPreferenceCategory.kt | 32 ------ .../common/prefs/ATESwitchPreference.kt | 108 ------------------ .../prefs/supportv7/ATESwitchPreference.kt | 3 +- .../src/main/res/drawable/ate_switch.xml | 6 +- .../layout/ate_preference_custom_support.xml | 3 +- 188 files changed, 440 insertions(+), 835 deletions(-) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/AboutActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/AlbumDetailsActivity.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/ArtistDetailActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/EqualizerActivity.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/GenreDetailsActivity.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/LicenseActivity.kt (92%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/LockScreenActivity.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/LyricsActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/MainActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/PlayingQueueActivity.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/PlaylistDetailActivity.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/PurchaseActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/SearchActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/SettingsActivity.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/SupportDevelopmentActivity.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/UserInfoActivity.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/WhatsNewActivity.java (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/base/AbsBaseActivity.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/base/AbsCrashCollector.kt (86%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/base/AbsMusicServiceActivity.kt (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/base/AbsSlidingMusicPanelActivity.kt (89%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/base/AbsThemeActivity.kt (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/BugReportActivity.kt (95%) create mode 100644 app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/model/DeviceInfo.java (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/model/Report.java (82%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/model/github/ExtraInfo.java (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/model/github/GithubLogin.java (91%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/bugreport/model/github/GithubTarget.java (83%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/tageditor/AbsTagEditorActivity.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/tageditor/AlbumTagEditorActivity.kt (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/tageditor/SongTagEditorActivity.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/activities/tageditor/WriteTagsAsyncTask.java (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/CollageSongAdapter.kt (93%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/ContributorAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/GenreAdapter.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/HomeAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/SearchAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/SongFileAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/SpanSongsAdapter.kt (88%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/album/AlbumAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/album/AlbumCoverPagerAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/album/AlbumFullWidthAdapter.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/album/HorizontalAlbumAdapter.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/artist/ArtistAdapter.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/base/AbsMultiSelectAdapter.java (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/base/MediaEntryViewHolder.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/playlist/AddToPlaylist.kt (87%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/playlist/PlaylistAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/AbsOffsetSongAdapter.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/OrderablePlaylistSongAdapter.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/PlayingQueueAdapter.kt (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/PlaylistSongAdapter.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/ShuffleButtonSongAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/SimpleSongAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/adapter/song/SongAdapter.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/AlbumCoverStyle.kt (85%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/MiniPlayerFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/NowPlayingScreen.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/VolumeFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsLibraryPagerFragment.kt (72%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsMainActivityFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsMusicServiceFragment.kt (92%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsPlayerControlsFragment.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/base/AbsPlayerFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/AlbumsFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/ArtistsFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/GenreFragment.kt (92%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/LibraryFragment.java (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/PlaylistsFragment.kt (92%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/SongsFragment.kt (93%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/folders/FoldersFragment.java (99%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/mainactivity/home/BannerHomeFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/PlayerAlbumCoverFragment.kt (88%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/adaptive/AdaptiveFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/blur/BlurPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/blur/BlurPlayerFragment.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/card/CardFragment.kt (91%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/card/CardPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/cardblur/CardBlurFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/classic/ClassicPlayerFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/color/ColorFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/color/ColorPlaybackControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/fit/FitFragment.kt (93%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/fit/FitPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/flat/FlatPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/flat/FlatPlayerFragment.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/full/FullPlaybackControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/full/FullPlayerFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/material/MaterialControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/material/MaterialFragment.kt (91%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/normal/PlayerFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/normal/PlayerPlaybackControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/plain/PlainPlaybackControlsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/plain/PlainPlayerFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/simple/SimplePlaybackControlsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/simple/SimplePlayerFragment.kt (93%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/slide/SlidePlayerFragment.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/tiny/TinyPlaybackControlsFragment.kt (96%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/player/tiny/TinyPlayerFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/AbsSettingsFragment.kt (98%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/AudioSettings.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/ImageSettingFragment.kt (94%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/MainSettingsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/NotificationSettingsFragment.kt (95%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/NowPlayingSettingsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/OtherSettingsFragment.kt (93%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/PersonaizeSettingsFragment.kt (97%) rename app/src/main/java/code/name/monkey/retromusic/{ui => }/fragments/settings/ThemeSettingsFragment.kt (98%) delete mode 100644 app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt rename app/src/main/res/drawable-xxxhdpi/{album_cover_circle.webp => np_circle.webp} (100%) delete mode 100644 app/src/main/res/drawable/promotional.webp delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATECheckBoxPreference.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEEditTextPreference.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEListPreference.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEMultiSelectPreference.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreference.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEPreferenceCategory.kt delete mode 100644 appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATESwitchPreference.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 78e3f078..c0e2639d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:theme="@style/Theme.RetroMusic.Light" android:usesCleartextTraffic="false"> @@ -84,36 +84,36 @@ - - - - - - - - + + + + + + + + - - + + - - - - - + + + + + - - + + diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt index fc3bd753..119636c0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.Intent import android.content.pm.PackageManager @@ -23,8 +23,8 @@ import code.name.monkey.retromusic.Constants.TELEGRAM_CHANGE_LOG import code.name.monkey.retromusic.Constants.TRANSLATE import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Contributor -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity -import code.name.monkey.retromusic.ui.adapter.ContributorAdapter +import code.name.monkey.retromusic.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.adapter.ContributorAdapter import code.name.monkey.retromusic.util.NavigationUtil import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.list.listItems diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index 7c4d47fd..e195b77a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.Intent import android.content.res.ColorStateList @@ -32,11 +32,11 @@ import code.name.monkey.retromusic.misc.AppBarStateChangeListener import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.mvp.contract.AlbumDetailsContract import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity -import code.name.monkey.retromusic.ui.activities.tageditor.AlbumTagEditorActivity -import code.name.monkey.retromusic.ui.adapter.album.HorizontalAlbumAdapter -import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity +import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity +import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter +import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt index 8389410b..ded4bf05 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.app.Activity import android.content.Intent @@ -34,10 +34,10 @@ import code.name.monkey.retromusic.mvp.contract.ArtistDetailContract import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter import code.name.monkey.retromusic.rest.LastFMRestClient import code.name.monkey.retromusic.rest.model.LastFmArtist -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter -import code.name.monkey.retromusic.ui.adapter.album.HorizontalAlbumAdapter -import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.album.AlbumAdapter +import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter +import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.util.* import com.google.android.material.appbar.AppBarLayout import kotlinx.android.synthetic.main.activity_artist_content.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt index 70546c13..7a6a240b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/EqualizerActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/EqualizerActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.os.Bundle import android.transition.TransitionManager @@ -16,7 +16,7 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.EqualizerHelper -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity import code.name.monkey.retromusic.util.ViewUtil import kotlinx.android.synthetic.main.activity_equalizer.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt index 60bdfe95..ca2c94e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.res.ColorStateList import android.graphics.Color @@ -21,8 +21,8 @@ import code.name.monkey.retromusic.model.Genre import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.mvp.contract.GenreDetailsContract import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.song.SongAdapter import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.ViewUtil import com.afollestad.materialcab.MaterialCab diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt similarity index 92% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt index b88d27da..8fda93fe 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LicenseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt @@ -1,11 +1,11 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.os.Bundle import android.view.MenuItem import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.activities.base.AbsBaseActivity import kotlinx.android.synthetic.main.activity_license.* class LicenseActivity : AbsBaseActivity() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt index f7f1583a..667142a9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LockScreenActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.app.KeyguardManager import android.content.Context @@ -13,8 +13,8 @@ import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.ui.fragments.player.lockscreen.LockScreenPlayerControlsFragment +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment import com.r0adkll.slidr.Slidr import com.r0adkll.slidr.model.SlidrConfig import com.r0adkll.slidr.model.SlidrListener diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt index 8feba415..50fe5088 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/LyricsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.annotation.SuppressLint import android.content.res.ColorStateList @@ -26,9 +26,9 @@ import code.name.monkey.retromusic.lyrics.LrcHelper import code.name.monkey.retromusic.lyrics.LrcView import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.ui.activities.tageditor.WriteTagsAsyncTask -import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.activities.tageditor.WriteTagsAsyncTask +import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment import code.name.monkey.retromusic.util.LyricUtil import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index 47efefc6..43d52d0f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.annotation.SuppressLint import android.content.* @@ -19,9 +19,9 @@ import code.name.monkey.retromusic.loaders.AlbumLoader import code.name.monkey.retromusic.loaders.ArtistLoader import code.name.monkey.retromusic.loaders.PlaylistSongsLoader import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment -import code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment +import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt index cf385135..c1399ee6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlayingQueueActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.res.ColorStateList import android.os.Bundle @@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.ui.adapter.song.PlayingQueueAdapter +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter import code.name.monkey.retromusic.util.MusicUtil import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index 998eb81e..606a4d0b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.res.ColorStateList import android.graphics.Color @@ -22,10 +22,10 @@ import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.mvp.contract.PlaylistSongsContract import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.adapter.song.OrderablePlaylistSongAdapter -import code.name.monkey.retromusic.ui.adapter.song.PlaylistSongAdapter -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter +import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter +import code.name.monkey.retromusic.adapter.song.SongAdapter import code.name.monkey.retromusic.util.PlaylistsUtil import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.ViewUtil @@ -33,7 +33,6 @@ import com.afollestad.materialcab.MaterialCab import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils -import kotlinx.android.synthetic.main.abs_playlists.* import kotlinx.android.synthetic.main.activity_playlist_detail.* import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt index e567838e..13b02a12 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PurchaseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.Intent import android.os.AsyncTask @@ -12,7 +12,7 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.App import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.activities.base.AbsBaseActivity import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.TransactionDetails import kotlinx.android.synthetic.main.activity_pro_version.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt index 15c68b4a..66bf5195 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.app.Activity import android.app.SearchManager @@ -24,8 +24,8 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.mvp.contract.SearchContract import code.name.monkey.retromusic.mvp.presenter.SearchPresenter -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity -import code.name.monkey.retromusic.ui.adapter.SearchAdapter +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.adapter.SearchAdapter import code.name.monkey.retromusic.util.RetroUtil import kotlinx.android.synthetic.main.activity_search.* import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt index cf5524ba..21d0ca72 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SettingsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.SharedPreferences import android.os.Bundle @@ -8,8 +8,8 @@ import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity -import code.name.monkey.retromusic.ui.fragments.settings.MainSettingsFragment +import code.name.monkey.retromusic.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.fragments.settings.MainSettingsFragment import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.activity_settings.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 2611d338..99aad4dd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.content.Intent import android.graphics.Paint @@ -21,7 +21,7 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.activities.base.AbsBaseActivity import code.name.monkey.retromusic.views.IconImageView import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.SkuDetails diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt index 1bfee840..d3ab30e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities +package code.name.monkey.retromusic.activities import android.app.Activity import android.content.* @@ -19,9 +19,8 @@ import code.name.monkey.retromusic.App import code.name.monkey.retromusic.Constants.USER_BANNER import code.name.monkey.retromusic.Constants.USER_PROFILE import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.activities.base.AbsBaseActivity import code.name.monkey.retromusic.util.Compressor -import code.name.monkey.retromusic.util.ImageUtil import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap import code.name.monkey.retromusic.util.PreferenceUtil import com.afollestad.materialdialogs.MaterialDialog diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java rename to app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java index f7f2081a..005ac559 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities; +package code.name.monkey.retromusic.activities; import android.content.Context; import android.content.pm.PackageInfo; @@ -15,14 +15,13 @@ import java.io.InputStreamReader; import androidx.annotation.NonNull; import androidx.appcompat.widget.Toolbar; -import androidx.recyclerview.widget.LinearSmoothScroller; -import androidx.recyclerview.widget.RecyclerView; + import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ATHUtil; import code.name.monkey.appthemehelper.util.ColorUtil; import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity; +import code.name.monkey.retromusic.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.util.PreferenceUtil; public class WhatsNewActivity extends AbsBaseActivity { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt index 16685b3f..13f3f368 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt @@ -1,7 +1,6 @@ -package code.name.monkey.retromusic.ui.activities.base +package code.name.monkey.retromusic.activities.base import android.Manifest -import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.media.AudioManager @@ -14,7 +13,6 @@ import android.view.View import androidx.core.app.ActivityCompat import code.name.monkey.appthemehelper.ThemeStore import com.google.android.material.snackbar.Snackbar -import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper abstract class AbsBaseActivity : AbsThemeActivity() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt similarity index 86% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt index 3eee75ea..9bd0575d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsCrashCollector.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCrashCollector.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.base +package code.name.monkey.retromusic.activities.base import android.os.Bundle import code.name.monkey.appthemehelper.ATHActivity diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt index a51024b1..893c65e8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsMusicServiceActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.base +package code.name.monkey.retromusic.activities.base import android.Manifest import android.content.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt similarity index 89% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index c1ec9306..669e8fa8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.base +package code.name.monkey.retromusic.activities.base import android.animation.ValueAnimator import android.annotation.SuppressLint @@ -12,23 +12,23 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment -import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen -import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen.* -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.adaptive.AdaptiveFragment -import code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.card.CardFragment -import code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurFragment -import code.name.monkey.retromusic.ui.fragments.player.color.ColorFragment -import code.name.monkey.retromusic.ui.fragments.player.fit.FitFragment -import code.name.monkey.retromusic.ui.fragments.player.flat.FlatPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.full.FullPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.material.MaterialFragment -import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.tiny.TinyPlayerFragment +import code.name.monkey.retromusic.fragments.MiniPlayerFragment +import code.name.monkey.retromusic.fragments.NowPlayingScreen +import code.name.monkey.retromusic.fragments.NowPlayingScreen.* +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment +import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment +import code.name.monkey.retromusic.fragments.player.card.CardFragment +import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment +import code.name.monkey.retromusic.fragments.player.color.ColorFragment +import code.name.monkey.retromusic.fragments.player.fit.FitFragment +import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment +import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment +import code.name.monkey.retromusic.fragments.player.material.MaterialFragment +import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment +import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment +import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment +import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.views.BottomNavigationBarTinted import com.sothree.slidinguppanel.SlidingUpPanelLayout diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt index 6948b909..64e87c09 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.base +package code.name.monkey.retromusic.activities.base import android.graphics.Color import android.graphics.drawable.Drawable diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index b24df74c..98a3d4ed 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.bugreport +package code.name.monkey.retromusic.activities.bugreport import android.app.Activity import android.app.Dialog @@ -19,12 +19,12 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.misc.DialogAsyncTask -import code.name.monkey.retromusic.ui.activities.base.AbsThemeActivity -import code.name.monkey.retromusic.ui.activities.bugreport.model.DeviceInfo -import code.name.monkey.retromusic.ui.activities.bugreport.model.Report -import code.name.monkey.retromusic.ui.activities.bugreport.model.github.ExtraInfo -import code.name.monkey.retromusic.ui.activities.bugreport.model.github.GithubLogin -import code.name.monkey.retromusic.ui.activities.bugreport.model.github.GithubTarget +import code.name.monkey.retromusic.activities.base.AbsThemeActivity +import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo +import code.name.monkey.retromusic.activities.bugreport.model.Report +import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo +import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin +import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.callbacks.onCancel import com.google.android.material.floatingactionbutton.FloatingActionButton diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt new file mode 100644 index 00000000..73765329 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/ErrorHandlerActivity.kt @@ -0,0 +1 @@ +package code.name.monkey.retromusic.activities.bugreport import android.content.ActivityNotFoundException import android.content.Intent import android.net.Uri import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo import kotlinx.android.synthetic.main.activity_error_handler.* class ErrorHandlerActivity : AppCompatActivity() { private var deviceInfo: DeviceInfo? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_error_handler) deviceInfo = DeviceInfo(this) clearAppData.setOnClickListener { try { val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS) intent.data = Uri.parse("package:$packageName") startActivity(intent) } catch (e: ActivityNotFoundException) { val intent = Intent(android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS) startActivity(intent) } } sendCrashLog.setOnClickListener { val sendIntent = Intent(Intent.ACTION_SEND) val subject = "Error report" val body = intent.getStringExtra("error") + "\n" + deviceInfo!!.toString() sendIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf("monkeycodeapp@gmail.com")) sendIntent.putExtra(Intent.EXTRA_TEXT, body) sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject) sendIntent.type = "message/rfc822" startActivity(Intent.createChooser(sendIntent, "Send crash log")) deleteFile("stack.trace") } showCrashError.text = String.format("%s", intent.getStringExtra("error")) showCrashError.append(deviceInfo!!.toString()) } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java index 6dabfa86..dd5d5463 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/DeviceInfo.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.bugreport.model; +package code.name.monkey.retromusic.activities.bugreport.model; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java similarity index 82% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java index b4ef3532..4549693f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/Report.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java @@ -1,7 +1,7 @@ -package code.name.monkey.retromusic.ui.activities.bugreport.model; +package code.name.monkey.retromusic.activities.bugreport.model; -import code.name.monkey.retromusic.ui.activities.bugreport.model.github.ExtraInfo; +import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo; public class Report { private final String title; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java index 44610d88..c9bedfa6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/ExtraInfo.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.bugreport.model.github; +package code.name.monkey.retromusic.activities.bugreport.model.github; import java.util.LinkedHashMap; import java.util.Map; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java similarity index 91% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java index 5ddab5ed..a2d147ee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubLogin.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.bugreport.model.github; +package code.name.monkey.retromusic.activities.bugreport.model.github; import android.text.TextUtils; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java similarity index 83% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java rename to app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java index 8e6acc2a..4bea98be 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/model/github/GithubTarget.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.bugreport.model.github; +package code.name.monkey.retromusic.activities.bugreport.model.github; public class GithubTarget { private final String username; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt index 6acbb320..5d3134cb 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.tageditor +package code.name.monkey.retromusic.activities.tageditor import android.app.Activity import android.app.SearchManager @@ -17,7 +17,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity +import code.name.monkey.retromusic.activities.base.AbsBaseActivity import code.name.monkey.retromusic.util.RetroUtil import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.list.listItems diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt index cc9c02d7..c9778a40 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AlbumTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.tageditor +package code.name.monkey.retromusic.activities.tageditor import android.app.Activity import android.content.res.ColorStateList diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt index 4fbf4296..65075528 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.tageditor +package code.name.monkey.retromusic.activities.tageditor import android.net.Uri import android.os.Bundle diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java rename to app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java index 40b8edaa..9648fdd6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/WriteTagsAsyncTask.java +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.activities.tageditor; +package code.name.monkey.retromusic.activities.tageditor; import android.app.Activity; import android.app.Dialog; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt similarity index 93% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt index ac697368..ef2dac03 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/CollageSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.app.Activity import android.view.LayoutInflater @@ -16,8 +16,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.CollageSongAdapter.CollageSongViewHolder -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.CollageSongAdapter.CollageSongViewHolder +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import java.util.* /** diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt index 74e2fb02..880d34e4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/ContributorAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.app.Activity import android.view.LayoutInflater diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt index b7f780ad..60839503 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.app.Activity import android.view.LayoutInflater @@ -10,7 +10,7 @@ import java.util.Locale import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Genre -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.NavigationUtil /** diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index 7f5e8e52..2ac647d8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.util.DisplayMetrics import android.view.LayoutInflater @@ -22,9 +22,9 @@ import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.loaders.PlaylistSongsLoader import code.name.monkey.retromusic.model.* -import code.name.monkey.retromusic.ui.adapter.album.AlbumFullWidthAdapter -import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter +import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter +import code.name.monkey.retromusic.adapter.artist.ArtistAdapter +import code.name.monkey.retromusic.adapter.song.SongAdapter import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.views.IconImageView import code.name.monkey.retromusic.views.MetalRecyclerViewPager diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt index 8b95dd62..64a8f3d8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.view.LayoutInflater import android.view.View @@ -15,7 +15,7 @@ import code.name.monkey.retromusic.helper.menu.SongMenuHelper import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index 44411953..e3c18089 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SongFileAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import android.graphics.PorterDuff import android.graphics.drawable.Drawable @@ -13,8 +13,8 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.audiocover.AudioFileCover import code.name.monkey.retromusic.interfaces.CabHolder -import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.GenericTransitionOptions import com.bumptech.glide.load.engine.DiskCacheStrategy diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt similarity index 88% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt index f0b01396..313f65c2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/SpanSongsAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SpanSongsAdapter.kt @@ -1,10 +1,10 @@ -package code.name.monkey.retromusic.ui.adapter +package code.name.monkey.retromusic.adapter import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.StaggeredGridLayoutManager import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter +import code.name.monkey.retromusic.adapter.song.SongAdapter import java.util.* class SpanSongsAdapter(activity: AppCompatActivity, dataSet: ArrayList, itemLayoutRes: Int, usePalette: Boolean, cabHolder: CabHolder?) : SongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index a749fb16..3bf36fdd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.album +package code.name.monkey.retromusic.adapter.album import android.content.res.ColorStateList import android.graphics.drawable.Drawable @@ -21,8 +21,8 @@ import code.name.monkey.retromusic.helper.menu.SongsMenuHelper import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index f4d7b63a..5015db01 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.album +package code.name.monkey.retromusic.adapter.album import android.content.Intent import android.graphics.drawable.Drawable @@ -15,8 +15,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.activities.LyricsActivity -import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle +import code.name.monkey.retromusic.activities.LyricsActivity +import code.name.monkey.retromusic.fragments.AlbumCoverStyle import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt index f7ef05fa..ea4407e8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumFullWidthAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package code.name.monkey.retromusic.ui.adapter.album +package code.name.monkey.retromusic.adapter.album import android.app.Activity import android.util.DisplayMetrics diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt index d3b63896..d95b659b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.album +package code.name.monkey.retromusic.adapter.album import android.graphics.drawable.Drawable import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index 605649ec..7d5adf9f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.artist +package code.name.monkey.retromusic.adapter.artist import android.content.res.ColorStateList import android.view.LayoutInflater @@ -19,8 +19,8 @@ import code.name.monkey.retromusic.helper.menu.SongsMenuHelper import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java rename to app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java index 6718654e..f184337b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/AbsMultiSelectAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.base; +package code.name.monkey.retromusic.adapter.base; import android.content.Context; import androidx.annotation.MenuRes; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt index 2749ab98..408f1b75 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt @@ -1,6 +1,5 @@ -package code.name.monkey.retromusic.ui.adapter.base +package code.name.monkey.retromusic.adapter.base -import android.graphics.Color import android.os.Build import android.view.View import android.view.ViewGroup @@ -11,7 +10,6 @@ import androidx.cardview.widget.CardView import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R -import com.google.android.material.card.MaterialCardView open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener { override fun onLongClick(v: View?): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt similarity index 87% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt index f85746ee..684270ba 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/AddToPlaylist.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/AddToPlaylist.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.playlist +package code.name.monkey.retromusic.adapter.playlist import android.app.Activity import android.app.Dialog @@ -10,8 +10,8 @@ import java.util.ArrayList import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.ui.adapter.playlist.AddToPlaylist.ViewHolder +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.playlist.AddToPlaylist.ViewHolder import code.name.monkey.retromusic.util.PlaylistsUtil class AddToPlaylist(private val activity: Activity, diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index 832baa5e..e8465c09 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.playlist +package code.name.monkey.retromusic.adapter.playlist import android.graphics.drawable.Drawable import android.view.LayoutInflater @@ -23,8 +23,8 @@ import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist -import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt index 935867e7..98a0f5ae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt index 87b68f15..88f78b8b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/OrderablePlaylistSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.view.MenuItem import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt index 3dd00b10..eaaf686e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlayingQueueAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.graphics.Color import android.graphics.PorterDuff diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt index fcc6f1c8..b39a0823 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.view.MenuItem import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt index 48607586..f5a16bc3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.view.View import androidx.annotation.LayoutRes diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt index 7c2e680a..ccf13a5a 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SimpleSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt rename to app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index 6164bfd9..3ebef434 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.adapter.song +package code.name.monkey.retromusic.adapter.song import android.graphics.drawable.Drawable import android.view.LayoutInflater @@ -21,8 +21,8 @@ import code.name.monkey.retromusic.helper.menu.SongMenuHelper import code.name.monkey.retromusic.helper.menu.SongsMenuHelper import code.name.monkey.retromusic.interfaces.CabHolder import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.base.AbsMultiSelectAdapter -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt index d514484c..9be37e02 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt @@ -29,7 +29,7 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.SearchActivity +import code.name.monkey.retromusic.activities.SearchActivity class AppShortcutLauncherActivity : Activity() { diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index f3eee925..f3f7d4f4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt @@ -31,7 +31,7 @@ import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.transition.Transition diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt index f5e70cd8..a23d2589 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt @@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.transition.Transition diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt index ff27a6d7..c63a27ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt @@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.transition.Transition diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt index 31e36909..bc2a765d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt @@ -32,7 +32,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.RetroUtil import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.transition.Transition diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt index 2b259cfa..9382faa0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt @@ -27,7 +27,7 @@ import code.name.monkey.retromusic.Constants import code.name.monkey.retromusic.R import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.RetroUtil class AppWidgetText : BaseAppWidget() { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt index db03ddc4..578012c1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt @@ -25,7 +25,7 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R import code.name.monkey.retromusic.loaders.PlaylistLoader import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.adapter.playlist.AddToPlaylist +import code.name.monkey.retromusic.adapter.playlist.AddToPlaylist import code.name.monkey.retromusic.views.RoundedBottomSheetDialogFragment import kotlinx.android.synthetic.main.dialog_add_to_playlist.* diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt index 6fc1f8f7..0d66413a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt @@ -26,9 +26,9 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.App import code.name.monkey.retromusic.Constants.USER_PROFILE import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.MainActivity -import code.name.monkey.retromusic.ui.activities.bugreport.BugReportActivity -import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment +import code.name.monkey.retromusic.activities.MainActivity +import code.name.monkey.retromusic.activities.bugreport.BugReportActivity +import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment import code.name.monkey.retromusic.util.Compressor import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt similarity index 85% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt index 48817d98..48764425 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/AlbumCoverStyle.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments +package code.name.monkey.retromusic.fragments import androidx.annotation.DrawableRes import androidx.annotation.StringRes @@ -11,7 +11,7 @@ enum class AlbumCoverStyle(@param:StringRes @field:StringRes val drawableResId: Int, val id: Int) { NORMAL(R.string.normal, R.drawable.np_normal, 0), FLAT(R.string.flat, R.drawable.np_flat, 1), - CIRCLE(R.string.circular, R.drawable.album_cover_circle, 2), + CIRCLE(R.string.circular, R.drawable.np_circle, 2), MATERIAL(R.string.material, R.drawable.np_material, 3), CARD(R.string.card, R.drawable.np_blur_card, 4), FULL(R.string.full, R.drawable.np_full, 5), diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt index 19e671b1..e7ace8b6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments +package code.name.monkey.retromusic.fragments import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -14,7 +14,7 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler -import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment +import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt index f26b1156..e3a61c7e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/NowPlayingScreen.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments +package code.name.monkey.retromusic.fragments import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index ff9b4ba5..d5d46d2e 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments +package code.name.monkey.retromusic.fragments import android.content.Context import android.graphics.Color @@ -12,7 +12,6 @@ import android.widget.SeekBar import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil -import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt similarity index 72% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt index f7949319..c1ceaefc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt @@ -1,7 +1,7 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.os.Bundle -import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment +import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment open class AbsLibraryPagerFragment : AbsMusicServiceFragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt index 35343204..ec0feb9e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.os.Bundle import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt index ee93dd03..7246dfee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt index cb4babc4..168f418f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMainActivityFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.os.Build import android.os.Bundle @@ -9,7 +9,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity abstract class AbsMainActivityFragment : AbsMusicServiceFragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt similarity index 92% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt index 6487572b..f916b08d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsMusicServiceFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt @@ -1,11 +1,11 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.content.Context import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import code.name.monkey.retromusic.interfaces.MusicServiceEventListener -import code.name.monkey.retromusic.ui.activities.base.AbsMusicServiceActivity +import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity /** * Created by hemanths on 18/08/17. diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt index fea5c543..98d7f481 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.os.Bundle import android.view.View @@ -6,7 +6,7 @@ import android.view.animation.AccelerateInterpolator import android.view.animation.DecelerateInterpolator import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper -import code.name.monkey.retromusic.ui.fragments.VolumeFragment +import code.name.monkey.retromusic.fragments.VolumeFragment import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index e338a317..412d2475 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.base +package code.name.monkey.retromusic.fragments.base import android.annotation.SuppressLint import android.content.ContentUris @@ -20,9 +20,9 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.interfaces.PaletteColorHolder import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity -import code.name.monkey.retromusic.ui.activities.tageditor.SongTagEditorActivity -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity +import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.* import code.name.monkey.retromusic.views.FitSystemWindowsLayout import java.io.FileNotFoundException diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt index a202d1e9..e8bb33ff 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/AlbumsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity +package code.name.monkey.retromusic.fragments.mainactivity import android.os.Bundle import androidx.recyclerview.widget.GridLayoutManager @@ -6,8 +6,8 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.mvp.contract.AlbumContract import code.name.monkey.retromusic.mvp.presenter.AlbumPresenter -import code.name.monkey.retromusic.ui.adapter.album.AlbumAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment +import code.name.monkey.retromusic.adapter.album.AlbumAdapter +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment import code.name.monkey.retromusic.util.PreferenceUtil open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment(), AlbumContract.AlbumView { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt index bddb8bce..0d16dbce 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/ArtistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity +package code.name.monkey.retromusic.fragments.mainactivity import android.os.Bundle import androidx.recyclerview.widget.GridLayoutManager @@ -6,8 +6,8 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.mvp.contract.ArtistContract import code.name.monkey.retromusic.mvp.presenter.ArtistPresenter -import code.name.monkey.retromusic.ui.adapter.artist.ArtistAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment +import code.name.monkey.retromusic.adapter.artist.ArtistAdapter +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt similarity index 92% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt index a31c151a..eb5989bd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/GenreFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenreFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity +package code.name.monkey.retromusic.fragments.mainactivity import android.os.Bundle import android.view.Menu @@ -8,8 +8,8 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Genre import code.name.monkey.retromusic.mvp.contract.GenreContract import code.name.monkey.retromusic.mvp.presenter.GenrePresenter -import code.name.monkey.retromusic.ui.adapter.GenreAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewFragment +import code.name.monkey.retromusic.adapter.GenreAdapter +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java index 7c474b22..22446b9d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/LibraryFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity; +package code.name.monkey.retromusic.fragments.mainactivity; import android.app.Activity; import android.graphics.Bitmap; @@ -40,8 +40,8 @@ import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog; import code.name.monkey.retromusic.helper.SortOrder; import code.name.monkey.retromusic.interfaces.CabHolder; import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks; -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment; -import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment; +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment; +import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment; import code.name.monkey.retromusic.util.Compressor; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroColorUtil; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt similarity index 92% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt index 8871a690..8bbd0e8f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/PlaylistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity +package code.name.monkey.retromusic.fragments.mainactivity import android.os.Bundle import android.view.Menu @@ -8,8 +8,8 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.mvp.contract.PlaylistContract import code.name.monkey.retromusic.mvp.presenter.PlaylistPresenter -import code.name.monkey.retromusic.ui.adapter.playlist.PlaylistAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewFragment +import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt similarity index 93% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt index e444bf35..6fe1aae2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/SongsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity +package code.name.monkey.retromusic.fragments.mainactivity import android.os.Bundle import androidx.recyclerview.widget.GridLayoutManager @@ -7,9 +7,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.mvp.contract.SongContract import code.name.monkey.retromusic.mvp.presenter.SongPresenter -import code.name.monkey.retromusic.ui.adapter.song.ShuffleButtonSongAdapter -import code.name.monkey.retromusic.ui.adapter.song.SongAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment +import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter +import code.name.monkey.retromusic.adapter.song.SongAdapter +import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java similarity index 99% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java index 429fa510..b2ec3874 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity.folders; +package code.name.monkey.retromusic.fragments.mainactivity.folders; import android.app.Dialog; import android.content.Context; @@ -60,8 +60,8 @@ import code.name.monkey.retromusic.misc.DialogAsyncTask; import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener; import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader; import code.name.monkey.retromusic.model.Song; -import code.name.monkey.retromusic.ui.adapter.SongFileAdapter; -import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment; +import code.name.monkey.retromusic.adapter.SongFileAdapter; +import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment; import code.name.monkey.retromusic.util.FileUtil; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroColorUtil; diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index 73be8a92..17e0a6ec 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.mainactivity.home +package code.name.monkey.retromusic.fragments.mainactivity.home import android.graphics.Bitmap import android.graphics.Color @@ -26,8 +26,8 @@ import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist import code.name.monkey.retromusic.mvp.contract.HomeContract import code.name.monkey.retromusic.mvp.presenter.HomePresenter -import code.name.monkey.retromusic.ui.adapter.HomeAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsMainActivityFragment +import code.name.monkey.retromusic.adapter.HomeAdapter +import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment import code.name.monkey.retromusic.util.Compressor import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt similarity index 88% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt index 73b16d5d..7148817b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt @@ -1,21 +1,16 @@ -package code.name.monkey.retromusic.ui.fragments.player +package code.name.monkey.retromusic.fragments.player import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout -import android.widget.TextView import androidx.viewpager.widget.ViewPager import code.name.monkey.retromusic.helper.MusicPlayerRemote -import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper -import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics -import code.name.monkey.retromusic.model.lyrics.Lyrics import code.name.monkey.retromusic.transform.CarousalPagerTransformer import code.name.monkey.retromusic.transform.ParallaxPagerTransformer -import code.name.monkey.retromusic.ui.adapter.album.AlbumCoverPagerAdapter -import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen -import code.name.monkey.retromusic.ui.fragments.base.AbsMusicServiceFragment +import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter +import code.name.monkey.retromusic.fragments.NowPlayingScreen +import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_player_album_cover.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt index 4cb62cee..a7fe6d3e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptiveFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.adaptive +package code.name.monkey.retromusic.fragments.player.adaptive import android.os.Bundle import android.view.LayoutInflater @@ -11,8 +11,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import kotlinx.android.synthetic.main.fragment_adaptive_player.* class AdaptiveFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt index 16295e13..1998c6e4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.adaptive +package code.name.monkey.retromusic.fragments.player.adaptive import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -19,7 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index 5d4aa9f5..be8907a7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.blur +package code.name.monkey.retromusic.fragments.player.blur import android.animation.ObjectAnimator import android.graphics.Color @@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.ViewUtil import kotlinx.android.synthetic.main.fragment_player_playback_controls.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt index 9c5fab97..217d0a97 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/blur/BlurPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.blur +package code.name.monkey.retromusic.fragments.player.blur import android.graphics.Color import android.graphics.drawable.Drawable @@ -16,8 +16,8 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import kotlinx.android.synthetic.main.fragment_blur.* class BlurPlayerFragment : AbsPlayerFragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt similarity index 91% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt index fe1268b1..b3f920e0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.card +package code.name.monkey.retromusic.fragments.player.card import android.graphics.Color import android.os.Bundle @@ -10,9 +10,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment -import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment import kotlinx.android.synthetic.main.fragment_card_player.* class CardFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt index 8cbc1830..e75ed286 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/card/CardPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.card +package code.name.monkey.retromusic.fragments.player.card import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -19,8 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_card_player_playback_controls.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt index bfa821e4..492dfe69 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.cardblur +package code.name.monkey.retromusic.fragments.player.cardblur import android.graphics.Color import android.graphics.drawable.Drawable @@ -16,9 +16,9 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment -import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment import kotlinx.android.synthetic.main.fragment_card_blur_player.* class CardBlurFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index 6775d43b..e6e441e4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.cardblur +package code.name.monkey.retromusic.fragments.player.cardblur import android.animation.ObjectAnimator import android.graphics.Color @@ -19,8 +19,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.ViewUtil import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index 6e6d1bf0..1776a224 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.classic +package code.name.monkey.retromusic.fragments.player.classic import android.animation.Animator import android.animation.AnimatorSet @@ -21,11 +21,11 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.menu.SongMenuHelper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.ui.adapter.song.PlayingQueueAdapter -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt index fa65b39e..bddaa282 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.classic +package code.name.monkey.retromusic.fragments.player.classic import android.animation.ObjectAnimator import android.graphics.Color @@ -14,14 +14,12 @@ import androidx.annotation.NonNull import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper -import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.views.PlayPauseDrawable import kotlinx.android.synthetic.main.fragment_classic_player_playback_controls.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt index 511f82e0..3529b55c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.color +package code.name.monkey.retromusic.fragments.player.color import android.animation.ArgbEvaluator import android.animation.ValueAnimator @@ -26,8 +26,8 @@ import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.ui.activities.LyricsActivity -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.activities.LyricsActivity +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index f31c45c8..013ae905 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.color +package code.name.monkey.retromusic.fragments.player.color import android.animation.ObjectAnimator import android.content.res.ColorStateList @@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import kotlinx.android.synthetic.main.fragment_player_playback_controls.* import kotlinx.android.synthetic.main.media_button.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt similarity index 93% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt index 3329eadd..f7dac974 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.fit +package code.name.monkey.retromusic.fragments.player.fit import android.os.Bundle import android.view.LayoutInflater @@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import kotlinx.android.synthetic.main.fragment_fit.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt index 2d65f6bf..9abbd3ec 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/fit/FitPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.fit +package code.name.monkey.retromusic.fragments.player.fit import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_player_playback_controls.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt index e6756fca..7fbcdc57 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.flat +package code.name.monkey.retromusic.fragments.player.flat import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -21,8 +21,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt index 2690dd33..1a83b67b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/flat/FlatPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.flat +package code.name.monkey.retromusic.fragments.player.flat import android.animation.ArgbEvaluator import android.animation.ValueAnimator @@ -15,8 +15,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.views.DrawableGradient diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index 2a504cff..ca2a19ba 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.full +package code.name.monkey.retromusic.fragments.player.full import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -27,7 +27,7 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index 48d071b9..fa5c1132 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/full/FullPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.full +package code.name.monkey.retromusic.fragments.player.full import android.graphics.Color import android.os.Bundle @@ -21,8 +21,8 @@ import code.name.monkey.retromusic.loaders.ArtistLoader import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics import code.name.monkey.retromusic.model.lyrics.Lyrics -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.NavigationUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt index 89089a2d..9c03ab6f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.lockscreen +package code.name.monkey.retromusic.fragments.player.lockscreen import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt index 043977d5..e40c82e6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.material +package code.name.monkey.retromusic.fragments.player.material import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -18,8 +18,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt similarity index 91% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt index 14888840..d32b0e2f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/material/MaterialFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.material +package code.name.monkey.retromusic.fragments.player.material import android.os.Bundle import android.view.LayoutInflater @@ -10,9 +10,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment -import code.name.monkey.retromusic.ui.fragments.player.normal.PlayerFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment import kotlinx.android.synthetic.main.fragment_material.* /** diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt index c01186de..dfea11f7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt @@ -1,11 +1,10 @@ -package code.name.monkey.retromusic.ui.fragments.player.normal +package code.name.monkey.retromusic.fragments.player.normal import android.animation.ArgbEvaluator import android.animation.ValueAnimator import android.graphics.drawable.GradientDrawable import android.os.Build import android.os.Bundle -import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,10 +14,9 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.PreferenceUtil -import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.views.DrawableGradient import kotlinx.android.synthetic.main.fragment_player.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index e2af0266..9dd78cef 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.normal +package code.name.monkey.retromusic.fragments.player.normal import android.animation.ObjectAnimator import android.graphics.PorterDuff @@ -20,7 +20,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt index 7135ce0f..4a71afb7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.plain +package code.name.monkey.retromusic.fragments.player.plain import android.animation.ObjectAnimator import android.content.res.ColorStateList @@ -22,8 +22,7 @@ import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt index 0fd60579..f1e064b5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/plain/PlainPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.plain +package code.name.monkey.retromusic.fragments.player.plain import android.os.Bundle import android.view.LayoutInflater @@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import kotlinx.android.synthetic.main.fragment_plain_player.* class PlainPlayerFragment : AbsPlayerFragment(), PlayerAlbumCoverFragment.Callbacks { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt index a4b9ed8d..a6f8017b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.simple +package code.name.monkey.retromusic.fragments.player.simple import android.graphics.PorterDuff import android.os.Bundle @@ -16,7 +16,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_simple_controls_fragment.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt similarity index 93% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt index ec8f80b2..5e78135b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/simple/SimplePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.simple +package code.name.monkey.retromusic.fragments.player.simple import android.os.Bundle import android.view.LayoutInflater @@ -10,8 +10,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import kotlinx.android.synthetic.main.fragment_simple_player.* /** diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt index 947e4bef..afe71387 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/slide/SlidePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/slide/SlidePlayerFragment.kt @@ -12,7 +12,7 @@ * See the GNU General Public License for more details. */ -package code.name.monkey.retromusic.ui.fragments.player.slide +package code.name.monkey.retromusic.fragments.player.slide import android.animation.ObjectAnimator import android.graphics.Color @@ -40,11 +40,10 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity -import code.name.monkey.retromusic.ui.adapter.song.SimpleSongAdapter -import code.name.monkey.retromusic.ui.fragments.VolumeFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity +import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt similarity index 96% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt index d87a0974..09043a6e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.tiny +package code.name.monkey.retromusic.fragments.player.tiny import android.graphics.PorterDuff import android.os.Bundle @@ -10,7 +10,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import kotlinx.android.synthetic.main.fragment_tiny_controls_fragment.* class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt index a1b3ec83..51ec79ee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/tiny/TinyPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.player.tiny +package code.name.monkey.retromusic.fragments.player.tiny import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -18,9 +18,9 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment -import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerFragment -import code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment +import code.name.monkey.retromusic.fragments.MiniPlayerFragment +import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment +import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_tiny_player.* diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt index a30b276a..cb6ad7db 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AbsSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.graphics.Color import android.graphics.drawable.ColorDrawable diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt index 8ecb9df6..63220236 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/AudioSettings.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.content.Intent import android.media.audiofx.AudioEffect diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt similarity index 94% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt index b7ac3a8c..1f09c211 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ImageSettingFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.os.Bundle import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt index 12d2709e..1627286c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.graphics.Bitmap import android.os.Bundle @@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.Constants.USER_PROFILE import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.activities.SettingsActivity +import code.name.monkey.retromusic.activities.SettingsActivity import code.name.monkey.retromusic.util.Compressor import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt similarity index 95% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt index fc3dfe4c..ba1cb40d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NotificationSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.os.Build import android.os.Bundle diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt index 4888bcad..5563f10d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/NowPlayingSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.content.SharedPreferences import android.os.Bundle diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt similarity index 93% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt index d76e9bc3..f2c67726 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/OtherSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.os.Bundle import android.view.View diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt similarity index 97% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt index b3ed43f7..d2d0424e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/PersonaizeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonaizeSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.content.SharedPreferences import android.os.Bundle diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt similarity index 98% rename from app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt rename to app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt index ff5fae17..17a9f882 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/ThemeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt @@ -1,4 +1,4 @@ -package code.name.monkey.retromusic.ui.fragments.settings +package code.name.monkey.retromusic.fragments.settings import android.graphics.Color import android.graphics.Color.BLUE diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt b/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt index 53e0fedb..c9439c94 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/LastChanceHandler.kt @@ -17,7 +17,7 @@ package code.name.monkey.retromusic.helper import android.content.Intent import androidx.core.app.ActivityCompat import code.name.monkey.retromusic.App -import code.name.monkey.retromusic.ui.activities.bugreport.ErrorHandlerActivity +import code.name.monkey.retromusic.activities.bugreport.ErrorHandlerActivity class TopExceptionHandler() : Thread.UncaughtExceptionHandler { private val defaultUEH: Thread.UncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler() diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt index 0b33051b..397f7f3f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt @@ -28,8 +28,8 @@ import code.name.monkey.retromusic.dialogs.SongDetailDialog import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.interfaces.PaletteColorHolder import code.name.monkey.retromusic.model.Song -import code.name.monkey.retromusic.ui.activities.tageditor.AbsTagEditorActivity -import code.name.monkey.retromusic.ui.activities.tageditor.SongTagEditorActivity +import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity +import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.RingtoneManager diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt index 3fb151c4..28c2933c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt +++ b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt @@ -16,7 +16,7 @@ package code.name.monkey.retromusic.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.HomeSection +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.HomeSection /** * Created by hemanths on 3/4/19 diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt index 879aa1d2..ddc0665e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt @@ -18,7 +18,7 @@ import android.os.Bundle import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.mvp.Presenter import code.name.monkey.retromusic.mvp.contract.ArtistDetailContract -import code.name.monkey.retromusic.ui.activities.ArtistDetailActivity +import code.name.monkey.retromusic.activities.ArtistDetailActivity /** diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt index b9544708..31d13291 100644 --- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt @@ -18,12 +18,12 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Home import code.name.monkey.retromusic.mvp.Presenter import code.name.monkey.retromusic.mvp.contract.HomeContract -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.GENRES -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.PLAYLISTS -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.RECENT_ALBUMS -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.RECENT_ARTISTS -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.TOP_ALBUMS -import code.name.monkey.retromusic.ui.adapter.HomeAdapter.Companion.TOP_ARTISTS +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.GENRES +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.PLAYLISTS +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ALBUMS +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ARTISTS +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ALBUMS +import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ARTISTS import code.name.monkey.retromusic.util.PreferenceUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt index a4ccb4af..ed789d59 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt @@ -29,7 +29,7 @@ import androidx.preference.PreferenceDialogFragmentCompat import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.ViewPager import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle +import code.name.monkey.retromusic.fragments.AlbumCoverStyle import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil import com.afollestad.materialdialogs.MaterialDialog diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt index 3220db81..50f8eb9e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt @@ -30,7 +30,7 @@ import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.ViewPager import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen +import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt index 4f9057bd..7d1e08a0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt @@ -39,7 +39,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.RetroUtil diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt index a556d657..137d314a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt @@ -34,7 +34,7 @@ import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroColorUtil import com.bumptech.glide.request.target.Target diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt index 8455676a..5d722e16 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt @@ -36,7 +36,7 @@ import code.name.monkey.retromusic.glide.RetroSimpleTarget import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService -import code.name.monkey.retromusic.ui.activities.MainActivity +import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.RetroUtil.createBitmap diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt deleted file mode 100644 index a568d91b..00000000 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/bugreport/ErrorHandlerActivity.kt +++ /dev/null @@ -1 +0,0 @@ -package code.name.monkey.retromusic.ui.activities.bugreport import android.content.ActivityNotFoundException import android.content.Intent import android.net.Uri import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import code.name.monkey.retromusic.R import code.name.monkey.retromusic.ui.activities.bugreport.model.DeviceInfo import kotlinx.android.synthetic.main.activity_error_handler.* class ErrorHandlerActivity : AppCompatActivity() { private var deviceInfo: DeviceInfo? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_error_handler) deviceInfo = DeviceInfo(this) clearAppData.setOnClickListener { try { val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS) intent.data = Uri.parse("package:$packageName") startActivity(intent) } catch (e: ActivityNotFoundException) { val intent = Intent(android.provider.Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS) startActivity(intent) } } sendCrashLog.setOnClickListener { val sendIntent = Intent(Intent.ACTION_SEND) val subject = "Error report" val body = intent.getStringExtra("error") + "\n" + deviceInfo!!.toString() sendIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf("monkeycodeapp@gmail.com")) sendIntent.putExtra(Intent.EXTRA_TEXT, body) sendIntent.putExtra(Intent.EXTRA_SUBJECT, subject) sendIntent.type = "message/rfc822" startActivity(Intent.createChooser(sendIntent, "Send crash log")) deleteFile("stack.trace") } showCrashError.text = String.format("%s", intent.getStringExtra("error")) showCrashError.append(deviceInfo!!.toString()) } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java index 07631c1f..2c39e534 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java @@ -30,21 +30,21 @@ import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.model.Genre; import code.name.monkey.retromusic.model.Playlist; -import code.name.monkey.retromusic.ui.activities.AboutActivity; -import code.name.monkey.retromusic.ui.activities.AlbumDetailsActivity; -import code.name.monkey.retromusic.ui.activities.ArtistDetailActivity; -import code.name.monkey.retromusic.ui.activities.EqualizerActivity; -import code.name.monkey.retromusic.ui.activities.GenreDetailsActivity; -import code.name.monkey.retromusic.ui.activities.LicenseActivity; -import code.name.monkey.retromusic.ui.activities.LyricsActivity; -import code.name.monkey.retromusic.ui.activities.PlayingQueueActivity; -import code.name.monkey.retromusic.ui.activities.PlaylistDetailActivity; -import code.name.monkey.retromusic.ui.activities.PurchaseActivity; -import code.name.monkey.retromusic.ui.activities.SearchActivity; -import code.name.monkey.retromusic.ui.activities.SettingsActivity; -import code.name.monkey.retromusic.ui.activities.SupportDevelopmentActivity; -import code.name.monkey.retromusic.ui.activities.UserInfoActivity; -import code.name.monkey.retromusic.ui.activities.WhatsNewActivity; +import code.name.monkey.retromusic.activities.AboutActivity; +import code.name.monkey.retromusic.activities.AlbumDetailsActivity; +import code.name.monkey.retromusic.activities.ArtistDetailActivity; +import code.name.monkey.retromusic.activities.EqualizerActivity; +import code.name.monkey.retromusic.activities.GenreDetailsActivity; +import code.name.monkey.retromusic.activities.LicenseActivity; +import code.name.monkey.retromusic.activities.LyricsActivity; +import code.name.monkey.retromusic.activities.PlayingQueueActivity; +import code.name.monkey.retromusic.activities.PlaylistDetailActivity; +import code.name.monkey.retromusic.activities.PurchaseActivity; +import code.name.monkey.retromusic.activities.SearchActivity; +import code.name.monkey.retromusic.activities.SettingsActivity; +import code.name.monkey.retromusic.activities.SupportDevelopmentActivity; +import code.name.monkey.retromusic.activities.UserInfoActivity; +import code.name.monkey.retromusic.activities.WhatsNewActivity; import static code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY; import static code.name.monkey.retromusic.util.RetroUtil.openUrl; diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java index d00ebb04..b5fb2368 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java @@ -41,10 +41,10 @@ import code.name.monkey.retromusic.transform.HorizontalFlipTransformation; import code.name.monkey.retromusic.transform.NormalPageTransformer; import code.name.monkey.retromusic.transform.VerticalFlipTransformation; import code.name.monkey.retromusic.transform.VerticalStackTransformer; -import code.name.monkey.retromusic.ui.activities.MainActivity; -import code.name.monkey.retromusic.ui.fragments.AlbumCoverStyle; -import code.name.monkey.retromusic.ui.fragments.NowPlayingScreen; -import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment; +import code.name.monkey.retromusic.activities.MainActivity; +import code.name.monkey.retromusic.fragments.AlbumCoverStyle; +import code.name.monkey.retromusic.fragments.NowPlayingScreen; +import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment; public final class PreferenceUtil { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt index 71ba984e..39f233f2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt @@ -24,7 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.util.RetroUtil class MetalRecyclerViewPager : RecyclerView { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java index 45a9d560..bca21dd8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/RoundedBottomSheetDialogFragment.java @@ -37,8 +37,7 @@ import androidx.appcompat.app.AppCompatDialogFragment; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.VersionUtils; import code.name.monkey.retromusic.R; -import code.name.monkey.retromusic.ui.activities.base.AbsBaseActivity; -import code.name.monkey.retromusic.util.PreferenceUtil; +import code.name.monkey.retromusic.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.util.RetroUtil; /** diff --git a/app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp b/app/src/main/res/drawable-xxxhdpi/np_circle.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/album_cover_circle.webp rename to app/src/main/res/drawable-xxxhdpi/np_circle.webp diff --git a/app/src/main/res/drawable/promotional.webp b/app/src/main/res/drawable/promotional.webp deleted file mode 100644 index 321f68d96e709465e400055c3b92fa997d57c6e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28738 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 x @@ -69,7 +69,7 @@ diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml index f8ae76af..510c503f 100644 --- a/app/src/main/res/layout-land/fragment_card_blur_player.xml +++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml @@ -67,7 +67,7 @@ @@ -83,7 +83,7 @@ diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml index ed605062..d13b7c9e 100644 --- a/app/src/main/res/layout-land/fragment_card_player.xml +++ b/app/src/main/res/layout-land/fragment_card_player.xml @@ -10,7 +10,7 @@ @@ -67,7 +67,7 @@ diff --git a/app/src/main/res/layout-land/fragment_classic_player.xml b/app/src/main/res/layout-land/fragment_classic_player.xml index 0a9e122d..bc90d71c 100644 --- a/app/src/main/res/layout-land/fragment_classic_player.xml +++ b/app/src/main/res/layout-land/fragment_classic_player.xml @@ -31,7 +31,7 @@ @@ -62,7 +62,7 @@ diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml index c0b9926b..5d653dc3 100644 --- a/app/src/main/res/layout-land/fragment_color_player.xml +++ b/app/src/main/res/layout-land/fragment_color_player.xml @@ -105,7 +105,7 @@ diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml index b9baaa40..0f7d0a88 100644 --- a/app/src/main/res/layout-land/fragment_flat_player.xml +++ b/app/src/main/res/layout-land/fragment_flat_player.xml @@ -43,7 +43,7 @@ @@ -69,7 +69,7 @@ @@ -55,7 +55,7 @@ diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml index f51d0c48..de85301e 100644 --- a/app/src/main/res/layout-land/fragment_plain_player.xml +++ b/app/src/main/res/layout-land/fragment_plain_player.xml @@ -38,7 +38,7 @@ @@ -91,7 +91,7 @@ diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml index 4d818d33..ee835e88 100755 --- a/app/src/main/res/layout-land/fragment_player.xml +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -47,7 +47,7 @@ @@ -73,7 +73,7 @@ @@ -59,7 +59,7 @@ @@ -62,7 +62,7 @@ diff --git a/app/src/main/res/layout-xlarge-land/fragment_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml index 5c1ce354..6fdce2d4 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_player.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml @@ -43,7 +43,7 @@ @@ -51,7 +51,7 @@ diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml index fe2da4ac..83fed952 100644 --- a/app/src/main/res/layout-xlarge/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge/fragment_blur.xml @@ -52,7 +52,7 @@ @@ -65,7 +65,7 @@ diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml index 74a8b79d..1d6d7a61 100644 --- a/app/src/main/res/layout-xlarge/fragment_player.xml +++ b/app/src/main/res/layout-xlarge/fragment_player.xml @@ -37,7 +37,7 @@ @@ -50,7 +50,7 @@ diff --git a/app/src/main/res/layout/activity_lock_screen_old_style.xml b/app/src/main/res/layout/activity_lock_screen_old_style.xml index 7f3b6a76..f69bbfb8 100644 --- a/app/src/main/res/layout/activity_lock_screen_old_style.xml +++ b/app/src/main/res/layout/activity_lock_screen_old_style.xml @@ -24,7 +24,7 @@ diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml index 55b39a2e..d930c525 100644 --- a/app/src/main/res/layout/activity_whats_new.xml +++ b/app/src/main/res/layout/activity_whats_new.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="code.name.monkey.retromusic.ui.activities.WhatsNewActivity"> + tools:context=".activities.WhatsNewActivity"> @@ -67,7 +67,7 @@ diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml index a8f38133..4f318abf 100644 --- a/app/src/main/res/layout/fragment_blur.xml +++ b/app/src/main/res/layout/fragment_blur.xml @@ -48,7 +48,7 @@ @@ -61,7 +61,7 @@ diff --git a/app/src/main/res/layout/fragment_blur_playback_controls.xml b/app/src/main/res/layout/fragment_blur_playback_controls.xml index 3d3e4897..1f676fc2 100644 --- a/app/src/main/res/layout/fragment_blur_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_playback_controls.xml @@ -183,7 +183,7 @@ @@ -83,7 +83,7 @@ diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml index 7125410c..b632b909 100644 --- a/app/src/main/res/layout/fragment_card_player.xml +++ b/app/src/main/res/layout/fragment_card_player.xml @@ -11,7 +11,7 @@ @@ -68,7 +68,7 @@ diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml index 121f3688..fb41be13 100644 --- a/app/src/main/res/layout/fragment_classic_player.xml +++ b/app/src/main/res/layout/fragment_classic_player.xml @@ -42,7 +42,7 @@ @@ -50,7 +50,7 @@ diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml index e8572805..5caf246c 100644 --- a/app/src/main/res/layout/fragment_color_player.xml +++ b/app/src/main/res/layout/fragment_color_player.xml @@ -100,7 +100,7 @@ diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml index 2fddff91..0c40f173 100644 --- a/app/src/main/res/layout/fragment_fit.xml +++ b/app/src/main/res/layout/fragment_fit.xml @@ -20,7 +20,7 @@ @@ -33,7 +33,7 @@ diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml index f24de9d1..c1027662 100644 --- a/app/src/main/res/layout/fragment_flat_player.xml +++ b/app/src/main/res/layout/fragment_flat_player.xml @@ -51,7 +51,7 @@ @@ -64,7 +64,7 @@ diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml index f2b0ec48..6d18dc03 100644 --- a/app/src/main/res/layout/fragment_full.xml +++ b/app/src/main/res/layout/fragment_full.xml @@ -9,7 +9,7 @@ @@ -32,7 +32,7 @@ + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="16dp"> + android:padding="0dp" + android:textSize="18sp" /> + android:layout_weight="1" + android:orientation="vertical"> - + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:text="@string/upgrade_to_premium" + android:textColor="@color/md_grey_200" /> - - - - - - + + @@ -45,7 +45,7 @@ diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml index 9f8ad71c..ea7253fb 100644 --- a/app/src/main/res/layout/fragment_plain_player.xml +++ b/app/src/main/res/layout/fragment_plain_player.xml @@ -65,7 +65,7 @@ @@ -78,7 +78,7 @@ diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 02be2931..9d992988 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -44,7 +44,7 @@ @@ -57,7 +57,7 @@ diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml index ec243aaf..ee29910f 100644 --- a/app/src/main/res/layout/fragment_simple_player.xml +++ b/app/src/main/res/layout/fragment_simple_player.xml @@ -34,7 +34,7 @@ @@ -47,7 +47,7 @@ diff --git a/app/src/main/res/layout/fragment_slide_player.xml b/app/src/main/res/layout/fragment_slide_player.xml index dd6ba6a3..c9da0b5a 100644 --- a/app/src/main/res/layout/fragment_slide_player.xml +++ b/app/src/main/res/layout/fragment_slide_player.xml @@ -256,7 +256,7 @@ @@ -88,7 +88,7 @@ diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml index c4fc58f7..350ea7b9 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -35,7 +35,7 @@ diff --git a/app/src/main/res/layout/volume_controls.xml b/app/src/main/res/layout/volume_controls.xml index 18d79e3f..4ab64191 100644 --- a/app/src/main/res/layout/volume_controls.xml +++ b/app/src/main/res/layout/volume_controls.xml @@ -10,7 +10,7 @@