From 31caedd7ed742a06fcc6e38f00262996d35af3d6 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Thu, 23 Jun 2022 00:12:39 +0530 Subject: [PATCH] Optimized imports --- app/build.gradle | 2 +- .../retromusic/adapter/SearchAdapter.kt | 22 +++++++++---------- .../player/PlayerAlbumCoverFragment.kt | 2 +- .../player/gradient/GradientPlayerFragment.kt | 6 ----- .../fragments/settings/AbsSettingsFragment.kt | 1 - .../settings/MainSettingsFragment.kt | 1 - .../AlbumCoverStylePreferenceDialog.kt | 1 - .../NowPlayingScreenPreferenceDialog.kt | 1 - .../retromusic/service/LocalPlayback.kt | 1 - .../monkey/retromusic/util/NavigationUtil.kt | 6 +++-- 10 files changed, 17 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d7a3bcc2b..a11f15079 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 10596 + versionCode 10597 versionName '6.0.2-beta' buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"") diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt index 06ed30be0..8cf77ad52 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt @@ -60,26 +60,26 @@ class SearchAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - return if (viewType == HEADER) ViewHolder( - LayoutInflater.from(activity).inflate( - R.layout.sub_header, - parent, - false - ), viewType - ) - else if (viewType == ALBUM || viewType == ARTIST || viewType== ALBUM_ARTIST) - ViewHolder( + return when (viewType) { + HEADER -> ViewHolder( + LayoutInflater.from(activity).inflate( + R.layout.sub_header, + parent, + false + ), viewType + ) + ALBUM, ARTIST, ALBUM_ARTIST -> ViewHolder( LayoutInflater.from(activity).inflate( R.layout.item_list_big, parent, false ), viewType ) - else - ViewHolder( + else -> ViewHolder( LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType ) + } } override fun onBindViewHolder(holder: ViewHolder, position: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt index db1c641d5..ca8bc97be 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt @@ -45,8 +45,8 @@ import code.name.monkey.retromusic.lyrics.CoverLrcView import code.name.monkey.retromusic.model.lyrics.Lyrics import code.name.monkey.retromusic.transform.CarousalPagerTransformer import code.name.monkey.retromusic.transform.ParallaxPagerTransformer -import code.name.monkey.retromusic.util.LyricUtil import code.name.monkey.retromusic.util.CoverLyricsType +import code.name.monkey.retromusic.util.LyricUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index d85101427..3ab5c83f3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt @@ -14,7 +14,6 @@ */ package code.name.monkey.retromusic.fragments.player.gradient -import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.content.res.ColorStateList import android.graphics.Color @@ -83,9 +82,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play private var _binding: FragmentGradientPlayerBinding? = null private val binding get() = _binding!! - private var progressAnimator: ObjectAnimator? = null - var isSeeking = false - private val bottomSheetCallbackList = object : BottomSheetCallback() { override fun onSlide(bottomSheet: View, slideOffset: Float) { mainActivity.getBottomSheetBehavior().isDraggable = false @@ -562,12 +558,10 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play }) progressSlider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener { override fun onStartTrackingTouch(slider: Slider) { - isSeeking = true progressViewUpdateHelper.stop() } override fun onStopTrackingTouch(slider: Slider) { - isSeeking = false MusicPlayerRemote.seekTo(slider.value.toInt()) progressViewUpdateHelper.start() } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt index b3688f609..ed4b90d0b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt @@ -29,7 +29,6 @@ import code.name.monkey.retromusic.extensions.dip import code.name.monkey.retromusic.extensions.goToProVersion import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.preferences.* -import code.name.monkey.retromusic.util.NavigationUtil import dev.chrisbanes.insetter.applyInsetter /** diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt index fa58c0bd2..047009eda 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt @@ -28,7 +28,6 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentMainSettingsBinding import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding import code.name.monkey.retromusic.extensions.goToProVersion -import code.name.monkey.retromusic.util.NavigationUtil class MainSettingsFragment : Fragment(), View.OnClickListener { diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt index 9acd387a6..ce046c31a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt @@ -34,7 +34,6 @@ import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBin import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.AlbumCoverStyle import code.name.monkey.retromusic.fragments.AlbumCoverStyle.* -import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil import com.bumptech.glide.Glide diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt index e84ccb19b..55cdd70bc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt @@ -33,7 +33,6 @@ import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBin import code.name.monkey.retromusic.extensions.* import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.NowPlayingScreen.* -import code.name.monkey.retromusic.util.NavigationUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil import com.bumptech.glide.Glide diff --git a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt b/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt index 2573e88b8..429867051 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt @@ -8,7 +8,6 @@ import android.media.AudioAttributes import android.media.AudioManager import android.media.MediaPlayer import android.media.PlaybackParams -import android.os.StrictMode import androidx.annotation.CallSuper import androidx.core.content.getSystemService import androidx.core.net.toUri diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt index bea599a00..3c29a9f3f 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt @@ -15,13 +15,15 @@ package code.name.monkey.retromusic.util import android.app.Activity import android.content.ActivityNotFoundException -import android.content.Context import android.content.Intent import android.media.audiofx.AudioEffect import android.widget.Toast import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.activities.* +import code.name.monkey.retromusic.activities.DriveModeActivity +import code.name.monkey.retromusic.activities.LicenseActivity +import code.name.monkey.retromusic.activities.SupportDevelopmentActivity +import code.name.monkey.retromusic.activities.WhatsNewFragment import code.name.monkey.retromusic.activities.bugreport.BugReportActivity import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.helper.MusicPlayerRemote.audioSessionId