From ca4e9e7ef0d628d0c5ab37f7c177ded020430cb1 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Tue, 13 Nov 2018 09:00:08 +0530 Subject: [PATCH] v2.2.00 --- .idea/RetroMusicPlayer.iml | 19 -- .idea/assetWizardSettings.xml | 37 ---- .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/dictionaries/hemanths.xml | 7 + ...x_annotation_annotation_1_0_0_rc01_jar.xml | 11 -- ...x_annotation_annotation_1_0_0_rc02_jar.xml | 11 -- ...idx_appcompat_appcompat_1_0_0_rc01_aar.xml | 15 -- ...idx_appcompat_appcompat_1_0_0_rc02_aar.xml | 15 -- ...x_arch_core_core_common_2_0_0_rc01_jar.xml | 11 -- ..._arch_core_core_runtime_2_0_0_rc01_aar.xml | 12 -- ...ter_asynclayoutinflater_1_0_0_rc01_aar.xml | 12 -- ...ter_asynclayoutinflater_1_0_0_rc02_aar.xml | 12 -- ...roidx_cardview_cardview_1_0_0_rc01_aar.xml | 12 -- ...x_collection_collection_1_0_0_rc01_jar.xml | 11 -- ...x_collection_collection_1_0_0_rc02_jar.xml | 11 -- ...ayout_coordinatorlayout_1_0_0_rc01_aar.xml | 15 -- ...ayout_coordinatorlayout_1_0_0_rc02_aar.xml | 15 -- ...dle__androidx_core_core_1_0_0_rc01_aar.xml | 15 -- ...dle__androidx_core_core_1_0_0_rc02_aar.xml | 15 -- ...oradapter_cursoradapter_1_0_0_rc01_aar.xml | 12 -- ...oradapter_cursoradapter_1_0_0_rc02_aar.xml | 12 -- ...x_customview_customview_1_0_0_rc01_aar.xml | 12 -- ...x_customview_customview_1_0_0_rc02_aar.xml | 12 -- ...cumentfile_documentfile_1_0_0_rc01_aar.xml | 12 -- ...cumentfile_documentfile_1_0_0_rc02_aar.xml | 12 -- ...awerlayout_drawerlayout_1_0_0_rc01_aar.xml | 15 -- ...awerlayout_drawerlayout_1_0_0_rc02_aar.xml | 15 -- ...roidx_fragment_fragment_1_0_0_rc01_aar.xml | 15 -- ...roidx_fragment_fragment_1_0_0_rc02_aar.xml | 15 -- ...x_gridlayout_gridlayout_1_0_0_rc01_aar.xml | 12 -- ...terpolator_interpolator_1_0_0_rc01_aar.xml | 12 -- ...terpolator_interpolator_1_0_0_rc02_aar.xml | 12 -- ...y_legacy_preference_v14_1_0_0_rc01_aar.xml | 12 -- ..._legacy_support_core_ui_1_0_0_rc01_aar.xml | 12 -- ..._legacy_support_core_ui_1_0_0_rc02_aar.xml | 12 -- ...gacy_support_core_utils_1_0_0_rc01_aar.xml | 12 -- ...gacy_support_core_utils_1_0_0_rc02_aar.xml | 12 -- ...gacy_legacy_support_v13_1_0_0_rc01_aar.xml | 12 -- ...egacy_legacy_support_v4_1_0_0_rc01_aar.xml | 12 -- ...ecycle_lifecycle_common_2_0_0_rc01_jar.xml | 11 -- ...lifecycle_livedata_core_2_0_0_rc01_aar.xml | 12 -- ...cycle_lifecycle_runtime_2_0_0_rc01_aar.xml | 12 -- ...cle_lifecycle_viewmodel_2_0_0_rc01_aar.xml | 12 -- ..._androidx_loader_loader_1_0_0_rc01_aar.xml | 12 -- ..._androidx_loader_loader_1_0_0_rc02_aar.xml | 12 -- ...r_localbroadcastmanager_1_0_0_rc01_aar.xml | 12 -- ...r_localbroadcastmanager_1_0_0_rc02_aar.xml | 12 -- ...e__androidx_media_media_1_0_0_rc02_aar.xml | 15 -- ...diarouter_mediarouter_1_0_0_beta01_aar.xml | 15 -- ...__androidx_multidex_multidex_2_0_0_aar.xml | 10 - ...ndroidx_palette_palette_1_0_0_rc02_aar.xml | 12 -- ...x_preference_preference_1_0_0_rc01_aar.xml | 12 -- ...e__androidx_print_print_1_0_0_rc01_aar.xml | 15 -- ...e__androidx_print_print_1_0_0_rc02_aar.xml | 15 -- ...cyclerview_recyclerview_1_0_0_rc01_aar.xml | 15 -- ...cyclerview_recyclerview_1_0_0_rc02_aar.xml | 15 -- ...ayout_slidingpanelayout_1_0_0_rc01_aar.xml | 12 -- ...ayout_slidingpanelayout_1_0_0_rc02_aar.xml | 12 -- ...yout_swiperefreshlayout_1_0_0_rc01_aar.xml | 15 -- ...yout_swiperefreshlayout_1_0_0_rc02_aar.xml | 15 -- ...x_transition_transition_1_0_0_rc01_aar.xml | 15 -- ...drawable_vectordrawable_1_0_0_rc01_aar.xml | 12 -- ...drawable_vectordrawable_1_0_0_rc02_aar.xml | 12 -- ...vectordrawable_animated_1_0_0_rc01_aar.xml | 12 -- ...vectordrawable_animated_1_0_0_rc02_aar.xml | 12 -- ...ble_versionedparcelable_1_0_0_rc01_aar.xml | 12 -- ...ble_versionedparcelable_1_0_0_rc02_aar.xml | 12 -- ...idx_viewpager_viewpager_1_0_0_rc01_aar.xml | 12 -- ...idx_viewpager_viewpager_1_0_0_rc02_aar.xml | 12 -- ...com_afollestad_material_cab_0_1_12_aar.xml | 14 -- ...d_material_dialogs_commons_0_9_6_0_aar.xml | 15 -- ...stad_material_dialogs_core_0_9_6_0_aar.xml | 12 -- ...jlab_android_iab_v3_library_1_0_44_jar.xml | 4 +- ...hub_AdrienPoupa_jaudiotagger_2_2_3_aar.xml | 12 -- ..._github_bumptech_glide_glide_3_8_0_jar.xml | 4 +- ...ch_glide_okhttp3_integration_1_5_0_jar.xml | 4 +- ...android_observablescrollview_1_6_0_aar.xml | 14 -- ...roid_gms_play_services_base_15_0_1_aar.xml | 10 - ..._gms_play_services_basement_15_0_1_aar.xml | 10 - ...roid_gms_play_services_cast_16_0_2_aar.xml | 10 - ...lay_services_cast_framework_16_0_2_aar.xml | 10 - ...oid_gms_play_services_flags_15_0_1_aar.xml | 10 - ...oid_gms_play_services_tasks_15_0_1_aar.xml | 10 - ...droid_material_material_1_0_0_rc01_aar.xml | 13 -- ...ecyclerview_advrecyclerview_0_11_0_aar.xml | 15 -- ...wharton_butterknife_9_0_0_SNAPSHOT_aar.xml | 12 -- ...erknife_annotations_9_0_0_SNAPSHOT_jar.xml | 4 +- ...butterknife_runtime_9_0_0_SNAPSHOT_aar.xml | 12 -- ...com_r0adkll_slidableactivity_2_0_6_aar.xml | 12 -- ...pps_recyclerview_fastscroll_1_0_18_aar.xml | 15 -- ...three_slidinguppanel_library_3_4_0_aar.xml | 12 -- ..._reactivex_rxjava2_rxandroid_2_0_2_aar.xml | 12 -- ..._io_reactivex_rxjava2_rxjava_2_1_9_jar.xml | 11 -- ..._materialprogressbar_library_1_4_2_aar.xml | 15 -- ..._uk_co_chrisjenx_calligraphy_2_3_0_aar.xml | 14 -- .idea/misc.xml | 30 ++- .idea/navEditor.xml | 107 ----------- RetroMusicPlayer.iml | 2 +- app/app.iml | 7 + app/build.gradle | 4 +- app/src/main/assets/retro-changelog.html | 2 +- .../monkey/retromusic/RetroApplication.java | 3 +- .../monkey/retromusic/helper/SortOrder.java | 3 - .../retromusic/loaders/GenreSongsLoader.java | 5 +- .../loaders/PlaylistSongsLoader.java | 6 +- .../monkey/retromusic/loaders/SongLoader.java | 8 +- .../monkey/retromusic/model/PlaylistSong.java | 5 +- .../name/monkey/retromusic/model/Song.java | 65 +------ .../retromusic/providers/BlacklistStore.java | 15 +- .../providers/MusicPlaybackQueueStore.java | 6 +- .../providers/SongPlayCountStore.java | 2 +- .../ui/activities/AlbumDetailsActivity.java | 44 +++-- .../ui/activities/ArtistDetailActivity.java | 25 +-- .../ui/activities/GenreDetailsActivity.java | 24 ++- .../ui/activities/NowPayingActivity.java | 6 +- .../ui/activities/PlaylistDetailActivity.java | 46 ++--- .../ui/activities/UserInfoActivity.java | 27 ++- .../base/AbsSlidingMusicPanelActivity.java | 5 +- .../ui/activities/base/AbsThemeActivity.java | 10 +- .../tageditor/AbsTagEditorActivity.java | 9 +- .../tageditor/SongTagEditorActivity.java | 6 - .../ui/adapter/CollageSongAdapter.java | 21 ++- .../ui/adapter/album/AlbumAdapter.java | 9 +- .../ui/adapter/artist/ArtistAdapter.java | 14 +- .../ui/adapter/base/MediaEntryViewHolder.java | 11 +- .../ui/adapter/song/PlayingQueueAdapter.java | 12 ++ .../ui/adapter/song/SongAdapter.java | 4 +- .../ui/fragments/MiniPlayerFragment.java | 6 +- ...gerRecyclerViewCustomGridSizeFragment.java | 2 +- .../base/AbsMainActivityFragment.java | 2 - .../mainactivity/LibraryFragment.java | 9 +- .../mainactivity/home/BannerHomeFragment.java | 4 +- .../player/blur/BlurPlayerFragment.java | 2 +- .../player/normal/PlayerFragment.java | 1 - .../settings/ThemeSettingsFragment.java | 16 -- .../monkey/retromusic/util/RetroUtil.java | 8 +- .../views/BottomNavigationBarTinted.java | 36 ++++ .../retromusic/views/CollapsingFAB.java | 71 ++++++++ .../views/MetalRecyclerViewPager.java | 17 +- .../RoundedBottomSheetDialogFragment.java | 41 +++-- .../views/TintIconColorToolbar.java | 33 ++++ app/src/main/res/animator/slide_in_left.xml | 4 + .../bg_bottom_sheet_dialog_fragment.xml | 2 +- .../main/res/drawable/bg_circular_corners.xml | 5 + .../main/res/layout-land/activity_album.xml | 27 +-- .../layout-land/activity_artist_details.xml | 26 +-- .../res/layout-land/activity_settings.xml | 11 +- app/src/main/res/layout-land/pager_item.xml | 17 +- .../main/res/layout-sw600dp/abs_playlists.xml | 22 +-- .../res/layout-sw600dp/activity_user_info.xml | 140 ++++++++++++++ .../layout-sw600dp/fragment_mini_player.xml | 1 - .../res/layout-xlarge-land/activity_album.xml | 66 +++---- .../activity_artist_details.xml | 25 +-- .../fragment_banner_home.xml | 3 +- .../res/layout-xlarge-land/fragment_blur.xml | 161 ++++++++--------- .../res/layout-xlarge-land/fragment_home.xml | 42 ++--- .../main/res/layout-xlarge/activity_album.xml | 58 +++--- .../layout-xlarge/activity_artist_details.xml | 26 +-- .../fragment_album_card_cover.xml | 3 +- .../layout-xlarge/fragment_banner_home.xml | 103 +++++++++++ .../main/res/layout-xlarge/fragment_blur.xml | 97 +++++----- .../main/res/layout-xlarge/fragment_home.xml | 146 +++++++-------- .../pager_item.xml | 21 +-- app/src/main/res/layout/activity_album.xml | 28 +-- .../res/layout/activity_album_content.xml | 8 +- .../res/layout/activity_artist_content.xml | 3 + .../res/layout/activity_artist_details.xml | 21 +-- .../res/layout/activity_playlist_detail.xml | 8 +- .../res/layout/activity_song_tag_editor.xml | 16 -- .../main/res/layout/activity_user_info.xml | 3 +- .../collapsing_floating_action_button.xml | 34 ++++ .../res/layout/dialog_create_playlist.xml | 2 +- app/src/main/res/layout/dialog_delete.xml | 3 +- .../main/res/layout/dialog_sleep_timer.xml | 23 +-- .../main/res/layout/fragment_banner_home.xml | 171 ++++++------------ app/src/main/res/layout/fragment_home.xml | 54 +++--- app/src/main/res/layout/fragment_library.xml | 4 +- .../main/res/layout/fragment_mini_player.xml | 1 - app/src/main/res/layout/item_collage.xml | 15 +- .../main/res/layout/item_image_gradient.xml | 60 ++++++ app/src/main/res/layout/pager_item.xml | 2 +- .../res/layout/sliding_music_panel_layout.xml | 9 +- app/src/main/res/values-es-rES/strings.xml | 2 +- app/src/main/res/values/arrays.xml | 4 + app/src/main/res/values/attrs.xml | 5 +- app/src/main/res/values/ids.xml | 1 - app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 15 +- app/src/main/res/xml/pref_general.xml | 8 - .../code/name/monkey/appthemehelper/ATH.java | 6 +- .../appthemehelper/util/MaterialUtil.java | 2 +- .../util/ToolbarContentTintHelper.java | 44 ++++- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 194 files changed, 1286 insertions(+), 2256 deletions(-) delete mode 100644 .idea/RetroMusicPlayer.iml delete mode 100644 .idea/assetWizardSettings.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/dictionaries/hemanths.xml delete mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml delete mode 100644 .idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml delete mode 100644 .idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_6_0_aar.xml delete mode 100644 .idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_6_0_aar.xml delete mode 100644 .idea/libraries/Gradle__com_github_AdrienPoupa_jaudiotagger_2_2_3_aar.xml delete mode 100644 .idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_6_0_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml delete mode 100644 .idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml delete mode 100644 .idea/libraries/Gradle__com_h6ah4i_android_widget_advrecyclerview_advrecyclerview_0_11_0_aar.xml delete mode 100644 .idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml delete mode 100644 .idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml delete mode 100644 .idea/libraries/Gradle__com_r0adkll_slidableactivity_2_0_6_aar.xml delete mode 100644 .idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml delete mode 100644 .idea/libraries/Gradle__com_sothree_slidinguppanel_library_3_4_0_aar.xml delete mode 100644 .idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml delete mode 100644 .idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_9_jar.xml delete mode 100644 .idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_2_aar.xml delete mode 100644 .idea/libraries/Gradle__uk_co_chrisjenx_calligraphy_2_3_0_aar.xml delete mode 100644 .idea/navEditor.xml create mode 100644 app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.java create mode 100644 app/src/main/java/code/name/monkey/retromusic/views/CollapsingFAB.java create mode 100644 app/src/main/java/code/name/monkey/retromusic/views/TintIconColorToolbar.java create mode 100644 app/src/main/res/animator/slide_in_left.xml create mode 100644 app/src/main/res/drawable/bg_circular_corners.xml create mode 100644 app/src/main/res/layout-sw600dp/activity_user_info.xml create mode 100644 app/src/main/res/layout-xlarge/fragment_banner_home.xml rename app/src/main/res/{layout-sw600dp => layout-xlarge}/pager_item.xml (81%) create mode 100644 app/src/main/res/layout/collapsing_floating_action_button.xml create mode 100644 app/src/main/res/layout/item_image_gradient.xml diff --git a/.idea/RetroMusicPlayer.iml b/.idea/RetroMusicPlayer.iml deleted file mode 100644 index c5796822..00000000 --- a/.idea/RetroMusicPlayer.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index 3c6936f7..00000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..a55e7a17 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/dictionaries/hemanths.xml b/.idea/dictionaries/hemanths.xml new file mode 100644 index 00000000..b6bc1b5b --- /dev/null +++ b/.idea/dictionaries/hemanths.xml @@ -0,0 +1,7 @@ + + + + transistion + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml deleted file mode 100644 index 2087654b..00000000 --- a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc01_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml deleted file mode 100644 index f58d836b..00000000 --- a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_rc02_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml deleted file mode 100644 index f4cd600b..00000000 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml deleted file mode 100644 index 2d1d1d1f..00000000 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml deleted file mode 100644 index 3a8c8be9..00000000 --- a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_rc01_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml deleted file mode 100644 index e79e0fbe..00000000 --- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml deleted file mode 100644 index aef20134..00000000 --- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml deleted file mode 100644 index 5af2fd03..00000000 --- a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml deleted file mode 100644 index 835c31df..00000000 --- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml deleted file mode 100644 index 585b745c..00000000 --- a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc01_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml deleted file mode 100644 index 3e426f1c..00000000 --- a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_rc02_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml deleted file mode 100644 index f711e141..00000000 --- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml deleted file mode 100644 index 9a84adcd..00000000 --- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml deleted file mode 100644 index e361fbe6..00000000 --- a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml deleted file mode 100644 index 16eb6864..00000000 --- a/.idea/libraries/Gradle__androidx_core_core_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml deleted file mode 100644 index 4ca8fa7a..00000000 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml deleted file mode 100644 index 06622b37..00000000 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml deleted file mode 100644 index ff113ec0..00000000 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml deleted file mode 100644 index c5b9e19b..00000000 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml deleted file mode 100644 index 195209c3..00000000 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml deleted file mode 100644 index 6eec71eb..00000000 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml deleted file mode 100644 index 0a9e0f2e..00000000 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml deleted file mode 100644 index a6f02a3c..00000000 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml deleted file mode 100644 index f94acbbd..00000000 --- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml deleted file mode 100644 index 4e1861de..00000000 --- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml deleted file mode 100644 index 7276539d..00000000 --- a/.idea/libraries/Gradle__androidx_gridlayout_gridlayout_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml deleted file mode 100644 index 22549c1b..00000000 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml deleted file mode 100644 index ca727032..00000000 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml deleted file mode 100644 index bfab8d34..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml deleted file mode 100644 index 70f86afc..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml deleted file mode 100644 index 75084b2d..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml deleted file mode 100644 index eece94ac..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml deleted file mode 100644 index 26234d41..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml deleted file mode 100644 index 5d6bd4c9..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v13_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml deleted file mode 100644 index 73503a7e..00000000 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml deleted file mode 100644 index cba5f7ef..00000000 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_rc01_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml deleted file mode 100644 index a2367a18..00000000 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml deleted file mode 100644 index a9898516..00000000 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml deleted file mode 100644 index 43138ba8..00000000 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml deleted file mode 100644 index 2844f491..00000000 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml deleted file mode 100644 index e7e13f9e..00000000 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml deleted file mode 100644 index 59655aef..00000000 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml deleted file mode 100644 index 55019529..00000000 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml deleted file mode 100644 index 19c8583d..00000000 --- a/.idea/libraries/Gradle__androidx_media_media_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml b/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml deleted file mode 100644 index c459ea89..00000000 --- a/.idea/libraries/Gradle__androidx_mediarouter_mediarouter_1_0_0_beta01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml deleted file mode 100644 index 5ae7de03..00000000 --- a/.idea/libraries/Gradle__androidx_multidex_multidex_2_0_0_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml deleted file mode 100644 index 61c0ca02..00000000 --- a/.idea/libraries/Gradle__androidx_palette_palette_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml deleted file mode 100644 index 42f8eb5d..00000000 --- a/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml deleted file mode 100644 index 841b99be..00000000 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml deleted file mode 100644 index d9baeaf1..00000000 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml deleted file mode 100644 index 2a7f8b8d..00000000 --- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml deleted file mode 100644 index 6c88c8dc..00000000 --- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml deleted file mode 100644 index 8c9bf9e2..00000000 --- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml deleted file mode 100644 index ae84fe44..00000000 --- a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml deleted file mode 100644 index 21171a61..00000000 --- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml deleted file mode 100644 index 44145c70..00000000 --- a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml deleted file mode 100644 index 5efc76b0..00000000 --- a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml deleted file mode 100644 index 680f2571..00000000 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml deleted file mode 100644 index 8844ced7..00000000 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml deleted file mode 100644 index 133ba59d..00000000 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml deleted file mode 100644 index 985cd790..00000000 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml deleted file mode 100644 index b5a22964..00000000 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml deleted file mode 100644 index 33e094cc..00000000 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml deleted file mode 100644 index e1524175..00000000 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml deleted file mode 100644 index b5887506..00000000 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_rc02_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml b/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml deleted file mode 100644 index 4f843e2a..00000000 --- a/.idea/libraries/Gradle__com_afollestad_material_cab_0_1_12_aar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_6_0_aar.xml b/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_6_0_aar.xml deleted file mode 100644 index 40a8b431..00000000 --- a/.idea/libraries/Gradle__com_afollestad_material_dialogs_commons_0_9_6_0_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_6_0_aar.xml b/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_6_0_aar.xml deleted file mode 100644 index d909ba28..00000000 --- a/.idea/libraries/Gradle__com_afollestad_material_dialogs_core_0_9_6_0_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_anjlab_android_iab_v3_library_1_0_44_jar.xml b/.idea/libraries/Gradle__com_anjlab_android_iab_v3_library_1_0_44_jar.xml index 55725f31..7c85de2a 100644 --- a/.idea/libraries/Gradle__com_anjlab_android_iab_v3_library_1_0_44_jar.xml +++ b/.idea/libraries/Gradle__com_anjlab_android_iab_v3_library_1_0_44_jar.xml @@ -3,9 +3,7 @@ - - - + diff --git a/.idea/libraries/Gradle__com_github_AdrienPoupa_jaudiotagger_2_2_3_aar.xml b/.idea/libraries/Gradle__com_github_AdrienPoupa_jaudiotagger_2_2_3_aar.xml deleted file mode 100644 index 83a5738c..00000000 --- a/.idea/libraries/Gradle__com_github_AdrienPoupa_jaudiotagger_2_2_3_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_8_0_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_8_0_jar.xml index c5f9a003..283db608 100644 --- a/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_8_0_jar.xml +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_glide_3_8_0_jar.xml @@ -3,9 +3,7 @@ - - - + diff --git a/.idea/libraries/Gradle__com_github_bumptech_glide_okhttp3_integration_1_5_0_jar.xml b/.idea/libraries/Gradle__com_github_bumptech_glide_okhttp3_integration_1_5_0_jar.xml index 5166dd06..938554ed 100644 --- a/.idea/libraries/Gradle__com_github_bumptech_glide_okhttp3_integration_1_5_0_jar.xml +++ b/.idea/libraries/Gradle__com_github_bumptech_glide_okhttp3_integration_1_5_0_jar.xml @@ -3,9 +3,7 @@ - - - + diff --git a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_6_0_aar.xml b/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_6_0_aar.xml deleted file mode 100644 index f0fdb673..00000000 --- a/.idea/libraries/Gradle__com_github_ksoichiro_android_observablescrollview_1_6_0_aar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml deleted file mode 100644 index 33a32450..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml deleted file mode 100644 index ba6639cf..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml deleted file mode 100644 index 89247fb3..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_16_0_2_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml deleted file mode 100644 index 9df65f40..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_cast_framework_16_0_2_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml deleted file mode 100644 index 39a57bc2..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_15_0_1_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml deleted file mode 100644 index 45cbb4fa..00000000 --- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml deleted file mode 100644 index 413cce96..00000000 --- a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_rc01_aar.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h6ah4i_android_widget_advrecyclerview_advrecyclerview_0_11_0_aar.xml b/.idea/libraries/Gradle__com_h6ah4i_android_widget_advrecyclerview_advrecyclerview_0_11_0_aar.xml deleted file mode 100644 index 86f01543..00000000 --- a/.idea/libraries/Gradle__com_h6ah4i_android_widget_advrecyclerview_advrecyclerview_0_11_0_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml deleted file mode 100644 index c811dbee..00000000 --- a/.idea/libraries/Gradle__com_jakewharton_butterknife_9_0_0_SNAPSHOT_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml index 3dc4deb7..59a31074 100644 --- a/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml +++ b/.idea/libraries/Gradle__com_jakewharton_butterknife_annotations_9_0_0_SNAPSHOT_jar.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml b/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml deleted file mode 100644 index 950d935f..00000000 --- a/.idea/libraries/Gradle__com_jakewharton_butterknife_runtime_9_0_0_SNAPSHOT_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_r0adkll_slidableactivity_2_0_6_aar.xml b/.idea/libraries/Gradle__com_r0adkll_slidableactivity_2_0_6_aar.xml deleted file mode 100644 index 5816c227..00000000 --- a/.idea/libraries/Gradle__com_r0adkll_slidableactivity_2_0_6_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml b/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml deleted file mode 100644 index 30b0de7d..00000000 --- a/.idea/libraries/Gradle__com_simplecityapps_recyclerview_fastscroll_1_0_18_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_sothree_slidinguppanel_library_3_4_0_aar.xml b/.idea/libraries/Gradle__com_sothree_slidinguppanel_library_3_4_0_aar.xml deleted file mode 100644 index d256add8..00000000 --- a/.idea/libraries/Gradle__com_sothree_slidinguppanel_library_3_4_0_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml deleted file mode 100644 index ccf23004..00000000 --- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_9_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_9_jar.xml deleted file mode 100644 index e23e22ea..00000000 --- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_9_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_2_aar.xml b/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_2_aar.xml deleted file mode 100644 index a2eba554..00000000 --- a/.idea/libraries/Gradle__me_zhanghai_android_materialprogressbar_library_1_4_2_aar.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__uk_co_chrisjenx_calligraphy_2_3_0_aar.xml b/.idea/libraries/Gradle__uk_co_chrisjenx_calligraphy_2_3_0_aar.xml deleted file mode 100644 index 2ef76e5e..00000000 --- a/.idea/libraries/Gradle__uk_co_chrisjenx_calligraphy_2_3_0_aar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 73ba4526..b0c7b20c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,11 @@ - - + + + + + \ No newline at end of file diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml deleted file mode 100644 index d0185928..00000000 --- a/.idea/navEditor.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/RetroMusicPlayer.iml b/RetroMusicPlayer.iml index c5796822..16d29d91 100644 --- a/RetroMusicPlayer.iml +++ b/RetroMusicPlayer.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index e373c162..1efa53cb 100644 --- a/app/app.iml +++ b/app/app.iml @@ -134,28 +134,35 @@ + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 0210b37f..690e25f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 242 - versionName '2.1.000' + versionCode 246 + versionName '2.2.000' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 7d031805..4cc69626 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

