Format code and fixed favoriting issue on favorite tab.
This commit is contained in:
parent
aaf8874699
commit
a55986343f
|
@ -18,12 +18,10 @@ import com.github.apognu.otter.repositories.AlbumsRepository
|
||||||
import com.github.apognu.otter.utils.*
|
import com.github.apognu.otter.utils.*
|
||||||
import com.squareup.picasso.Picasso
|
import com.squareup.picasso.Picasso
|
||||||
import kotlinx.android.synthetic.main.fragment_albums.*
|
import kotlinx.android.synthetic.main.fragment_albums.*
|
||||||
import kotlinx.android.synthetic.main.partial_now_playing.*
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import kotlin.math.min
|
|
||||||
|
|
||||||
class AlbumsFragment : FunkwhaleFragment<Album, AlbumsAdapter>() {
|
class AlbumsFragment : FunkwhaleFragment<Album, AlbumsAdapter>() {
|
||||||
override val viewRes = R.layout.fragment_albums
|
override val viewRes = R.layout.fragment_albums
|
||||||
|
|
|
@ -16,8 +16,6 @@ class FavoritesFragment : FunkwhaleFragment<Track, FavoritesAdapter>() {
|
||||||
override val viewRes = R.layout.fragment_favorites
|
override val viewRes = R.layout.fragment_favorites
|
||||||
override val recycler: RecyclerView get() = favorites
|
override val recycler: RecyclerView get() = favorites
|
||||||
|
|
||||||
lateinit var favoritesRepository: FavoritesRepository
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
@ -61,11 +59,12 @@ class FavoritesFragment : FunkwhaleFragment<Track, FavoritesAdapter>() {
|
||||||
|
|
||||||
inner class FavoriteListener : FavoritesAdapter.OnFavoriteListener {
|
inner class FavoriteListener : FavoritesAdapter.OnFavoriteListener {
|
||||||
override fun onToggleFavorite(id: Int, state: Boolean) {
|
override fun onToggleFavorite(id: Int, state: Boolean) {
|
||||||
|
(repository as? FavoritesRepository)?.let { repository ->
|
||||||
when (state) {
|
when (state) {
|
||||||
true -> favoritesRepository.addFavorite(id)
|
true -> repository.addFavorite(id)
|
||||||
false -> favoritesRepository.deleteFavorite(id)
|
false -> repository.deleteFavorite(id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,8 @@ abstract class FunkwhaleFragment<D : Any, A : FunkwhaleAdapter<D, *>> : Fragment
|
||||||
Gson().toJson(repository.cache(adapter.data)).toByteArray()
|
Gson().toJson(repository.cache(adapter.data)).toByteArray()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
} catch (e: ConcurrentModificationException) {}
|
} catch (e: ConcurrentModificationException) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
package com.github.apognu.otter.repositories
|
package com.github.apognu.otter.repositories
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.github.apognu.otter.utils.*
|
import com.github.apognu.otter.utils.FunkwhaleResponse
|
||||||
|
import com.github.apognu.otter.utils.Track
|
||||||
|
import com.github.apognu.otter.utils.TracksCache
|
||||||
|
import com.github.apognu.otter.utils.TracksResponse
|
||||||
import com.github.kittinunf.fuel.gson.gsonDeserializerOf
|
import com.github.kittinunf.fuel.gson.gsonDeserializerOf
|
||||||
import com.google.gson.reflect.TypeToken
|
import com.google.gson.reflect.TypeToken
|
||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
|
|
|
@ -7,7 +7,6 @@ import android.app.NotificationManager
|
||||||
import android.content.BroadcastReceiver
|
import android.content.BroadcastReceiver
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.pm.ActivityInfo
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import com.github.apognu.otter.R
|
import com.github.apognu.otter.R
|
||||||
import com.github.kittinunf.fuel.core.FuelManager
|
import com.github.kittinunf.fuel.core.FuelManager
|
||||||
|
|
|
@ -4,9 +4,6 @@ import com.github.apognu.otter.Otter
|
||||||
import kotlinx.coroutines.Dispatchers.Main
|
import kotlinx.coroutines.Dispatchers.Main
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
import kotlinx.coroutines.channels.Channel
|
import kotlinx.coroutines.channels.Channel
|
||||||
import kotlinx.coroutines.channels.ReceiveChannel
|
|
||||||
import kotlinx.coroutines.channels.filter
|
|
||||||
import kotlinx.coroutines.channels.map
|
|
||||||
import kotlinx.coroutines.flow.asFlow
|
import kotlinx.coroutines.flow.asFlow
|
||||||
import kotlinx.coroutines.flow.conflate
|
import kotlinx.coroutines.flow.conflate
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
Loading…
Reference in New Issue