From 89174b8011868823538ef9682440f80b47dedb46 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sat, 20 Feb 2021 16:35:36 -0700 Subject: [PATCH] Clean code Do some codebase cleaning. --- .../oxycblt/auxio/detail/DetailViewModel.kt | 3 -- .../auxio/music/processing/MusicLinker.kt | 5 ++-- .../auxio/music/processing/MusicLoader.kt | 4 +-- .../auxio/playback/CompactPlaybackFragment.kt | 6 +--- .../oxycblt/auxio/playback/PlayPauseButton.kt | 28 +++++++++---------- .../auxio/playback/PlaybackFragment.kt | 10 ++----- .../auxio/playback/system/PlaybackService.kt | 4 --- .../org/oxycblt/auxio/ui/InterfaceUtils.kt | 4 +-- app/src/main/res/layout/fragment_loading.xml | 4 +-- app/src/main/res/values/strings.xml | 1 - 10 files changed, 24 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt index 9bea7d042..3905035fa 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt @@ -7,7 +7,6 @@ import org.oxycblt.auxio.music.Album import org.oxycblt.auxio.music.Artist import org.oxycblt.auxio.music.BaseModel import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.MusicStore import org.oxycblt.auxio.recycler.SortMode /** @@ -41,8 +40,6 @@ class DetailViewModel : ViewModel() { private val mNavToItem = MutableLiveData() val navToItem: LiveData get() = mNavToItem - private val musicStore = MusicStore.getInstance() - /** * Update the current navigation status * @param value Whether the current [DetailFragment] is navigating or not. diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLinker.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLinker.kt index 23b7e72fd..9bf182cb4 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLinker.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLinker.kt @@ -77,8 +77,9 @@ class MusicLinker( * no, why would ANYONE do that? Instead, I have to manually iterate through each genre, get * A LIST OF SONGS FROM THEM, and then waste CPU cycles REPEATEDLY ITERATING through the * songs list to LINK EACH SONG WITH THEIR GENRE. Why is it this way? Nobody knows! Now this - * quirk is immortalized and has to be replicated in all future iterations of the API! - * Yay! I hate this platform so much. + * quirk is immortalized and has to be replicated in all future iterations of this API! Yay! + * + * I hate this platform so much. */ genres.forEach { genre -> val songCursor = resolver.query( diff --git a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt index b8febb9eb..1f9e88a1e 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/processing/MusicLoader.kt @@ -10,18 +10,16 @@ import androidx.core.database.getStringOrNull import org.oxycblt.auxio.R import org.oxycblt.auxio.logD import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist import org.oxycblt.auxio.music.Genre import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.toAlbumArtURI /** * Class that loads/constructs [Genre]s, [Album]s, and [Song] objects from the filesystem - * Artists are constructed in [MusicSorter], as they are only really containers for [Album]s + * Artists are constructed in [MusicLinker], as they are only really containers for [Album]s */ class MusicLoader(private val app: Application) { var genres = mutableListOf() - var artists = mutableListOf() var albums = mutableListOf() var songs = mutableListOf() diff --git a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt index c07a6360e..f399e54b4 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackFragment.kt @@ -78,11 +78,7 @@ class CompactPlaybackFragment : Fragment() { playbackModel.disableAnimation() playbackModel.isPlaying.observe(viewLifecycleOwner) { - if (it) { - binding.playbackPlayPause.showPause(playbackModel.canAnimate) - } else { - binding.playbackPlayPause.showPlay(playbackModel.canAnimate) - } + binding.playbackPlayPause.setPlaying(it, playbackModel.canAnimate) playbackModel.enableAnimation() } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlayPauseButton.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlayPauseButton.kt index a5a772c05..88ac9200f 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlayPauseButton.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlayPauseButton.kt @@ -27,21 +27,21 @@ class PlayPauseButton @JvmOverloads constructor( } } - fun showPlay(animated: Boolean) { - if (animated) { - setImageDrawable(iconPauseToPlay) - iconPauseToPlay.start() + fun setPlaying(isPlaying: Boolean, animate: Boolean) { + if (isPlaying) { + if (animate) { + setImageDrawable(iconPlayToPause) + iconPlayToPause.start() + } else { + setImageResource(R.drawable.ic_pause_large) + } } else { - setImageResource(R.drawable.ic_play_large) - } - } - - fun showPause(animated: Boolean) { - if (animated) { - setImageDrawable(iconPlayToPause) - iconPlayToPause.start() - } else { - setImageResource(R.drawable.ic_pause_large) + if (animate) { + setImageDrawable(iconPauseToPlay) + iconPauseToPlay.start() + } else { + setImageResource(R.drawable.ic_play_large) + } } } diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index beaff272f..1f65f34f4 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -7,7 +7,6 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.SeekBar -import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController @@ -186,12 +185,9 @@ class PlaybackFragment : Fragment(), SeekBar.OnSeekBarChangeListener { playbackModel.disableAnimation() playbackModel.isPlaying.observe(viewLifecycleOwner) { - if (it) { - binding.playbackPlayPause.showPause(playbackModel.canAnimate) - binding.playbackPlayPause.backgroundTintList = accentColor - } else { - binding.playbackPlayPause.showPlay(playbackModel.canAnimate) - binding.playbackPlayPause.backgroundTintList = controlColor + binding.playbackPlayPause.apply { + backgroundTintList = if (it) accentColor else controlColor + setPlaying(it, playbackModel.canAnimate) } playbackModel.enableAnimation() diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt index 489e6b2aa..360ec463b 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt @@ -514,10 +514,6 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca stopForegroundAndNotification() } - Intent.ACTION_VIEW -> { - logD("wat this works") - } - // --- HEADSET CASES --- BluetoothDevice.ACTION_ACL_CONNECTED -> resumeFromPlug() diff --git a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt index 44206de7b..96bdca81d 100644 --- a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt +++ b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt @@ -18,9 +18,7 @@ import android.widget.TextView import android.widget.Toast import androidx.annotation.ColorInt import androidx.annotation.ColorRes -import androidx.annotation.DrawableRes import androidx.annotation.PluralsRes -import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView @@ -107,7 +105,7 @@ fun Int.toStateList(context: Context) = ColorStateList.valueOf(toColor(context)) /** * Resolve a drawable resource into a [Drawable] */ -fun Int.toDrawable(context: Context) = ContextCompat.getDrawable(context, this) +fun Int.toDrawable(context: Context) = ContextCompat.getDrawable(context, this) /** * Resolve a drawable resource into an [AnimatedVectorDrawable] diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml index 629d64a83..72c12b307 100644 --- a/app/src/main/res/layout/fragment_loading.xml +++ b/app/src/main/res/layout/fragment_loading.xml @@ -1,7 +1,5 @@ - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 01a3b4662..8d172c42b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,6 @@ Retry Grant - View Error Library Genres