From 9b8925917862d3b815fd3432f97859e3edbc3afd Mon Sep 17 00:00:00 2001 From: h4h13 Date: Mon, 6 Jan 2020 02:25:07 +0530 Subject: [PATCH] fix crashing --- .../name/monkey/retromusic/activities/AboutActivity.kt | 3 --- .../retromusic/activities/PlayingQueueActivity.kt | 2 -- .../retromusic/activities/PlaylistDetailActivity.kt | 5 ++--- .../monkey/retromusic/activities/SearchActivity.kt | 3 --- .../player/color/ColorPlaybackControlsFragment.kt | 10 +++++----- app/src/main/res/drawable/ic_image_white_24dp.xml | 2 +- .../main/res/drawable/ic_info_outline_white_24dp.xml | 2 +- .../drawable/ic_notifications_active_white_24dp.xml | 2 +- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt index 41645390..21e44354 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt @@ -32,7 +32,6 @@ import com.afollestad.materialdialogs.bottomsheets.BottomSheet import com.afollestad.materialdialogs.list.listItems import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import kotlinx.android.synthetic.main.activity_about.container import kotlinx.android.synthetic.main.activity_about.toolbar import kotlinx.android.synthetic.main.card_credit.recyclerView import kotlinx.android.synthetic.main.card_other.changelog @@ -49,7 +48,6 @@ import kotlinx.android.synthetic.main.card_social.instagramLink import kotlinx.android.synthetic.main.card_social.pinterestLink import kotlinx.android.synthetic.main.card_social.telegramLink import kotlinx.android.synthetic.main.card_social.twitterLink -import me.everything.android.ui.overscroll.OverScrollDecoratorHelper import java.io.IOException import java.nio.charset.StandardCharsets @@ -88,7 +86,6 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener { version.setSummary(getAppVersion()) setUpView() loadContributors() - OverScrollDecoratorHelper.setUpOverScroll(container) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt index bcae9801..7377fd93 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt @@ -24,7 +24,6 @@ import kotlinx.android.synthetic.main.activity_playing_queue.clearQueue import kotlinx.android.synthetic.main.activity_playing_queue.playerQueueSubHeader import kotlinx.android.synthetic.main.activity_playing_queue.recyclerView import kotlinx.android.synthetic.main.activity_playing_queue.toolbar -import me.everything.android.ui.overscroll.OverScrollDecoratorHelper open class PlayingQueueActivity : AbsMusicServiceActivity() { @@ -109,7 +108,6 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() { } }) ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView) - OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL) } private fun checkForPadding() { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt index faf0a6f9..4d4c3743 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt @@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.activity_playlist_detail.emptyEmoji import kotlinx.android.synthetic.main.activity_playlist_detail.emptyText import kotlinx.android.synthetic.main.activity_playlist_detail.recyclerView import kotlinx.android.synthetic.main.activity_playlist_detail.toolbar -import me.everything.android.ui.overscroll.OverScrollDecoratorHelper import javax.inject.Inject class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, PlaylistSongsView { @@ -75,8 +74,6 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli } private fun setUpRecyclerView() { - ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView) - OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL) recyclerView.layoutManager = LinearLayoutManager(this) if (playlist is AbsCustomPlaylist) { @@ -118,6 +115,8 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli checkIsEmpty() } }) + + ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView) } override fun onResume() { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt index f12ad699..850aaae3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt @@ -38,7 +38,6 @@ import kotlinx.android.synthetic.main.activity_search.recyclerView import kotlinx.android.synthetic.main.activity_search.searchContainer import kotlinx.android.synthetic.main.activity_search.searchView import kotlinx.android.synthetic.main.activity_search.voiceSearch -import me.everything.android.ui.overscroll.OverScrollDecoratorHelper import java.util.Locale import javax.inject.Inject @@ -113,8 +112,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatch } } }) - - OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL) } private fun setupSearchView() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index c73e6ff9..4c97e4fb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt @@ -21,16 +21,16 @@ import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.ViewUtil +import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.nextButton +import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.playPauseButton +import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.previousButton import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.progressSlider +import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.repeatButton +import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.shuffleButton import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songCurrentProgress import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songTotalTime import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.text import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.title -import kotlinx.android.synthetic.main.fragment_player_playback_controls.nextButton -import kotlinx.android.synthetic.main.fragment_player_playback_controls.playPauseButton -import kotlinx.android.synthetic.main.fragment_player_playback_controls.previousButton -import kotlinx.android.synthetic.main.fragment_player_playback_controls.repeatButton -import kotlinx.android.synthetic.main.fragment_player_playback_controls.shuffleButton class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image_white_24dp.xml index dbd4acc0..ae7e1808 100644 --- a/app/src/main/res/drawable/ic_image_white_24dp.xml +++ b/app/src/main/res/drawable/ic_image_white_24dp.xml @@ -21,5 +21,5 @@ + android:pathData="M19 5v14H5V5h14m0-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml index 01175772..194cfc1f 100644 --- a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml +++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml @@ -19,5 +19,5 @@ android:viewportHeight="24.0"> + android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" /> diff --git a/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml b/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml index 21e222e4..37c43003 100644 --- a/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml +++ b/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml @@ -20,5 +20,5 @@ + android:pathData="M19.29 17.29L18 16v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-0.83-0.67-1.5-1.5-1.5s-1.5 0.67 -1.5 1.5v0.68C7.63 5.36 6 7.92 6 11v5l-1.29 1.29c-0.63 0.63 -0.19 1.71 0.7 1.71h13.17c0.9 0 1.34-1.08 0.71 -1.71zM16 17H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6zm-4 5c1.1 0 2-0.9 2-2h-4c0 1.1 0.89 2 2 2z" /> \ No newline at end of file