You can view the changelog dialog again at any time from the about section.

Version 2.0.300

  1. Fix: offer dialog showing
  2. Added: zero volume pause
  3. Added: more album cover skipping styles
  4. Added: new animations(WIP)
  5. Added: more tab titles toggle
  6. Improved: home screen
  7. Updated: internal libraries

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

You can view the changelog dialog again at any time from the about section.

Version 2.2.00

  • Sorry for late update, Bottom navigation bar again at the bottom because it should according to Android Material Design guideline.
  • BottomSheetDialogue is now adaptable to screens, background colour and text size consistency.
  • Removed coloured navigation bar option to making app adapt the primary colour
  • Swipe up gesture for now playing removed, replaced with "tap to open", To achieve transparent navigation bar for desired themes.
  • Improved tablet UI and home screen by adding suggestions toggle banner issues.
  • Improving lyrics page

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java b/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java index 6740ad8e..8e75f135 100644 --- a/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java +++ b/app/src/main/java/code/name/monkey/retromusic/RetroApplication.java @@ -55,9 +55,10 @@ public class RetroApplication extends MultiDexApplication { setupErrorHandler(); // default theme - if (!ThemeStore.isConfigured(this, 1)) { + if (!ThemeStore.isConfigured(this, 3)) { ThemeStore.editTheme(this) .accentColorRes(R.color.md_green_A200) + .coloredNavigationBar(true) .commit(); } diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.java b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.java index a88d3a18..2c871702 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.java +++ b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.java @@ -93,9 +93,6 @@ public final class SortOrder { /* Song sort order date */ String SONG_DATE = MediaStore.Audio.Media.DATE_ADDED + " DESC"; - - /* Song sort order date */ - String COMPOSER = MediaStore.Audio.Media.COMPOSER; } /** diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java index f7f03017..bf53c13f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java +++ b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreSongsLoader.java @@ -48,9 +48,7 @@ public class GenreSongsLoader { final String albumName = cursor.getString(8); final int artistId = cursor.getInt(9); final String artistName = cursor.getString(10); - final String composer = cursor.getString(11); - - return new Song(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, composer); + return new Song(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName); } private static Cursor makeGenreSongCursor(Context context, long genreId) { @@ -69,7 +67,6 @@ public class GenreSongsLoader { AudioColumns.ALBUM,// 8 AudioColumns.ARTIST_ID,// 9 AudioColumns.ARTIST,// 10 - AudioColumns.COMPOSER,// 11 }, SongLoader.BASE_SELECTION, null, MediaStore.Audio.Genres.Members.DEFAULT_SORT_ORDER); } catch (SecurityException e) { diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.java index e4fb1492..2e434778 100644 --- a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.java +++ b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.java @@ -64,9 +64,8 @@ public class PlaylistSongsLoader { final int artistId = cursor.getInt(9); final String artistName = cursor.getString(10); final int idInPlaylist = cursor.getInt(11); - final String composer = cursor.getString(12); - return new PlaylistSong(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, playlistId, idInPlaylist, composer); + return new PlaylistSong(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, playlistId, idInPlaylist); } private static Cursor makePlaylistSongCursor(@NonNull final Context context, final int playlistId) { @@ -85,8 +84,7 @@ public class PlaylistSongsLoader { AudioColumns.ALBUM,// 8 AudioColumns.ARTIST_ID,// 9 AudioColumns.ARTIST,// 10 - MediaStore.Audio.Playlists.Members._ID, // 11 - AudioColumns.COMPOSER,// 12 + MediaStore.Audio.Playlists.Members._ID, // 11 }, SongLoader.BASE_SELECTION, null, MediaStore.Audio.Playlists.Members.DEFAULT_SORT_ORDER); } catch (SecurityException e) { diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java index 96f19c8c..ec9804de 100644 --- a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java +++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.java @@ -38,7 +38,6 @@ public class SongLoader { AudioColumns.ALBUM,// 8 AudioColumns.ARTIST_ID,// 9 AudioColumns.ARTIST,// 10 - AudioColumns.COMPOSER,// 11 }; @NonNull @@ -86,10 +85,9 @@ public class SongLoader { final String albumName = cursor.getString(8); final int artistId = cursor.getInt(9); final String artistName = cursor.getString(10); - final String composer = cursor.getString(11); return new Song(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, - artistId, artistName, composer); + artistId, artistName); } @Nullable @@ -175,8 +173,8 @@ public class SongLoader { .flatMap((Function, ObservableSource>>) songs -> { ArrayList list = new ArrayList<>(); ShuffleHelper.makeShuffleList(songs, -1); - if (songs.size() > 10) { - list.addAll(songs.subList(0, 10)); + if (songs.size() > 9) { + list.addAll(songs.subList(0, 9)); } return Observable.just(list); }); diff --git a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java b/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java index 18f162a7..778c7fba 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java @@ -4,7 +4,6 @@ import android.os.Parcel; import android.os.Parcelable; public class PlaylistSong extends Song { - public static final PlaylistSong EMPTY_PLAYLIST_SONG = new PlaylistSong(-1, "", -1, -1, -1, "", -1, -1, "", -1, "", -1, -1, ""); public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public PlaylistSong createFromParcel(Parcel source) { return new PlaylistSong(source); @@ -17,8 +16,8 @@ public class PlaylistSong extends Song { public final int playlistId; public final int idInPlayList; - public PlaylistSong(int id, String title, int trackNumber, int year, long duration, String data, int dateModified, int albumId, String albumName, int artistId, String artistName, final int playlistId, final int idInPlayList, final String composer) { - super(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, composer); + public PlaylistSong(int id, String title, int trackNumber, int year, long duration, String data, int dateModified, int albumId, String albumName, int artistId, String artistName, final int playlistId, final int idInPlayList) { + super(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName); this.playlistId = playlistId; this.idInPlayList = idInPlayList; } diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Song.java b/app/src/main/java/code/name/monkey/retromusic/model/Song.java index 3bc1bbf9..54c95bd5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/Song.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/Song.java @@ -5,7 +5,7 @@ import android.os.Parcelable; public class Song implements Parcelable { - public static final Song EMPTY_SONG = new Song(-1, "", -1, -1, -1, "", -1, -1, "", -1, "", ""); + public static final Song EMPTY_SONG = new Song(-1, "", -1, -1, -1, "", -1, -1, "", -1, ""); public static final Creator CREATOR = new Creator() { public Song createFromParcel(Parcel source) { return new Song(source); @@ -26,9 +26,8 @@ public class Song implements Parcelable { public final String albumName; public final int artistId; public final String artistName; - public final String composer; - public Song(int id, String title, int trackNumber, int year, long duration, String data, long dateModified, int albumId, String albumName, int artistId, String artistName, String composer) { + public Song(int id, String title, int trackNumber, int year, long duration, String data, long dateModified, int albumId, String albumName, int artistId, String artistName) { this.id = id; this.title = title; this.trackNumber = trackNumber; @@ -40,7 +39,6 @@ public class Song implements Parcelable { this.albumName = albumName; this.artistId = artistId; this.artistName = artistName; - this.composer = composer; } protected Song(Parcel in) { @@ -55,64 +53,6 @@ public class Song implements Parcelable { this.albumName = in.readString(); this.artistId = in.readInt(); this.artistName = in.readString(); - this.composer = in.readString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Song song = (Song) o; - - if (id != song.id) return false; - if (trackNumber != song.trackNumber) return false; - if (year != song.year) return false; - if (duration != song.duration) return false; - if (dateModified != song.dateModified) return false; - if (albumId != song.albumId) return false; - if (artistId != song.artistId) return false; - if (title != null ? !title.equals(song.title) : song.title != null) return false; - if (data != null ? !data.equals(song.data) : song.data != null) return false; - if (albumName != null ? !albumName.equals(song.albumName) : song.albumName != null) - return false; - return artistName != null ? artistName.equals(song.artistName) : song.artistName == null; - - } - - @Override - public int hashCode() { - int result = id; - result = 31 * result + (title != null ? title.hashCode() : 0); - result = 31 * result + trackNumber; - result = 31 * result + year; - result = 31 * result + (int) (duration ^ (duration >>> 32)); - result = 31 * result + (data != null ? data.hashCode() : 0); - result = 31 * result + (int) (dateModified ^ (dateModified >>> 32)); - result = 31 * result + albumId; - result = 31 * result + (albumName != null ? albumName.hashCode() : 0); - result = 31 * result + artistId; - result = 31 * result + (artistName != null ? artistName.hashCode() : 0); - result = 31 * result + (composer != null ? composer.hashCode() : 0); - return result; - } - - @Override - public String toString() { - return "Song{" + - "id=" + id + - ", title='" + title + '\'' + - ", trackNumber=" + trackNumber + - ", year=" + year + - ", duration=" + duration + - ", data='" + data + '\'' + - ", dateModified=" + dateModified + - ", albumId=" + albumId + - ", albumName='" + albumName + '\'' + - ", artistId=" + artistId + - ", artistName='" + artistName + '\'' + - ", composer='" + composer + '\'' + - '}'; } @Override @@ -133,6 +73,5 @@ public class Song implements Parcelable { dest.writeString(this.albumName); dest.writeInt(this.artistId); dest.writeString(this.artistName); - dest.writeString(this.composer); } } diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java index 8fd67d86..66b4ea03 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java @@ -7,18 +7,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Environment; -import androidx.annotation.NonNull; - -import code.name.monkey.retromusic.Constants; -import code.name.monkey.retromusic.util.FileUtil; -import code.name.monkey.retromusic.util.PreferenceUtil; import java.io.File; import java.util.ArrayList; +import androidx.annotation.NonNull; +import code.name.monkey.retromusic.Constants; +import code.name.monkey.retromusic.util.FileUtil; +import code.name.monkey.retromusic.util.PreferenceUtil; + public class BlacklistStore extends SQLiteOpenHelper { public static final String DATABASE_NAME = "blacklist.db"; - private static final int VERSION = 1; + private static final int VERSION = 2; private static BlacklistStore sInstance = null; private Context context; @@ -45,8 +45,7 @@ public class BlacklistStore extends SQLiteOpenHelper { @Override public void onCreate(@NonNull final SQLiteDatabase db) { - db.execSQL("CREATE TABLE IF NOT EXISTS " + BlacklistStoreColumns.NAME + " (" - + BlacklistStoreColumns.PATH + " STRING NOT NULL);"); + db.execSQL("CREATE TABLE IF NOT EXISTS " + BlacklistStoreColumns.NAME + " (" + BlacklistStoreColumns.PATH + " STRING NOT NULL);"); } @Override diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java index 2dd3a7d0..8e00ccad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java @@ -41,7 +41,7 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper { public static final String DATABASE_NAME = "music_playback_state.db"; public static final String PLAYING_QUEUE_TABLE_NAME = "playing_queue"; public static final String ORIGINAL_PLAYING_QUEUE_TABLE_NAME = "original_playing_queue"; - private static final int VERSION = 4; + private static final int VERSION = 5; @Nullable private static MusicPlaybackQueueStore sInstance = null; @@ -110,9 +110,6 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper { builder.append(" INT NOT NULL,"); builder.append(AudioColumns.ARTIST); - builder.append(" STRING NOT NULL,"); - - builder.append(AudioColumns.COMPOSER); builder.append(" STRING NOT NULL);"); db.execSQL(builder.toString()); @@ -176,7 +173,6 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper { values.put(AudioColumns.ALBUM, song.albumName); values.put(AudioColumns.ARTIST_ID, song.artistId); values.put(AudioColumns.ARTIST, song.artistName); - values.put(AudioColumns.COMPOSER, song.composer); database.insert(tableName, null, values); } diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java index 73610f4f..3498a4fc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java @@ -32,7 +32,7 @@ import android.view.animation.Interpolator; */ public class SongPlayCountStore extends SQLiteOpenHelper { public static final String DATABASE_NAME = "song_play_count.db"; - private static final int VERSION = 2; + private static final int VERSION = 3; // how many weeks worth of playback to track private static final int NUM_WEEKS = 52; @Nullable diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java index 455898ff..91731353 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.java @@ -17,7 +17,6 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.google.android.material.button.MaterialButton; import java.util.ArrayList; @@ -27,6 +26,7 @@ import androidx.appcompat.widget.AppCompatTextView; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; import androidx.core.util.Pair; +import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; @@ -36,7 +36,6 @@ import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ColorUtil; -import code.name.monkey.appthemehelper.util.MaterialUtil; import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; @@ -63,12 +62,14 @@ import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.NavigationUtil; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroUtil; +import code.name.monkey.retromusic.views.CollapsingFAB; public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implements AlbumDetailsContract.AlbumDetailsView { public static final String EXTRA_ALBUM_ID = "extra_album_id"; private static final int TAG_EDITOR_REQUEST = 2001; + @BindView(R.id.image) ImageView image; @@ -85,7 +86,7 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement AppCompatTextView songTitle; @BindView(R.id.action_shuffle_all) - MaterialButton shuffleButton; + CollapsingFAB shuffleButton; @BindView(R.id.collapsing_toolbar) @Nullable @@ -96,7 +97,7 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement AppBarLayout appBarLayout; @BindView(R.id.content) - View contentContainer; + NestedScrollView contentContainer; @BindView(R.id.toolbar) Toolbar toolbar; @@ -141,16 +142,32 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement ActivityCompat.postponeEnterTransition(this); + int albumId = getIntent().getIntExtra(EXTRA_ALBUM_ID, -1); + albumDetailsPresenter = new AlbumDetailsPresenter(this, albumId); + albumDetailsPresenter.subscribe(); + + setupRecyclerView(); + setupToolbarMarginHeight(); + + contentContainer.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> { + if (scrollY > oldScrollY) { + shuffleButton.setShowTitle(false); + } + if (scrollY < oldScrollY) { + shuffleButton.setShowTitle(true); + } + }); + + + } + + private void setupRecyclerView() { adapter = new SimpleSongAdapter(this, new ArrayList<>(), R.layout.item_song); recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setItemAnimator(new DefaultItemAnimator()); recyclerView.setNestedScrollingEnabled(false); recyclerView.setAdapter(adapter); - setupToolbarMarginHeight(); - - int albumId = getIntent().getIntExtra(EXTRA_ALBUM_ID, -1); - albumDetailsPresenter = new AlbumDetailsPresenter(this, albumId); } private void setupToolbarMarginHeight() { @@ -213,12 +230,6 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement } } - @Override - protected void onResume() { - super.onResume(); - albumDetailsPresenter.subscribe(); - } - @Override protected void onPause() { super.onPause(); @@ -287,8 +298,6 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement AlbumAdapter albumAdapter = new HorizontalAlbumAdapter(this, albums, false, null); moreRecyclerView.setLayoutManager(new GridLayoutManager(this, 1, GridLayoutManager.HORIZONTAL, false)); moreRecyclerView.setAdapter(albumAdapter); - - ActivityCompat.startPostponedEnterTransition(this); } public Album getAlbum() { @@ -314,8 +323,7 @@ public class AlbumDetailsActivity extends AbsSlidingMusicPanelActivity implement songTitle.setTextColor(themeColor); moreTitle.setTextColor(themeColor); - MaterialUtil.setTint(shuffleButton, true, themeColor); - //findViewById(R.id.root).setBackgroundColor(ThemeStore.primaryColor(this)); + shuffleButton.setColor(themeColor); } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java index 70755c67..bfc47690 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.java @@ -21,7 +21,6 @@ import android.widget.Toast; import com.bumptech.glide.Glide; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.CollapsingToolbarLayout; -import com.google.android.material.button.MaterialButton; import java.util.ArrayList; import java.util.Locale; @@ -31,6 +30,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; +import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; @@ -40,7 +40,6 @@ import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; import code.name.monkey.appthemehelper.util.ColorUtil; -import code.name.monkey.appthemehelper.util.MaterialUtil; import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper; import code.name.monkey.retromusic.R; @@ -64,6 +63,7 @@ import code.name.monkey.retromusic.util.DensityUtil; import code.name.monkey.retromusic.util.MusicUtil; import code.name.monkey.retromusic.util.PreferenceUtil; import code.name.monkey.retromusic.util.RetroUtil; +import code.name.monkey.retromusic.views.CollapsingFAB; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -109,7 +109,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement TextView text; @BindView(R.id.action_shuffle_all) - MaterialButton shuffleButton; + CollapsingFAB shuffleButton; @BindView(R.id.gradient_background) @Nullable @@ -120,7 +120,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement View imageContainer; @BindView(R.id.content) - View contentContainer; + NestedScrollView contentContainer; @BindView(R.id.toolbar) Toolbar toolbar; @@ -167,6 +167,15 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement artistDetailsPresenter = new ArtistDetailsPresenter(this, getIntent().getExtras()); artistDetailsPresenter.subscribe(); + + contentContainer.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> { + if (scrollY > oldScrollY) { + shuffleButton.setShowTitle(false); + } + if (scrollY < oldScrollY) { + shuffleButton.setShowTitle(true); + } + }); } private void setUpViews() { @@ -257,12 +266,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement } } - @Override - protected void onResume() { - super.onResume(); - - } - @Override protected void onPause() { super.onPause(); @@ -383,7 +386,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement songTitle.setTextColor(textColor); biographyTitle.setTextColor(textColor); - MaterialUtil.setTint(shuffleButton, true, textColor); + shuffleButton.setColor(textColor); if (background != null) { background.setBackgroundTintList(ColorStateList.valueOf(color)); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java index cdd57f7f..4e92f90f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.java @@ -4,14 +4,11 @@ import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; import android.widget.ProgressBar; import android.widget.TextView; import com.afollestad.materialcab.MaterialCab; import com.google.android.material.appbar.AppBarLayout; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import java.util.ArrayList; @@ -25,7 +22,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; -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.MusicPlayerRemote; @@ -39,6 +35,7 @@ import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivi import code.name.monkey.retromusic.ui.adapter.song.SongAdapter; import code.name.monkey.retromusic.util.RetroColorUtil; import code.name.monkey.retromusic.util.ViewUtil; +import code.name.monkey.retromusic.views.CollapsingFAB; /** * @author Hemanth S (h4h13). @@ -57,7 +54,7 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement TextView empty; @BindView(R.id.action_shuffle) - FloatingActionButton shuffleButton; + CollapsingFAB shuffleButton; @BindView(R.id.progress_bar) ProgressBar progressBar; @@ -85,7 +82,6 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement super.onCreate(savedInstanceState); ButterKnife.bind(this); - setStatusbarColorAuto(); setNavigationbarColorAuto(); setTaskDescriptionColorAuto(); toggleBottomNavigationView(true); @@ -119,7 +115,7 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.accentColor(this)); setTitle(null); setSupportActionBar(toolbar); - TintHelper.setTintAuto(shuffleButton, ThemeStore.accentColor(this), true); + shuffleButton.setColor(ThemeStore.accentColor(this)); } @Override @@ -172,11 +168,21 @@ public class GenreDetailsActivity extends AbsSlidingMusicPanelActivity implement private void setupRecyclerView() { ViewUtil.setUpFastScrollRecyclerViewColor(this, ((FastScrollRecyclerView) recyclerView), ThemeStore.accentColor(this)); - songAdapter = new SongAdapter(this, new ArrayList(), R.layout.item_list, false, this); + songAdapter = new SongAdapter(this, new ArrayList<>(), R.layout.item_list, false, this); recyclerView.setItemAnimator(new DefaultItemAnimator()); recyclerView.setLayoutManager(new LinearLayoutManager(this)); recyclerView.setAdapter(songAdapter); - + recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { + @Override + public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + if (dy > 0) { + shuffleButton.setShowTitle(false); + } else if (dy < 0) { + shuffleButton.setShowTitle(true); + } + } + }); songAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() { @Override public void onChanged() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/NowPayingActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/NowPayingActivity.java index 72a197da..06a05ce1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/NowPayingActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/NowPayingActivity.java @@ -66,14 +66,18 @@ public class NowPayingActivity extends AbsMusicServiceActivity implements AbsPla public void onPaletteColorChanged() { int paletteColor = playerFragment.getPaletteColor(); if ((currentNowPlayingScreen == NowPlayingScreen.FLAT || currentNowPlayingScreen == NowPlayingScreen.NORMAL) && PreferenceUtil.getInstance().getAdaptiveColor()) { - setNavigationbarColor(Color.TRANSPARENT); + setLightNavigationBar(true); setLightStatusbar(ColorUtil.isColorLight(paletteColor)); } else if (currentNowPlayingScreen == NowPlayingScreen.COLOR) { setLightStatusbar(ColorUtil.isColorLight(paletteColor)); } else if (currentNowPlayingScreen == NowPlayingScreen.BLUR || currentNowPlayingScreen == NowPlayingScreen.BLUR_CARD) { setLightStatusbar(false); + } else if (currentNowPlayingScreen == NowPlayingScreen.CARD || currentNowPlayingScreen == NowPlayingScreen.FULL) { + setNavigationbarColor(Color.TRANSPARENT); } else { + setStatusbarColor(Color.TRANSPARENT); setLightStatusbar(isOneOfTheseThemes() && ColorUtil.isColorLight(ThemeStore.primaryColor(this))); + setNavigationbarColorAuto(); } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java index dbc03e39..027c9a52 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.java @@ -4,13 +4,10 @@ import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.animation.AccelerateInterpolator; -import android.view.animation.DecelerateInterpolator; import android.widget.TextView; import com.afollestad.materialcab.MaterialCab; import com.google.android.material.appbar.AppBarLayout; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager; @@ -27,7 +24,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; -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.MusicPlayerRemote; @@ -47,6 +43,7 @@ import code.name.monkey.retromusic.ui.adapter.song.SongAdapter; import code.name.monkey.retromusic.util.PlaylistsUtil; import code.name.monkey.retromusic.util.RetroColorUtil; import code.name.monkey.retromusic.util.ViewUtil; +import code.name.monkey.retromusic.views.CollapsingFAB; public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder, PlaylistSongsContract.PlaylistSongsView { @@ -64,7 +61,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme TextView empty; @BindView(R.id.action_shuffle) - FloatingActionButton shuffleButton; + CollapsingFAB shuffleButton; @BindView(R.id.app_bar) AppBarLayout appBarLayout; @@ -101,31 +98,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme setUpRecyclerView(); } - public void showHeartAnimation() { - shuffleButton.clearAnimation(); - - shuffleButton.setScaleX(0.9f); - shuffleButton.setScaleY(0.9f); - shuffleButton.show(); - shuffleButton.setPivotX(shuffleButton.getWidth() / 2); - shuffleButton.setPivotY(shuffleButton.getHeight() / 2); - - shuffleButton.animate() - .setDuration(200) - .setInterpolator(new DecelerateInterpolator()) - .scaleX(1.1f) - .scaleY(1.1f) - .withEndAction(() -> shuffleButton.animate() - .setDuration(200) - .setInterpolator(new AccelerateInterpolator()) - .scaleX(1f) - .scaleY(1f) - .alpha(1f) - .start()) - .start(); - } - - @Override protected View createContentView() { return wrapSlidingMusicPanel(R.layout.activity_playlist_detail); @@ -165,6 +137,17 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme checkIsEmpty(); } }); + recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { + @Override + public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { + super.onScrolled(recyclerView, dx, dy); + if (dy > 0) { + shuffleButton.setShowTitle(false); + } else if (dy < 0) { + shuffleButton.setShowTitle(true); + } + } + }); } @Override @@ -176,7 +159,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme private void setUpToolBar() { title.setText(playlist.name); title.setTextColor(ThemeStore.textColorPrimary(this)); - TintHelper.setTintAuto(shuffleButton, ThemeStore.accentColor(this), true); + shuffleButton.setColor(ThemeStore.accentColor(this)); int primaryColor = ThemeStore.primaryColor(this); toolbar.setBackgroundColor(primaryColor); @@ -320,7 +303,6 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme @OnClick(R.id.action_shuffle) public void onViewClicked() { - showHeartAnimation(); if (adapter.getDataSet().isEmpty()) { return; } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java index 1ae0c81e..489d0bd9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.java @@ -3,13 +3,13 @@ package code.name.monkey.retromusic.ui.activities; import android.content.Context; import android.content.ContextWrapper; import android.content.Intent; -import android.content.res.ColorStateList; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; import android.provider.MediaStore.Images.Media; import android.text.TextUtils; +import android.view.MenuItem; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -31,7 +31,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; import code.name.monkey.appthemehelper.ThemeStore; -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.ui.activities.base.AbsBaseActivity; import code.name.monkey.retromusic.util.Compressor; @@ -46,7 +46,6 @@ import static code.name.monkey.retromusic.Constants.USER_BANNER; import static code.name.monkey.retromusic.Constants.USER_PROFILE; public class UserInfoActivity extends AbsBaseActivity { - private static final String TAG = "UserInfoActivity"; private static final int PICK_IMAGE_REQUEST = 9002; private static final int PICK_BANNER_REQUEST = 9003; @@ -82,7 +81,6 @@ public class UserInfoActivity extends AbsBaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_user_info); - ButterKnife.bind(this); setStatusbarColorAuto(); @@ -106,10 +104,22 @@ public class UserInfoActivity extends AbsBaseActivity { } } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + } + return super.onOptionsItemSelected(item); + } + private void setupToolbar() { - toolbar.setBackgroundColor(ThemeStore.primaryColor(this)); - appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)); - TintHelper.setTintAuto(nextButton, ThemeStore.accentColor(this), true); + int primaryColor = ThemeStore.primaryColor(this); + toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp); + toolbar.setBackgroundColor(primaryColor); + appBarLayout.setBackgroundColor(primaryColor); + ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.accentColor(this)); + setTitle(null); + setSupportActionBar(toolbar); } @OnClick({R.id.next, R.id.banner_select}) @@ -176,8 +186,7 @@ public class UserInfoActivity extends AbsBaseActivity { //noinspection ConstantConditions new MaterialDialog.Builder(this) .title("Set a profile photo") - .items(Arrays.asList(getString(R.string.new_profile_photo), - getString(R.string.remove_profile_photo))) + .items(Arrays.asList(getString(R.string.new_profile_photo), getString(R.string.remove_profile_photo))) .itemsCallback((dialog, itemView, position, text) -> { switch (position) { case 0: diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java index 7b9a5301..86f20ac2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.java @@ -21,13 +21,14 @@ import code.name.monkey.retromusic.cast.CastHelper; import code.name.monkey.retromusic.helper.MusicPlayerRemote; import code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment; import code.name.monkey.retromusic.util.PreferenceUtil; +import code.name.monkey.retromusic.views.BottomNavigationBarTinted; public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity { public static final String TAG = AbsSlidingMusicPanelActivity.class.getSimpleName(); @BindView(R.id.bottom_navigation) - BottomNavigationView bottomNavigationView; + BottomNavigationBarTinted bottomNavigationView; @BindView(R.id.parentPanel) ViewGroup parentPanel; @@ -47,7 +48,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi ButterKnife.bind(this); setLightStatusbar(true); setLightNavigationBar(true); - setupBottomView(); + //setupBottomView(); miniPlayerFragment = (MiniPlayerFragment) getSupportFragmentManager().findFragmentById(R.id.mini_player_fragment); } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java index 86a0f540..13ea037e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsThemeActivity.java @@ -106,20 +106,18 @@ public abstract class AbsThemeActivity extends ATHActivity implements Runnable { if (VersionUtils.hasKitKat()) { final View statusBar = getWindow().getDecorView().getRootView().findViewById(R.id.status_bar); if (statusBar != null) { - if (VersionUtils.hasLollipop()) { + if (VersionUtils.hasMarshmallow()) { + getWindow().setStatusBarColor(color); + } else if (VersionUtils.hasLollipop()) { statusBar.setBackgroundColor(ColorUtil.darkenColor(color)); - setLightStatusbarAuto(color); } else { statusBar.setBackgroundColor(color); } - } else if (VersionUtils.hasMarshmallow()) { - getWindow().setStatusBarColor(color); - setLightStatusbarAuto(color); } else if (Build.VERSION.SDK_INT >= 21) { getWindow().setStatusBarColor(ColorUtil.darkenColor(color)); - setLightStatusbarAuto(color); } } + setLightStatusbarAuto(color); } public void setStatusbarColorAuto() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java index 2e0d0340..f7db9945 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/AbsTagEditorActivity.java @@ -345,14 +345,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity { } } - @Nullable - protected String getComposer() { - try { - return getAudioFile(songPaths.get(0)).getTagOrCreateAndSetDefault().getFirst(FieldKey.COMPOSER); - } catch (Exception ignored) { - return null; - } - } + @Nullable protected Bitmap getAlbumArt() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java index 8621dc4f..f7271f85 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/tageditor/SongTagEditorActivity.java @@ -61,9 +61,6 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW @BindView(R.id.album_artist) EditText albumArtist; - @BindView(R.id.composer) - EditText composer; - private void setupToolbar() { appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)); toolbar.setBackgroundColor(ThemeStore.primaryColor(this)); @@ -94,7 +91,6 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW year.addTextChangedListener(this); trackNumber.addTextChangedListener(this); lyrics.addTextChangedListener(this); - composer.addTextChangedListener(this); } private void fillViewsWithFileTags() { @@ -106,7 +102,6 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW year.setText(getSongYear()); trackNumber.setText(getTrackNumber()); lyrics.setText(getLyrics()); - composer.setText(getComposer()); } @Override @@ -140,7 +135,6 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW fieldKeyValueMap.put(FieldKey.TRACK, trackNumber.getText().toString()); fieldKeyValueMap.put(FieldKey.LYRICS, lyrics.getText().toString()); fieldKeyValueMap.put(FieldKey.ALBUM_ARTIST, albumArtist.getText().toString()); - fieldKeyValueMap.put(FieldKey.COMPOSER, composer.getText().toString()); writeValuesToFiles(fieldKeyValueMap, null); } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java index 8ea4da89..64196be2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/CollageSongAdapter.java @@ -1,10 +1,12 @@ package code.name.monkey.retromusic.ui.adapter; import android.app.Activity; +import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.TextView; import com.bumptech.glide.Glide; @@ -14,8 +16,12 @@ import java.util.List; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; import butterknife.BindViews; import butterknife.ButterKnife; +import code.name.monkey.appthemehelper.ThemeStore; +import code.name.monkey.appthemehelper.util.ColorUtil; +import code.name.monkey.appthemehelper.util.MaterialValueHelper; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.glide.SongGlideRequest; import code.name.monkey.retromusic.helper.MusicPlayerRemote; @@ -39,8 +45,8 @@ public class CollageSongAdapter extends RecyclerView.Adapter 9) { - for (int i = 0; i < dataSet.subList(0, 9).size(); i++) { + if (dataSet.size() > 8) { + for (int i = 0; i < dataSet.subList(0, 8).size(); i++) { if (holder.imageViews != null) { SongGlideRequest.Builder.from(Glide.with(activity), dataSet.get(i)) .checkIgnoreMediaStore(activity) @@ -59,20 +65,25 @@ public class CollageSongAdapter extends RecyclerView.Adapter imageViews; + @BindView(R.id.image_1) + TextView view; CollageSongViewHolder(View itemView) { super(itemView); ButterKnife.bind(this, itemView); + Context context = itemView.getContext(); + int color = ThemeStore.accentColor(context); + view.setBackgroundColor(color); + view.setTextColor(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(color))); } void bindSongs() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java index 0825fc39..90bfd72d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.java @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.ui.adapter.album; +import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.MenuItem; @@ -60,10 +61,6 @@ public class AlbumAdapter extends AbsMultiSelectAdapter dataSet, - @LayoutRes int itemLayoutRes) { - this(activity, dataSet, itemLayoutRes, false, null); - } public void useItemLayout(int itemLayoutRes) { this.itemLayoutRes = itemLayoutRes; @@ -142,6 +139,9 @@ public class AlbumAdapter extends AbsMultiSelectAdapter dataSet, int current, @LayoutRes int itemLayoutRes) { @@ -37,6 +39,13 @@ public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAda this.current = current; } + public PlayingQueueAdapter(AppCompatActivity activity, ArrayList dataSet, int current, + @LayoutRes int itemLayoutRes, @ColorInt int color) { + super(activity, dataSet, itemLayoutRes, false, null); + this.current = current; + this.color = color; + } + @Override protected SongAdapter.ViewHolder createViewHolder(View view) { return new ViewHolder(view); @@ -63,6 +72,9 @@ public class PlayingQueueAdapter extends SongAdapter implements DraggableItemAda if (holder.title != null) { holder.title.setTextColor(white); + if (color != -1) { + holder.title.setTextColor(color); + } } if (holder.text != null) { holder.text.setTextColor(white); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java index 0a477167..85623fe6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.java @@ -211,9 +211,7 @@ public class SongAdapter extends AbsMultiSelectAdapter NavigationUtil.gotoNowPlayingActivity(getContext(), Pair.create(v, getString(R.string.transition_mini_player)))); + view.setOnClickListener(v -> NavigationUtil.gotoNowPlayingActivity(getContext())); setUpMiniPlayer(); - if (RetroUtil.isTablet(getResources())) { + if (RetroUtil.isTablet()) { next.setVisibility(View.VISIBLE); previous.setVisibility(View.VISIBLE); playingQueue.setVisibility(View.VISIBLE); - } else { + } else{ next.setVisibility(PreferenceUtil.getInstance().isExtraMiniExtraControls() ? View.VISIBLE : View.GONE); playingQueue.setVisibility(PreferenceUtil.getInstance().isExtraMiniExtraControls() ? View.GONE : View.VISIBLE); previous.setVisibility(PreferenceUtil.getInstance().isExtraMiniExtraControls() ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java index 741c7696..3c1a4dc5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.java @@ -162,7 +162,7 @@ public abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment { - ThemeStore.editTheme(getActivity()) - .coloredNavigationBar((Boolean) newValue) - .commit(); - getActivity().recreate(); - return true; - }); - } - TwoStatePreference colorAppShortcuts = (TwoStatePreference) findPreference( "should_color_app_shortcuts"); if (!VersionUtils.hasNougatMR()) { diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java index 9f04ec9c..ebe1948c 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java @@ -80,12 +80,12 @@ public class RetroUtil { .replace("%5D", "]"); } - public static boolean isTablet(@NonNull final Resources resources) { - return resources.getConfiguration().smallestScreenWidthDp >= 600; + public static boolean isTablet() { + return RetroApplication.getContext().getResources().getConfiguration().smallestScreenWidthDp >= 600; } - public static boolean isLandscape(@NonNull final Resources resources) { - return resources.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; + public static boolean isLandscape() { + return RetroApplication.getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; } diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.java b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.java new file mode 100644 index 00000000..83b91008 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.java @@ -0,0 +1,36 @@ +package code.name.monkey.retromusic.views; + +import android.content.Context; +import android.util.AttributeSet; + +import com.google.android.material.bottomnavigation.BottomNavigationView; + +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.NavigationViewUtil; +import code.name.monkey.retromusic.R; +import code.name.monkey.retromusic.util.PreferenceUtil; + +public class BottomNavigationBarTinted extends BottomNavigationView { + public BottomNavigationBarTinted(Context context) { + this(context, null); + } + + public BottomNavigationBarTinted(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public BottomNavigationBarTinted(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + setLabelVisibilityMode(PreferenceUtil.getInstance().getTabTitleMode()); + setBackgroundColor(ThemeStore.primaryColor(context)); + setSelectedItemId(PreferenceUtil.getInstance().getLastPage()); + + int iconColor = ATHUtil.resolveColor(context, R.attr.iconColor); + int accentColor = ThemeStore.accentColor(context); + NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor); + NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor); + + } +} diff --git a/app/src/main/java/code/name/monkey/retromusic/views/CollapsingFAB.java b/app/src/main/java/code/name/monkey/retromusic/views/CollapsingFAB.java new file mode 100644 index 00000000..bf9951d2 --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/views/CollapsingFAB.java @@ -0,0 +1,71 @@ +package code.name.monkey.retromusic.views; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.util.AttributeSet; +import android.view.View; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.TextView; + +import com.google.android.material.card.MaterialCardView; + +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.transition.AutoTransition; +import androidx.transition.TransitionManager; +import code.name.monkey.appthemehelper.util.ColorUtil; +import code.name.monkey.appthemehelper.util.MaterialValueHelper; +import code.name.monkey.retromusic.R; + +public class CollapsingFAB extends FrameLayout { + @ColorInt + int color = Color.WHITE; + boolean showTitle; + + ImageView shuffleIcon; + TextView textView; + MaterialCardView cardView; + + public CollapsingFAB(@NonNull Context context) { + this(context, null); + } + + public CollapsingFAB(@NonNull Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public CollapsingFAB(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.CollapsingFAB, 0, 0); + color = attributes.getColor(R.styleable.CollapsingFAB_shuffleBackgroundColor, 0); + showTitle = attributes.getBoolean(R.styleable.CollapsingFAB_showTitle, false); + View view = inflate(context, R.layout.collapsing_floating_action_button, this); + shuffleIcon = view.findViewById(R.id.icon); + textView = view.findViewById(R.id.shuffle_text); + textView.setVisibility(showTitle ? VISIBLE : GONE); + cardView = view.findViewById(R.id.container); + attributes.recycle(); + } + + public void setShowTitle(boolean showTitle) { + this.showTitle = showTitle; + TransitionManager.beginDelayedTransition(this, new AutoTransition()); + textView.setVisibility(showTitle ? VISIBLE : GONE); + invalidate(); + requestLayout(); + } + + public void setColor(int color) { + this.color = color; + int textColor = MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(color)); + shuffleIcon.setColorFilter(textColor); + textView.setTextColor(textColor); + cardView.setCardBackgroundColor(ColorStateList.valueOf(color)); + postInvalidate(); + } +} diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java index a7a2907a..af627666 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.java @@ -17,19 +17,20 @@ package code.name.monkey.retromusic.views; import android.content.Context; import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.util.DisplayMetrics; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SnapHelper; -import android.util.AttributeSet; -import android.util.DisplayMetrics; -import android.view.View; -import android.view.ViewGroup; - import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.ui.adapter.base.MediaEntryViewHolder; +import code.name.monkey.retromusic.util.RetroUtil; public class MetalRecyclerViewPager extends RecyclerView { @@ -88,7 +89,11 @@ public class MetalRecyclerViewPager extends RecyclerView { } void updateDisplayMetrics() { - itemWidth = metrics.widthPixels - itemMargin * 2; + if (RetroUtil.isTablet()) { + itemWidth = (metrics.widthPixels / 2) - itemMargin * 3; + } else { + itemWidth = metrics.widthPixels - itemMargin * 2; + } } @Override 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 aa14d979..ace01f47 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 @@ -2,32 +2,33 @@ package code.name.monkey.retromusic.views; import android.annotation.SuppressLint; import android.app.Dialog; -import android.content.res.ColorStateList; +import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.view.View; +import android.view.ViewGroup; import android.view.Window; import android.widget.FrameLayout; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.google.android.material.bottomsheet.BottomSheetDialogFragment; - -import java.util.Objects; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; +import androidx.annotation.StyleRes; +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.RetroUtil; /** * Created by yu on 2016/11/10. */ @SuppressLint("RestrictedApi") -public class RoundedBottomSheetDialogFragment extends BottomSheetDialogFragment { +public class RoundedBottomSheetDialogFragment extends AppCompatDialogFragment { /* @Override public int getTheme() { @@ -52,22 +53,26 @@ public class RoundedBottomSheetDialogFragment extends BottomSheetDialogFragment view.getViewTreeObserver().addOnGlobalLayoutListener(() -> { BottomSheetDialog dialog = (BottomSheetDialog) getDialog(); FrameLayout bottomSheet = dialog.findViewById(R.id.design_bottom_sheet); - if (bottomSheet != null) { BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet); behavior.setState(BottomSheetBehavior.STATE_EXPANDED); + bottomSheet.setBackground(RetroUtil.getTintedDrawable(getContext(), R.drawable.bg_bottom_sheet_dialog_fragment, ThemeStore.primaryColor(getContext()))); } }); - view.setBackground(ContextCompat.getDrawable(view.getContext(), R.drawable.bg_bottom_sheet_dialog_fragment)); - view.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.primaryColor(view.getContext()))); - ((AbsBaseActivity) Objects.requireNonNull(getActivity())).setNavigationbarColorAuto(); + if (getActivity() != null) { + if (VersionUtils.hasNougat()) { + ((AbsBaseActivity) getActivity()).setNavigationbarColor(ThemeStore.primaryColor(getContext())); + } else { + ((AbsBaseActivity) getActivity()).setNavigationbarColorAuto(); + } + } } @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { //noinspection ConstantConditions - return new BottomSheetDialog(getContext()); + return new CustomWidthBottomSheetDialog(getContext(), getTheme()); } @Override @@ -80,4 +85,18 @@ public class RoundedBottomSheetDialogFragment extends BottomSheetDialogFragment window.findViewById(com.google.android.material.R.id.container).setFitsSystemWindows(true); } } + + static class CustomWidthBottomSheetDialog extends BottomSheetDialog { + CustomWidthBottomSheetDialog(@NonNull Context context, @StyleRes int theme) { + super(context, theme); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + int width = getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_width); + getWindow().setLayout(width > 0 ? width : ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT); + } + } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TintIconColorToolbar.java b/app/src/main/java/code/name/monkey/retromusic/views/TintIconColorToolbar.java new file mode 100644 index 00000000..eb3d190f --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/views/TintIconColorToolbar.java @@ -0,0 +1,33 @@ +package code.name.monkey.retromusic.views; + +import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import code.name.monkey.appthemehelper.ThemeStore; + +public class TintIconColorToolbar extends Toolbar { + public TintIconColorToolbar(Context context) { + super(context); + } + + public TintIconColorToolbar(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public TintIconColorToolbar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + + @Override + public void setNavigationIcon(@Nullable Drawable icon) { + super.setNavigationIcon(icon); + if (icon != null) { + icon.setColorFilter(ThemeStore.accentColor(getContext()), PorterDuff.Mode.SRC_IN); + } + } +} diff --git a/app/src/main/res/animator/slide_in_left.xml b/app/src/main/res/animator/slide_in_left.xml new file mode 100644 index 00000000..751d2da5 --- /dev/null +++ b/app/src/main/res/animator/slide_in_left.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml b/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml index bf699428..8b46ad5a 100644 --- a/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml +++ b/app/src/main/res/drawable/bg_bottom_sheet_dialog_fragment.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/bg_circular_corners.xml b/app/src/main/res/drawable/bg_circular_corners.xml new file mode 100644 index 00000000..0c55bc84 --- /dev/null +++ b/app/src/main/res/drawable/bg_circular_corners.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index ebe73cf3..f2040973 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent" android:layout_weight="1"> - @@ -71,7 +71,6 @@ android:layout_height="wrap_content" android:maxLines="2" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:transitionName="@string/transition_album_name" tools:ignore="MissingPrefix" /> @@ -101,25 +99,14 @@ - - - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="true" + app:shuffleBackgroundColor="@color/md_black_1000" /> diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index f7a50681..0da4ac73 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -27,20 +27,7 @@ android:id="@+id/toolbar" style="@style/Toolbar48" /> - + - - - @@ -121,4 +105,12 @@ android:layout_height="72dp" android:background="@drawable/shadow_down_strong" /> + diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml index 2000fea7..339ce3bf 100644 --- a/app/src/main/res/layout-land/activity_settings.xml +++ b/app/src/main/res/layout-land/activity_settings.xml @@ -1,7 +1,6 @@ @@ -22,9 +21,8 @@ android:id="@+id/toolbar" style="@style/Toolbar48" app:layout_collapseMode="pin" - app:title="" - tools:ignore="UnusedAttribute"> - + app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" + app:title=""> + + @@ -39,9 +39,10 @@ android:ellipsize="end" android:maxLines="1" android:paddingStart="8dp" - android:paddingTop="8dp" + android:paddingTop="6dp" android:paddingEnd="8dp" - android:textColor="?android:attr/textColorSecondary" + android:paddingBottom="4dp" + android:textSize="13sp" tools:ignore="MissingPrefix" tools:text="My top tracks" /> @@ -52,11 +53,9 @@ android:layout_height="match_parent" android:ellipsize="end" android:maxLines="1" - android:padding="8dp" - android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="?android:attr/textColorPrimary" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:textSize="14sp" tools:ignore="MissingPrefix" tools:text="My top tracks" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/abs_playlists.xml b/app/src/main/res/layout-sw600dp/abs_playlists.xml index 52ab1bd8..db1086c8 100644 --- a/app/src/main/res/layout-sw600dp/abs_playlists.xml +++ b/app/src/main/res/layout-sw600dp/abs_playlists.xml @@ -48,10 +48,8 @@ - @@ -75,8 +73,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="8dp" - android:text="@string/history" - android:textSize="12sp" /> + android:text="@string/history" /> @@ -94,7 +91,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="@drawable/abs_last_added_playlist" - android:padding="12dp" + android:padding="24dp" app:srcCompat="@drawable/ic_library_add_white_24dp" app:tint="@color/md_red_A700" /> @@ -103,8 +100,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="8dp" - android:text="@string/last_added" - android:textSize="12sp" /> + android:text="@string/last_added" /> @@ -122,7 +118,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="@drawable/abs_top_tracks_playlist" - android:padding="12dp" + android:padding="24dp" app:srcCompat="@drawable/ic_trending_up_white_24dp" app:tint="@color/md_deep_purple_A700" /> @@ -131,8 +127,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="8dp" - android:text="@string/my_top_tracks" - android:textSize="12sp" /> + android:text="@string/my_top_tracks" /> @@ -150,7 +145,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:background="@drawable/abs_shuffle" - android:padding="12dp" + android:padding="24dp" app:srcCompat="@drawable/ic_shuffle_white_24dp" app:tint="@color/md_green_A700" /> @@ -159,8 +154,7 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="8dp" - android:text="@string/shuffle" - android:textSize="12sp" /> + android:text="@string/shuffle" /> diff --git a/app/src/main/res/layout-sw600dp/activity_user_info.xml b/app/src/main/res/layout-sw600dp/activity_user_info.xml new file mode 100644 index 00000000..941fe121 --- /dev/null +++ b/app/src/main/res/layout-sw600dp/activity_user_info.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/fragment_mini_player.xml b/app/src/main/res/layout-sw600dp/fragment_mini_player.xml index ce7bde21..3971c58c 100644 --- a/app/src/main/res/layout-sw600dp/fragment_mini_player.xml +++ b/app/src/main/res/layout-sw600dp/fragment_mini_player.xml @@ -85,7 +85,6 @@ style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" android:layout_width="match_parent" android:layout_height="3dp" - android:layout_gravity="bottom" android:progress="20" app:mpb_progressStyle="horizontal" app:mpb_showProgressBackground="false" diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml index 06ba6249..3692c64e 100644 --- a/app/src/main/res/layout-xlarge-land/activity_album.xml +++ b/app/src/main/res/layout-xlarge-land/activity_album.xml @@ -4,21 +4,15 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:transitionName="@string/transition_album_art"> + android:scaleType="centerCrop" /> - + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" /> + android:orientation="horizontal"> - + android:layout_margin="8dp" + app:cardCornerRadius="8dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="true"> + + + - - @@ -126,20 +122,14 @@ - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="false" + app:shuffleBackgroundColor="@color/md_black_1000" /> @@ -96,23 +96,12 @@ - - - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="false" + app:shuffleBackgroundColor="@color/md_black_1000" /> diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml index cbbc3f8e..539fc11b 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml @@ -59,14 +59,13 @@ - - + android:layout_height="match_parent"> - - - - - - - - - - - - + android:layout_height="match_parent"> + android:layout_above="@id/toolbar_container" + android:orientation="horizontal"> - - - + android:layout_weight="1"> - + - + + + + + + + + + + + + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical" + android:padding="24dp"> - + android:padding="12dp" + android:text="Queue" + android:textAppearance="@style/TextAppearance.AppCompat.Display2" + android:textColor="@color/md_white_1000" + tools:ignore="MissingPrefix" /> - - - - - - - + android:layout_gravity="center_horizontal" /> + + + + + + - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml index 9e46ecaa..e5147d62 100644 --- a/app/src/main/res/layout-xlarge-land/fragment_home.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml @@ -9,45 +9,31 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:focusable="true" + android:layout_weight="1" tools:ignore="UnusedAttribute"> - - + android:orientation="vertical"> + android:layout_height="wrap_content"> - @@ -78,23 +64,23 @@ + + + + diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml index 15cb3b01..c7699b97 100644 --- a/app/src/main/res/layout-xlarge/activity_album.xml +++ b/app/src/main/res/layout-xlarge/activity_album.xml @@ -4,21 +4,15 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:transitionName="@string/transition_album_art"> + android:scaleType="centerCrop" /> - + android:orientation="horizontal"> - + android:layout_margin="8dp" + app:cardCornerRadius="8dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="true"> + + + @@ -130,20 +129,13 @@ android:layout_height="72dp" android:background="@drawable/shadow_down_strong" /> - - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="false" + app:shuffleBackgroundColor="@color/md_black_1000" /> \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml index 04b500de..25514e19 100644 --- a/app/src/main/res/layout-xlarge/activity_artist_details.xml +++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml @@ -39,20 +39,21 @@ @@ -99,23 +100,12 @@ - - - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="false" + app:shuffleBackgroundColor="@color/md_black_1000" /> diff --git a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml index 192194ff..773e82a4 100644 --- a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml +++ b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml @@ -11,9 +11,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="8dp" - android:background="@android:color/black" app:cardCornerRadius="12dp" - app:cardElevation="8dp" + app:cardElevation="4dp" app:cardPreventCornerOverlap="false" app:cardUseCompatPadding="true"> diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml new file mode 100644 index 00000000..8f6b34f5 --- /dev/null +++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml index 1b2a631d..8a8b4517 100644 --- a/app/src/main/res/layout-xlarge/fragment_blur.xml +++ b/app/src/main/res/layout-xlarge/fragment_blur.xml @@ -25,63 +25,60 @@ android:layout_height="match_parent" android:background="@drawable/shadow_up" /> - - - + android:layout_height="match_parent"> - - - - - - - - - - - + android:layout_gravity="center_horizontal" + android:layout_marginStart="64dp" + android:layout_marginEnd="64dp" + android:orientation="vertical"> - + + + + + - + android:layout_weight="1" + tools:background="@color/md_white_1000"> - + + - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml index 8d364256..927057ac 100644 --- a/app/src/main/res/layout-xlarge/fragment_home.xml +++ b/app/src/main/res/layout-xlarge/fragment_home.xml @@ -1,110 +1,86 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - - + + + + + + + android:layout_weight="0" + android:elevation="0dp" + app:elevation="0dp" + tools:ignore="UnusedAttribute"> - - - - - - - - - + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false"> - + - - - - - + - - - + + - - - + android:layout_height="match_parent" + android:layout_marginStart="64dp" + android:layout_marginEnd="64dp" + android:layout_weight="1" + android:background="@color/md_white_1000" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + - + - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml similarity index 81% rename from app/src/main/res/layout-sw600dp/pager_item.xml rename to app/src/main/res/layout-xlarge/pager_item.xml index fc99b93b..6c067a3f 100644 --- a/app/src/main/res/layout-sw600dp/pager_item.xml +++ b/app/src/main/res/layout-xlarge/pager_item.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root_layout" - android:layout_width="512dp" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -32,31 +32,30 @@ app:srcCompat="@drawable/ic_play_arrow_white_24dp" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index fb06ae67..bdae7254 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -14,6 +14,7 @@ android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" + app:contentScrim="@android:color/transparent" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:titleEnabled="false"> @@ -39,8 +40,8 @@ - + style="@style/Toolbar48" + app:layout_collapseMode="pin" /> @@ -86,7 +87,6 @@ android:layout_height="wrap_content" android:maxLines="2" android:textAppearance="@style/TextAppearance.AppCompat.Title" - android:transitionName="@string/transition_album_name" tools:ignore="MissingPrefix" /> @@ -112,25 +111,18 @@ - + - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="true" + app:shuffleBackgroundColor="@color/md_black_1000" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album_content.xml b/app/src/main/res/layout/activity_album_content.xml index 744d40e4..6234b14c 100644 --- a/app/src/main/res/layout/activity_album_content.xml +++ b/app/src/main/res/layout/activity_album_content.xml @@ -12,7 +12,7 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml index ee3d3ac9..d858129f 100644 --- a/app/src/main/res/layout/activity_artist_content.xml +++ b/app/src/main/res/layout/activity_artist_content.xml @@ -45,4 +45,7 @@ android:layout_height="wrap_content" android:nestedScrollingEnabled="false" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml index c6cd7022..69b69e29 100755 --- a/app/src/main/res/layout/activity_artist_details.xml +++ b/app/src/main/res/layout/activity_artist_details.xml @@ -37,7 +37,6 @@ android:layout_height="72dp" android:background="@drawable/shadow_down_strong" /> - - + - + android:layout_gravity="end|bottom" + android:layout_margin="10dp" + app:showTitle="true" + app:shuffleBackgroundColor="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index d76f9924..d3ac4e88 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -63,6 +63,7 @@ android:background="?dividerColor" /> + + - - + app:showTitle="true" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml index acb4f92b..6cac0df4 100755 --- a/app/src/main/res/layout/activity_song_tag_editor.xml +++ b/app/src/main/res/layout/activity_song_tag_editor.xml @@ -143,22 +143,6 @@ - - - - - + style="@style/Toolbar48" + app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml index 48003e01..3f4354c9 100644 --- a/app/src/main/res/layout/dialog_create_playlist.xml +++ b/app/src/main/res/layout/dialog_create_playlist.xml @@ -61,7 +61,7 @@ + android:padding="12dp"> + android:background="@android:color/transparent"> + + + android:layout_height="1dp" + android:background="?dividerColor" /> @@ -49,6 +45,7 @@ diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml index 3fc7f6b4..f00ab652 100644 --- a/app/src/main/res/layout/fragment_banner_home.xml +++ b/app/src/main/res/layout/fragment_banner_home.xml @@ -1,98 +1,37 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - - + android:elevation="0dp" + android:focusable="true" + app:elevation="0dp" + tools:ignore="UnusedAttribute"> - - - - - - + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false"> - - - + + - - - + android:background="@drawable/bg_circular_top_corners" + app:behavior_overlapTop="24dp" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:layout_height="match_parent" + android:descendantFocusability="blocksDescendants" + android:focusable="true" + android:focusableInTouchMode="true" + android:orientation="vertical"> - - + android:layout_height="wrap_content" + android:layout_margin="4dp" + app:cardCornerRadius="8dp" + app:cardUseCompatPadding="true"> - + + - - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 1ebe17bb..e61a156c 100755 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,6 +6,13 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + + + - + - + - - - - - - - - - - + + diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index fd2c52a8..c89a74d4 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" app:layout_collapseMode="pin"> - @@ -57,7 +57,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Large" tools:ignore="MissingPrefix" /> - + - + android:id="@+id/image_1" android:layout_height="match_parent" + android:background="@color/md_red_400" + android:padding="8dp" + android:text="New music mix" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" + app:autoSizeMaxTextSize="128sp" + app:autoSizeMinTextSize="24sp" + app:autoSizeStepGranularity="1sp" + app:autoSizeTextType="uniform" /> diff --git a/app/src/main/res/layout/item_image_gradient.xml b/app/src/main/res/layout/item_image_gradient.xml new file mode 100644 index 00000000..a105f40e --- /dev/null +++ b/app/src/main/res/layout/item_image_gradient.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml index db2b6c8c..16ef3087 100644 --- a/app/src/main/res/layout/pager_item.xml +++ b/app/src/main/res/layout/pager_item.xml @@ -41,8 +41,8 @@ android:paddingStart="8dp" android:paddingTop="6dp" android:paddingEnd="8dp" - android:textSize="13sp" android:paddingBottom="4dp" + android:textSize="13sp" tools:ignore="MissingPrefix" tools:text="My top tracks" /> 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 a5fb9619..c65513d1 100644 --- a/app/src/main/res/layout/sliding_music_panel_layout.xml +++ b/app/src/main/res/layout/sliding_music_panel_layout.xml @@ -25,11 +25,6 @@ android:background="@drawable/bg_circular_top_corners" android:orientation="vertical"> - - - - + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 58715d5f..5d8dcd4f 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -73,7 +73,7 @@ Ajuste de desenfoque con temas compatibles, menor es más rápido Mantener pantalla encendida Ten en cuenta que habilitar esta característica puede afectar al rendimiento de la batería - Comprar RetroMusic Pro + Cancelar temporizador actual Tarjeta diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 65d125c6..740283e5 100755 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -51,6 +51,7 @@ @string/card_color_style @string/card_circular_style @string/image + @string/image_gradient @@ -59,6 +60,7 @@ 2 3 4 + 5 @@ -67,6 +69,7 @@ @layout/item_card_color @layout/item_grid_circle @layout/image + @layout/item_image_gradient @@ -203,4 +206,5 @@ 1 + Gradient image \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index fca3205a..3818e0d6 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,9 @@ - + + + + diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index fb61920f..afd6e385 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -16,7 +16,6 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81aeab1e..96484933 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,7 +552,7 @@ Pause playing on zero and plays after raise volume. Warning when you increase the volume it starts playing even your outside the app Pause on zero What\'s New - Composer + Suggestions Fit diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 83068e93..d1d22170 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -50,7 +50,7 @@ + + diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 2d3d57f6..509e6284 100755 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -28,14 +28,6 @@ android:title="@string/accent_color" app:iconSpaceReserved="false" /> - - = Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { activity.getWindow().setNavigationBarColor(color); - setLightNavigationbarAuto(activity, color); + } else { + activity.getWindow().setNavigationBarColor(ColorUtil.darkenColor(color)); } + setLightNavigationbarAuto(activity, color); } public static void setActivityToolbarColorAuto(Activity activity, @Nullable Toolbar toolbar) { diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java index e7ccf0b2..b5380973 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java @@ -18,7 +18,7 @@ public class MaterialUtil { } public static void setTint(@NonNull MaterialButton button, boolean background, int color) { - button.setPadding(48, 48, 48, 48); + //button.setPadding(48, 48, 48, 48); button.setAllCaps(false); final Context context = button.getContext(); final ColorStateList colorState = ColorStateList.valueOf(color); diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java index a0bb894c..62c6e688 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java @@ -42,19 +42,52 @@ import androidx.core.graphics.drawable.DrawableCompat; import code.name.monkey.appthemehelper.R; import code.name.monkey.appthemehelper.ThemeStore; - public final class ToolbarContentTintHelper { - private ToolbarContentTintHelper() { } + public static void tintAllIcons(Menu menu, final int color) { + for (int i = 0; i < menu.size(); ++i) { + final MenuItem item = menu.getItem(i); + tintMenuItemIcon(color, item); + tintShareIconIfPresent(color, item); + } + } + + private static void tintMenuItemIcon(int color, MenuItem item) { + final Drawable drawable = item.getIcon(); + if (drawable != null) { + final Drawable wrapped = DrawableCompat.wrap(drawable); + drawable.mutate(); + DrawableCompat.setTint(wrapped, color); + item.setIcon(drawable); + } + } + + private static void tintShareIconIfPresent(int color, MenuItem item) { + if (item.getActionView() != null) { + final View actionView = item.getActionView(); + final View expandActivitiesButton = actionView.findViewById(R.id.expand_activities_button); + if (expandActivitiesButton != null) { + final ImageView image = (ImageView) expandActivitiesButton.findViewById(R.id.image); + if (image != null) { + final Drawable drawable = image.getDrawable(); + final Drawable wrapped = DrawableCompat.wrap(drawable); + drawable.mutate(); + DrawableCompat.setTint(wrapped, color); + image.setImageDrawable(drawable); + } + } + } + } + public static void colorBackButton(Toolbar toolbar, @ColorInt int color) { final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY); for (int i = 0; i < toolbar.getChildCount(); i++) { final View backButton = toolbar.getChildAt(i); - if (backButton instanceof ImageButton) { - ((ImageButton) backButton).getDrawable().setColorFilter(colorFilter); + if (backButton instanceof ImageView) { + ((ImageView) backButton).getDrawable().setColorFilter(colorFilter); } } } @@ -87,8 +120,7 @@ public final class ToolbarContentTintHelper { //Colorize the ActionViews -> all icons that are NOT: back button | overflow menu final View innerView = ((ActionMenuView) v).getChildAt(j); if (innerView instanceof ActionMenuItemView) { - for (int k = 0; k < ((ActionMenuItemView) innerView).getCompoundDrawables().length; - k++) { + for (int k = 0; k < ((ActionMenuItemView) innerView).getCompoundDrawables().length; k++) { if (((ActionMenuItemView) innerView).getCompoundDrawables()[k] != null) { final int finalK = k; diff --git a/build.gradle b/build.gradle index 49bdf9ac..9ceff476 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - supportLibVersion = '1.0.0-rc01' + supportLibVersion = '1.0.0' firebase = "11.8.0" retrofit = "2.3.0" butterKnife = "9.0.0-SNAPSHOT" @@ -13,7 +13,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha08' + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d67f5bc7..d030dadb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 10 02:06:50 IST 2018 +#Wed Oct 03 11:17:01 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip