From e4da4af3f3c7c8396b9beef46e1c5f68c3a3b5e9 Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine@popineau.eu>
Date: Sat, 11 Jul 2020 17:24:53 +0200
Subject: [PATCH] Prevent keyboard to pop over result pages.

---
 .../com/github/apognu/otter/activities/SearchActivity.kt   | 7 +++----
 .../com/github/apognu/otter/fragments/TracksFragment.kt    | 5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
index 03c51f7..e6a553f 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
+++ b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
@@ -12,7 +12,6 @@ import com.github.apognu.otter.fragments.ArtistsFragment
 import com.github.apognu.otter.repositories.*
 import com.github.apognu.otter.utils.Album
 import com.github.apognu.otter.utils.Artist
-import com.github.apognu.otter.utils.log
 import com.github.apognu.otter.utils.untilNetwork
 import kotlinx.android.synthetic.main.activity_search.*
 import java.net.URLEncoder
@@ -38,6 +37,8 @@ class SearchActivity : AppCompatActivity() {
       results.layoutManager = LinearLayoutManager(this)
       results.adapter = it
     }
+
+    search.requestFocus()
   }
 
   override fun onResume() {
@@ -48,8 +49,6 @@ class SearchActivity : AppCompatActivity() {
     tracksRepository = TracksSearchRepository(this@SearchActivity, "")
     favoritesRepository = FavoritesRepository(this@SearchActivity)
 
-    search.requestFocus()
-
     search.setOnQueryTextListener(object : androidx.appcompat.widget.SearchView.OnQueryTextListener {
       override fun onQueryTextSubmit(rawQuery: String?): Boolean {
         search.clearFocus()
@@ -79,7 +78,7 @@ class SearchActivity : AppCompatActivity() {
             refresh()
           }
 
-          albumsRepository.fetch(Repository.Origin.Network.origin).untilNetwork(lifecycleScope) { albums, _, _ ,_ ->
+          albumsRepository.fetch(Repository.Origin.Network.origin).untilNetwork(lifecycleScope) { albums, _, _, _ ->
             done++
 
             adapter.albums.addAll(albums)
diff --git a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt b/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
index 077f975..80ca563 100644
--- a/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
+++ b/app/src/main/java/com/github/apognu/otter/fragments/TracksFragment.kt
@@ -150,10 +150,7 @@ class TracksFragment : OtterFragment<Track, TracksAdapter>() {
     lifecycleScope.launch(Main) {
       CommandBus.get().collect { command ->
         when (command) {
-          is Command.RefreshTrack -> {
-            log("${command.track?.title} -> ${command.track?.favorite}")
-            refreshCurrentTrack(command.track)
-          }
+          is Command.RefreshTrack -> refreshCurrentTrack(command.track)
         }
       }
     }