Fixes #185

app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt

@@ -46,6 +46,8 @@ import de.kuschku.libquassel.quassel.syncables.BufferViewConfig
 import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
 import de.kuschku.libquassel.util.flag.hasFlag
 import de.kuschku.libquassel.util.flag.minus
+import de.kuschku.libquassel.util.helpers.mapMap
+import de.kuschku.libquassel.util.helpers.mapOrElse
 import de.kuschku.libquassel.util.helpers.nullIf
 import de.kuschku.libquassel.util.helpers.value
 import de.kuschku.quasseldroid.R
@@ -461,8 +463,14 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
     })
 
     chatListToolbar.inflateMenu(R.menu.context_bufferlist)
+    chatListToolbar.menu.findItem(R.id.action_search).isChecked = viewModel.bufferSearchTemporarilyVisible.value
     chatListToolbar.setOnMenuItemClickListener { item ->
       when (item.itemId) {
+        R.id.action_search      -> {
+          item.isChecked = !item.isChecked
+          viewModel.bufferSearchTemporarilyVisible.onNext(item.isChecked)
+          true
+        }
         R.id.action_show_hidden -> {
           item.isChecked = !item.isChecked
           viewModel.showHidden.onNext(item.isChecked)
@@ -482,8 +490,18 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
       hasSetBufferViewConfigId = false
     })
 
-    viewModel.bufferViewConfig.toLiveData().observe(this, Observer {
-      val visible = it.orNull()?.showSearch() ?: false
+    val bufferSearchPermanentlyVisible = viewModel.bufferViewConfig
+      .mapMap(BufferViewConfig::showSearch)
+      .mapOrElse(false)
+
+    combineLatest(viewModel.bufferSearchTemporarilyVisible, bufferSearchPermanentlyVisible)
+      .toLiveData().observe(this, Observer { (temporarily, permanently) ->
+        val visible = temporarily || permanently
+
+        val menuItem = chatListToolbar.menu.findItem(R.id.action_search)
+        menuItem.isVisible = !permanently
+        if (permanently) menuItem.isChecked = false
+
         bufferSearchContainer.visibleIf(visible)
         if (!visible) bufferSearch.setText("")
       })
@@ -515,6 +533,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
       longClickListener(bufferId)
     } else {
       context?.let {
+        viewModel.bufferSearchTemporarilyVisible.onNext(false)
         ChatActivity.launch(it, bufferId = bufferId)
       }
     }

app/src/main/res/menu/context_bufferlist.xml

@@ -18,6 +18,10 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:id="@+id/action_search"
+    android:checkable="true"
+    android:title="@string/label_search_buffer" />
   <item
     android:id="@+id/action_show_hidden"
     android:checkable="true"

app/src/main/res/values/strings.xml

@@ -102,7 +102,8 @@
   <string name="label_rename">Rename</string>
   <string name="label_save">Save</string>
   <string name="label_saving">Saving…</string>
-  <string name="label_search_buffer">Search…</string>
+  <string name="label_search">Search…</string>
+  <string name="label_search_buffer">Search Chats</string>
   <string name="label_select">Select</string>
   <string name="label_send">Send</string>
   <string name="label_set_default">Set Default</string>

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt

@@ -116,6 +116,8 @@ class QuasselViewModel : ViewModel() {
     }.mapSwitchMap(BufferViewConfig::liveUpdates)
   }
 
+  val bufferSearchTemporarilyVisible = BehaviorSubject.createDefault(false)
+
   val errors = sessionManager.switchMap {
     it.orNull()?.error ?: Observable.empty()
   }