removing some redundant interfaces
This commit is contained in:
tibbi
parent
a22eba4323
commit
aa8c36510d
7 changed files with 134 additions and 244 deletions
|
|
@ -13,7 +13,10 @@ import androidx.core.view.MenuItemCompat
|
|||
import androidx.viewpager.widget.ViewPager
|
||||
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
|
||||
import com.simplemobiletools.commons.extensions.*
|
||||
import com.simplemobiletools.commons.helpers.*
|
||||
import com.simplemobiletools.commons.helpers.LICENSE_EVENT_BUS
|
||||
import com.simplemobiletools.commons.helpers.LICENSE_PICASSO
|
||||
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
|
||||
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
|
||||
import com.simplemobiletools.commons.models.FAQItem
|
||||
import com.simplemobiletools.commons.models.RadioItem
|
||||
import com.simplemobiletools.commons.models.Release
|
||||
|
|
@ -26,7 +29,6 @@ import com.simplemobiletools.musicplayer.extensions.config
|
|||
import com.simplemobiletools.musicplayer.extensions.queueDAO
|
||||
import com.simplemobiletools.musicplayer.extensions.sendIntent
|
||||
import com.simplemobiletools.musicplayer.helpers.*
|
||||
import com.simplemobiletools.musicplayer.interfaces.MainActivityInterface
|
||||
import com.simplemobiletools.musicplayer.models.Events
|
||||
import com.simplemobiletools.musicplayer.services.MusicService
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
|
|
@ -38,7 +40,7 @@ import org.greenrobot.eventbus.EventBus
|
|||
import org.greenrobot.eventbus.Subscribe
|
||||
import org.greenrobot.eventbus.ThreadMode
|
||||
|
||||
class MainActivity : SimpleActivity(), MainActivityInterface {
|
||||
class MainActivity : SimpleActivity() {
|
||||
private var isThirdPartyIntent = false
|
||||
private var isSearchOpen = false
|
||||
|
||||
|
|
@ -307,10 +309,6 @@ class MainActivity : SimpleActivity(), MainActivityInterface {
|
|||
playlists_fragment_holder?.setupFragment(this)
|
||||
}
|
||||
|
||||
override fun getIsSearchOpen() = isSearchOpen
|
||||
|
||||
override fun getIsThirdPartyIntent() = isThirdPartyIntent
|
||||
|
||||
private fun launchSettings() {
|
||||
startActivity(Intent(applicationContext, SettingsActivity::class.java))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,13 +25,12 @@ import com.simplemobiletools.musicplayer.extensions.config
|
|||
import com.simplemobiletools.musicplayer.extensions.sendIntent
|
||||
import com.simplemobiletools.musicplayer.extensions.tracksDAO
|
||||
import com.simplemobiletools.musicplayer.helpers.*
|
||||
import com.simplemobiletools.musicplayer.interfaces.SongListListener
|
||||
import com.simplemobiletools.musicplayer.models.Track
|
||||
import com.simplemobiletools.musicplayer.services.MusicService
|
||||
import kotlinx.android.synthetic.main.item_navigation.view.*
|
||||
import kotlinx.android.synthetic.main.item_old_song.view.*
|
||||
|
||||
class OldSongAdapter(activity: SimpleActivity, var songs: ArrayList<Track>, val listener: SongListListener, val transparentView: View,
|
||||
class OldSongAdapter(activity: SimpleActivity, var songs: ArrayList<Track>, val transparentView: View,
|
||||
recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit) :
|
||||
MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
|
||||
|
||||
|
|
@ -244,9 +243,6 @@ class OldSongAdapter(activity: SimpleActivity, var songs: ArrayList<Track>, val
|
|||
}
|
||||
|
||||
songs.removeAll(removeSongs)
|
||||
if (songs.isEmpty()) {
|
||||
listener.refreshItems()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -295,10 +291,6 @@ class OldSongAdapter(activity: SimpleActivity, var songs: ArrayList<Track>, val
|
|||
removeSelectedItems(positions)
|
||||
ensureBackgroundThread {
|
||||
activity.tracksDAO.removeSongsFromPlaylists(removeSongs)
|
||||
|
||||
if (songs.isEmpty()) {
|
||||
listener.refreshItems()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -353,11 +345,9 @@ class OldSongAdapter(activity: SimpleActivity, var songs: ArrayList<Track>, val
|
|||
|
||||
private fun initNavigationView() {
|
||||
navigationView?.apply {
|
||||
shuffle_btn.setOnClickListener { listener.toggleShuffle() }
|
||||
previous_btn.setOnClickListener { activity.sendIntent(PREVIOUS) }
|
||||
play_pause_btn.setOnClickListener { activity.sendIntent(PLAYPAUSE) }
|
||||
next_btn.setOnClickListener { activity.sendIntent(NEXT) }
|
||||
repeat_btn.setOnClickListener { listener.toggleSongRepetition() }
|
||||
song_progress_current.setOnClickListener { activity.sendIntent(SKIP_BACKWARD) }
|
||||
song_progress_max.setOnClickListener { activity.sendIntent(SKIP_FORWARD) }
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,126 @@
|
|||
package com.simplemobiletools.musicplayer.fragments
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.Paint
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.util.AttributeSet
|
||||
import android.view.ViewGroup
|
||||
import android.widget.SeekBar
|
||||
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
|
||||
import com.simplemobiletools.commons.extensions.beGone
|
||||
import com.simplemobiletools.commons.extensions.beVisibleIf
|
||||
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
|
||||
import com.simplemobiletools.commons.extensions.getFormattedDuration
|
||||
import com.simplemobiletools.musicplayer.R
|
||||
import com.simplemobiletools.musicplayer.activities.SimpleActivity
|
||||
import com.simplemobiletools.musicplayer.adapters.OldSongAdapter
|
||||
import com.simplemobiletools.musicplayer.extensions.config
|
||||
import com.simplemobiletools.musicplayer.extensions.getActionBarHeight
|
||||
import com.simplemobiletools.musicplayer.helpers.LIST_HEADERS_COUNT
|
||||
import com.simplemobiletools.musicplayer.helpers.PROGRESS
|
||||
import com.simplemobiletools.musicplayer.helpers.SET_PROGRESS
|
||||
import com.simplemobiletools.musicplayer.models.Track
|
||||
import com.simplemobiletools.musicplayer.services.MusicService
|
||||
import kotlinx.android.synthetic.main.fragment_songs.view.*
|
||||
import kotlinx.android.synthetic.main.item_navigation.view.*
|
||||
import java.util.*
|
||||
|
||||
class OldSongsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
|
||||
private var songs = ArrayList<Track>()
|
||||
private var artView: ViewGroup? = null
|
||||
private var actionbarSize = 0
|
||||
private val config = context.config
|
||||
|
||||
private var storedTextColor = 0
|
||||
|
||||
private lateinit var activity: SimpleActivity
|
||||
|
||||
fun onResume() {
|
||||
getSongsAdapter()?.updateColors()
|
||||
songs_playlist_empty_placeholder_2.setTextColor(activity.getAdjustedPrimaryColor())
|
||||
songs_playlist_empty_placeholder_2.paintFlags = songs_playlist_empty_placeholder_2.paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
||||
|
||||
songs_fastscroller.updateBubbleColors()
|
||||
|
||||
arrayListOf(art_holder, song_list_background, top_navigation).forEach {
|
||||
it.background = ColorDrawable(config.backgroundColor)
|
||||
}
|
||||
}
|
||||
|
||||
fun onPause() {
|
||||
storeStateVariables()
|
||||
}
|
||||
|
||||
override fun finishActMode() {
|
||||
(songs_list.adapter as? MyRecyclerViewAdapter)?.finishActMode()
|
||||
}
|
||||
|
||||
private fun storeStateVariables() {
|
||||
config.apply {
|
||||
storedTextColor = textColor
|
||||
}
|
||||
}
|
||||
|
||||
override fun setupFragment(simpleActivity: SimpleActivity) {
|
||||
storeStateVariables()
|
||||
activity = simpleActivity
|
||||
actionbarSize = activity.getActionBarHeight()
|
||||
|
||||
artView = activity.layoutInflater.inflate(R.layout.item_transparent, null) as ViewGroup
|
||||
songs_fastscroller.measureItemIndex = LIST_HEADERS_COUNT
|
||||
|
||||
initSeekbarChangeListener()
|
||||
onResume()
|
||||
}
|
||||
|
||||
fun searchOpened() {
|
||||
songs_playlist_placeholder.text = activity.getString(R.string.no_items_found)
|
||||
songs_playlist_empty_placeholder_2.beGone()
|
||||
art_holder.beGone()
|
||||
getSongsAdapter()?.searchOpened()
|
||||
top_navigation.beGone()
|
||||
}
|
||||
|
||||
fun searchClosed() {
|
||||
songs_playlist_placeholder.text = activity.getString(R.string.playlist_empty)
|
||||
songs_playlist_empty_placeholder_2.beVisibleIf(songs.isEmpty())
|
||||
}
|
||||
|
||||
fun searchQueryChanged(text: String) {
|
||||
val filtered = songs.filter { it.artist.contains(text, true) || it.title.contains(text, true) } as ArrayList
|
||||
filtered.sortBy { !(it.artist.startsWith(text, true) || it.title.startsWith(text, true)) }
|
||||
songs_playlist_placeholder.beVisibleIf(filtered.isEmpty())
|
||||
getSongsAdapter()?.updateSongs(filtered, text)
|
||||
}
|
||||
|
||||
private fun getCurrentSongIndex(): Int {
|
||||
val newSong = MusicService.mCurrTrack
|
||||
val cnt = songs.size - 1
|
||||
return (0..cnt).firstOrNull { songs[it] == newSong } ?: -1
|
||||
}
|
||||
|
||||
fun getSongsAdapter() = songs_list.adapter as? OldSongAdapter
|
||||
|
||||
private fun initSeekbarChangeListener() {
|
||||
song_progressbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
|
||||
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
|
||||
val duration = song_progressbar.max.getFormattedDuration()
|
||||
val formattedProgress = progress.getFormattedDuration()
|
||||
song_progress_current.text = formattedProgress
|
||||
song_progress_max.text = duration
|
||||
}
|
||||
|
||||
override fun onStartTrackingTouch(seekBar: SeekBar) {
|
||||
}
|
||||
|
||||
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
||||
Intent(activity, MusicService::class.java).apply {
|
||||
putExtra(PROGRESS, seekBar.progress)
|
||||
action = SET_PROGRESS
|
||||
activity.startService(this)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1,208 +0,0 @@
|
|||
package com.simplemobiletools.musicplayer.fragments
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.Paint
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.util.AttributeSet
|
||||
import android.view.ViewGroup
|
||||
import android.widget.SeekBar
|
||||
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
|
||||
import com.simplemobiletools.commons.extensions.*
|
||||
import com.simplemobiletools.commons.interfaces.RecyclerScrollCallback
|
||||
import com.simplemobiletools.musicplayer.R
|
||||
import com.simplemobiletools.musicplayer.activities.SimpleActivity
|
||||
import com.simplemobiletools.musicplayer.adapters.OldSongAdapter
|
||||
import com.simplemobiletools.musicplayer.extensions.config
|
||||
import com.simplemobiletools.musicplayer.extensions.getActionBarHeight
|
||||
import com.simplemobiletools.musicplayer.extensions.sendIntent
|
||||
import com.simplemobiletools.musicplayer.helpers.*
|
||||
import com.simplemobiletools.musicplayer.interfaces.MainActivityInterface
|
||||
import com.simplemobiletools.musicplayer.interfaces.SongListListener
|
||||
import com.simplemobiletools.musicplayer.models.Track
|
||||
import com.simplemobiletools.musicplayer.services.MusicService
|
||||
import kotlinx.android.synthetic.main.fragment_songs.view.*
|
||||
import kotlinx.android.synthetic.main.item_navigation.view.*
|
||||
import java.util.*
|
||||
|
||||
class SongsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), SongListListener {
|
||||
private var songs = ArrayList<Track>()
|
||||
private var artView: ViewGroup? = null
|
||||
private var actionbarSize = 0
|
||||
private var topArtHeight = 0
|
||||
private val config = context.config
|
||||
|
||||
private var storedTextColor = 0
|
||||
|
||||
private lateinit var activity: SimpleActivity
|
||||
private lateinit var activityInterface: MainActivityInterface
|
||||
|
||||
fun onResume() {
|
||||
setupIconColors()
|
||||
setupIconDescriptions()
|
||||
markCurrentSong()
|
||||
|
||||
getSongsAdapter()?.updateColors()
|
||||
songs_playlist_empty_placeholder_2.setTextColor(activity.getAdjustedPrimaryColor())
|
||||
songs_playlist_empty_placeholder_2.paintFlags = songs_playlist_empty_placeholder_2.paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
||||
|
||||
songs_fastscroller.updateBubbleColors()
|
||||
|
||||
arrayListOf(art_holder, song_list_background, top_navigation).forEach {
|
||||
it.background = ColorDrawable(config.backgroundColor)
|
||||
}
|
||||
}
|
||||
|
||||
fun onPause() {
|
||||
storeStateVariables()
|
||||
}
|
||||
|
||||
override fun finishActMode() {
|
||||
(songs_list.adapter as? MyRecyclerViewAdapter)?.finishActMode()
|
||||
}
|
||||
|
||||
private fun storeStateVariables() {
|
||||
config.apply {
|
||||
storedTextColor = textColor
|
||||
}
|
||||
}
|
||||
|
||||
override fun setupFragment(simpleActivity: SimpleActivity) {
|
||||
storeStateVariables()
|
||||
activity = simpleActivity
|
||||
activityInterface = simpleActivity as MainActivityInterface
|
||||
actionbarSize = activity.getActionBarHeight()
|
||||
|
||||
artView = activity.layoutInflater.inflate(R.layout.item_transparent, null) as ViewGroup
|
||||
songs_fastscroller.measureItemIndex = LIST_HEADERS_COUNT
|
||||
|
||||
shuffle_btn.setOnClickListener { toggleShuffle() }
|
||||
previous_btn.setOnClickListener { activity.sendIntent(PREVIOUS) }
|
||||
play_pause_btn.setOnClickListener { activity.sendIntent(PLAYPAUSE) }
|
||||
next_btn.setOnClickListener { activity.sendIntent(NEXT) }
|
||||
repeat_btn.setOnClickListener { toggleSongRepetition() }
|
||||
song_progress_current.setOnClickListener { activity.sendIntent(SKIP_BACKWARD) }
|
||||
song_progress_max.setOnClickListener { activity.sendIntent(SKIP_FORWARD) }
|
||||
|
||||
initSeekbarChangeListener()
|
||||
onResume()
|
||||
}
|
||||
|
||||
fun searchOpened() {
|
||||
songs_playlist_placeholder.text = activity.getString(R.string.no_items_found)
|
||||
songs_playlist_empty_placeholder_2.beGone()
|
||||
art_holder.beGone()
|
||||
getSongsAdapter()?.searchOpened()
|
||||
top_navigation.beGone()
|
||||
}
|
||||
|
||||
fun searchClosed() {
|
||||
songs_playlist_placeholder.text = activity.getString(R.string.playlist_empty)
|
||||
songs_playlist_empty_placeholder_2.beVisibleIf(songs.isEmpty())
|
||||
art_holder.beVisibleIf(songs.isNotEmpty())
|
||||
if (activityInterface.getIsSearchOpen()) {
|
||||
searchQueryChanged("")
|
||||
getSongsAdapter()?.searchClosed()
|
||||
markCurrentSong()
|
||||
(songs_list.layoutManager as androidx.recyclerview.widget.LinearLayoutManager).scrollToPositionWithOffset(0, 0)
|
||||
songs_fastscroller?.setScrollToY(0)
|
||||
}
|
||||
}
|
||||
|
||||
fun searchQueryChanged(text: String) {
|
||||
val filtered = songs.filter { it.artist.contains(text, true) || it.title.contains(text, true) } as ArrayList
|
||||
filtered.sortBy { !(it.artist.startsWith(text, true) || it.title.startsWith(text, true)) }
|
||||
songs_playlist_placeholder.beVisibleIf(filtered.isEmpty())
|
||||
getSongsAdapter()?.updateSongs(filtered, text)
|
||||
}
|
||||
|
||||
override fun toggleShuffle() {
|
||||
val isShuffleEnabled = !config.isShuffleEnabled
|
||||
config.isShuffleEnabled = isShuffleEnabled
|
||||
shuffle_btn.applyColorFilter(if (isShuffleEnabled) activity.getAdjustedPrimaryColor() else config.textColor)
|
||||
shuffle_btn.alpha = if (isShuffleEnabled) 1f else LOWER_ALPHA
|
||||
shuffle_btn.contentDescription = activity.getString(if (isShuffleEnabled) R.string.disable_shuffle else R.string.enable_shuffle)
|
||||
getSongsAdapter()?.updateShuffle(isShuffleEnabled)
|
||||
activity.toast(if (isShuffleEnabled) R.string.shuffle_enabled else R.string.shuffle_disabled)
|
||||
}
|
||||
|
||||
override fun toggleSongRepetition() {
|
||||
val repeatSong = !config.repeatTrack
|
||||
config.repeatTrack = repeatSong
|
||||
repeat_btn.applyColorFilter(if (repeatSong) activity.getAdjustedPrimaryColor() else config.textColor)
|
||||
repeat_btn.alpha = if (repeatSong) 1f else LOWER_ALPHA
|
||||
repeat_btn.contentDescription = activity.getString(if (repeatSong) R.string.disable_song_repetition else R.string.enable_song_repetition)
|
||||
getSongsAdapter()?.updateRepeatSong(repeatSong)
|
||||
activity.toast(if (repeatSong) R.string.song_repetition_enabled else R.string.song_repetition_disabled)
|
||||
}
|
||||
|
||||
override fun refreshItems() {
|
||||
if (!activityInterface.getIsSearchOpen()) {
|
||||
activity.sendIntent(REFRESH_LIST)
|
||||
}
|
||||
}
|
||||
|
||||
private fun setupIconColors() {
|
||||
val textColor = config.textColor
|
||||
previous_btn.applyColorFilter(textColor)
|
||||
play_pause_btn.applyColorFilter(textColor)
|
||||
next_btn.applyColorFilter(textColor)
|
||||
|
||||
shuffle_btn.applyColorFilter(if (config.isShuffleEnabled) activity.getAdjustedPrimaryColor() else config.textColor)
|
||||
shuffle_btn.alpha = if (config.isShuffleEnabled) 1f else LOWER_ALPHA
|
||||
|
||||
repeat_btn.applyColorFilter(if (config.repeatTrack) activity.getAdjustedPrimaryColor() else config.textColor)
|
||||
repeat_btn.alpha = if (config.repeatTrack) 1f else LOWER_ALPHA
|
||||
|
||||
getSongsAdapter()?.updateTextColor(textColor)
|
||||
songs_fastscroller.updatePrimaryColor()
|
||||
}
|
||||
|
||||
private fun setupIconDescriptions() {
|
||||
shuffle_btn.contentDescription = activity.getString(if (config.isShuffleEnabled) R.string.disable_shuffle else R.string.enable_shuffle)
|
||||
repeat_btn.contentDescription = activity.getString(if (config.repeatTrack) R.string.disable_song_repetition else R.string.enable_song_repetition)
|
||||
}
|
||||
|
||||
private fun songPicked(pos: Int) {
|
||||
setupIconColors()
|
||||
setupIconDescriptions()
|
||||
Intent(activity, MusicService::class.java).apply {
|
||||
putExtra(TRACK_POS, pos)
|
||||
activity.startService(this)
|
||||
}
|
||||
}
|
||||
|
||||
private fun markCurrentSong() {
|
||||
getSongsAdapter()?.updateCurrentSongIndex(getCurrentSongIndex())
|
||||
}
|
||||
|
||||
private fun getCurrentSongIndex(): Int {
|
||||
val newSong = MusicService.mCurrTrack
|
||||
val cnt = songs.size - 1
|
||||
return (0..cnt).firstOrNull { songs[it] == newSong } ?: -1
|
||||
}
|
||||
|
||||
fun getSongsAdapter() = songs_list.adapter as? OldSongAdapter
|
||||
|
||||
private fun initSeekbarChangeListener() {
|
||||
song_progressbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
|
||||
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
|
||||
val duration = song_progressbar.max.getFormattedDuration()
|
||||
val formattedProgress = progress.getFormattedDuration()
|
||||
song_progress_current.text = formattedProgress
|
||||
song_progress_max.text = duration
|
||||
}
|
||||
|
||||
override fun onStartTrackingTouch(seekBar: SeekBar) {
|
||||
}
|
||||
|
||||
override fun onStopTrackingTouch(seekBar: SeekBar) {
|
||||
Intent(activity, MusicService::class.java).apply {
|
||||
putExtra(PROGRESS, seekBar.progress)
|
||||
action = SET_PROGRESS
|
||||
activity.startService(this)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
package com.simplemobiletools.musicplayer.interfaces
|
||||
|
||||
interface MainActivityInterface {
|
||||
fun getIsSearchOpen(): Boolean
|
||||
|
||||
fun getIsThirdPartyIntent(): Boolean
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package com.simplemobiletools.musicplayer.interfaces
|
||||
|
||||
interface SongListListener {
|
||||
fun refreshItems()
|
||||
|
||||
fun toggleShuffle()
|
||||
|
||||
fun toggleSongRepetition()
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.simplemobiletools.musicplayer.fragments.SongsFragment xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<com.simplemobiletools.musicplayer.fragments.OldSongsFragment xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/songs_fragment_holder"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -83,4 +83,4 @@
|
|||
android:text="@string/add_folder_to_playlist"
|
||||
android:textSize="@dimen/bigger_text_size" />
|
||||
|
||||
</com.simplemobiletools.musicplayer.fragments.SongsFragment>
|
||||
</com.simplemobiletools.musicplayer.fragments.OldSongsFragment>
|
||||
|
|
|
|||
Loading…
Reference in a new issue