From a55986343f6eb221d86efd9a4d7adda6fbe79ab0 Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine.popineau@appscho.com>
Date: Sat, 23 Nov 2019 14:39:19 +0100
Subject: [PATCH] Format code and fixed favoriting issue on favorite tab.

---
 .../github/apognu/otter/fragments/AlbumsFragment.kt   |  2 --
 .../apognu/otter/fragments/FavoritesFragment.kt       | 11 +++++------
 .../apognu/otter/fragments/FunkwhaleFragment.kt       |  3 ++-
 .../apognu/otter/repositories/TracksRepository.kt     |  5 ++++-
 .../java/com/github/apognu/otter/utils/AppContext.kt  |  1 -
 .../java/com/github/apognu/otter/utils/EventBus.kt    |  3 ---
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt
index c7b1182..7c661fb 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/AlbumsFragment.kt
@@ -18,12 +18,10 @@ import com.github.apognu.otter.repositories.AlbumsRepository
 import com.github.apognu.otter.utils.*
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.fragment_albums.*
-import kotlinx.android.synthetic.main.partial_now_playing.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlin.math.min
 
 class AlbumsFragment : FunkwhaleFragment<Album, AlbumsAdapter>() {
   override val viewRes = R.layout.fragment_albums
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt
index bb3b196..4d6eb46 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/FavoritesFragment.kt
@@ -16,8 +16,6 @@ class FavoritesFragment : FunkwhaleFragment<Track, FavoritesAdapter>() {
   override val viewRes = R.layout.fragment_favorites
   override val recycler: RecyclerView get() = favorites
 
-  lateinit var favoritesRepository: FavoritesRepository
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
@@ -61,11 +59,12 @@ class FavoritesFragment : FunkwhaleFragment<Track, FavoritesAdapter>() {
 
   inner class FavoriteListener : FavoritesAdapter.OnFavoriteListener {
     override fun onToggleFavorite(id: Int, state: Boolean) {
-      when (state) {
-        true -> favoritesRepository.addFavorite(id)
-        false -> favoritesRepository.deleteFavorite(id)
+      (repository as? FavoritesRepository)?.let { repository ->
+        when (state) {
+          true -> repository.addFavorite(id)
+          false -> repository.deleteFavorite(id)
+        }
       }
     }
-
   }
 }
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
index 3a6c0a8..95040a1 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/FunkwhaleFragment.kt
@@ -102,7 +102,8 @@ abstract class FunkwhaleFragment<D : Any, A : FunkwhaleAdapter<D, *>> : Fragment
                     Gson().toJson(repository.cache(adapter.data)).toByteArray()
                   )
                 }
-              } catch (e: ConcurrentModificationException) {}
+              } catch (e: ConcurrentModificationException) {
+              }
             }
           }
         }
diff --git a/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt
index 53a4be2..bfecace 100644
--- a/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt
+++ b/app/src/main/java/com/github/apognu/otter/repositories/TracksRepository.kt
@@ -1,7 +1,10 @@
 package com.github.apognu.otter.repositories
 
 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.google.gson.reflect.TypeToken
 import kotlinx.coroutines.flow.map
diff --git a/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt b/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt
index 30bb892..e180dac 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt
+++ b/app/src/main/java/com/github/apognu/otter/utils/AppContext.kt
@@ -7,7 +7,6 @@ import android.app.NotificationManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ActivityInfo
 import android.os.Build
 import com.github.apognu.otter.R
 import com.github.kittinunf.fuel.core.FuelManager
diff --git a/app/src/main/java/com/github/apognu/otter/utils/EventBus.kt b/app/src/main/java/com/github/apognu/otter/utils/EventBus.kt
index 61954a5..65198bc 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/EventBus.kt
+++ b/app/src/main/java/com/github/apognu/otter/utils/EventBus.kt
@@ -4,9 +4,6 @@ import com.github.apognu.otter.Otter
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.GlobalScope
 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.conflate
 import kotlinx.coroutines.launch