mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Use ActionView for main search view
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.moez.QKSMS.common.widget
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.View
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import android.widget.LinearLayout
|
||||
import androidx.appcompat.view.CollapsibleActionView
|
||||
import androidx.appcompat.widget.Toolbar
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.util.extensions.dismissKeyboard
|
||||
import io.reactivex.Observable
|
||||
import kotlinx.android.synthetic.main.search_view.view.*
|
||||
|
||||
|
||||
class SearchView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs), CollapsibleActionView {
|
||||
|
||||
val queryChanged: Observable<CharSequence>
|
||||
|
||||
init {
|
||||
View.inflate(context, R.layout.search_view, this)
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
layoutParams = Toolbar.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, Toolbar.LayoutParams.MATCH_PARENT)
|
||||
|
||||
queryChanged = query.textChanges()
|
||||
}
|
||||
|
||||
override fun onActionViewExpanded() {
|
||||
|
||||
// Focus on the query field and display the keyboard
|
||||
val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
|
||||
query.requestFocus()
|
||||
imm?.showSoftInput(query, 0)
|
||||
}
|
||||
|
||||
override fun onActionViewCollapsed() {
|
||||
// Reset the query
|
||||
query.setText("")
|
||||
|
||||
// Dismiss the keyboard
|
||||
(context as? Activity)?.dismissKeyboard()
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,7 +25,6 @@ import android.os.Bundle
|
||||
import android.view.Gravity
|
||||
import android.view.Menu
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import androidx.appcompat.app.ActionBarDrawerToggle
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.view.isVisible
|
||||
@@ -35,7 +34,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.widget.textChanges
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.Navigator
|
||||
import com.moez.QKSMS.common.androidxcompat.drawerOpen
|
||||
@@ -48,6 +46,7 @@ import com.moez.QKSMS.common.util.extensions.scrapViews
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.widget.SearchView
|
||||
import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
|
||||
import com.moez.QKSMS.feature.conversations.ConversationsAdapter
|
||||
import com.moez.QKSMS.repository.SyncRepository
|
||||
@@ -70,7 +69,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
override val activityResumedIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
|
||||
override val queryChangedIntent: Subject<CharSequence> = PublishSubject.create()
|
||||
override val composeIntent by lazy { compose.clicks() }
|
||||
override val drawerOpenIntent: Observable<Boolean> by lazy {
|
||||
drawerLayout
|
||||
@@ -184,9 +183,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
else -> 0
|
||||
}
|
||||
|
||||
toolbarSearch.setVisible(state.page is Inbox && state.page.selected == 0 || state.page is Searching)
|
||||
toolbarTitle.setVisible(toolbarSearch.visibility != View.VISIBLE)
|
||||
|
||||
toolbar.menu.findItem(R.id.search)?.isVisible = state.page is Inbox && state.page.selected == 0 || state.page is Searching
|
||||
toolbar.menu.findItem(R.id.archive)?.isVisible = state.page is Inbox && selectedConversations != 0
|
||||
toolbar.menu.findItem(R.id.unarchive)?.isVisible = state.page is Archived && selectedConversations != 0
|
||||
toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0
|
||||
@@ -207,7 +204,10 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
when (state.page) {
|
||||
is Inbox -> {
|
||||
showBackButton(state.page.showClearButton)
|
||||
title = getString(R.string.main_title_selected, state.page.selected)
|
||||
title = when (state.page.selected != 0) {
|
||||
true -> getString(R.string.main_title_selected, state.page.selected)
|
||||
false -> getString(R.string.main_title)
|
||||
}
|
||||
if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter
|
||||
conversationsAdapter.updateData(state.page.data)
|
||||
itemTouchHelper.attachToRecyclerView(recyclerView)
|
||||
@@ -280,8 +280,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
}
|
||||
|
||||
override fun clearSearch() {
|
||||
dismissKeyboard()
|
||||
toolbarSearch.text = null
|
||||
toolbar.menu.findItem(R.id.search)?.collapseActionView()
|
||||
}
|
||||
|
||||
override fun clearSelection() {
|
||||
@@ -304,6 +303,13 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||
menuInflater.inflate(R.menu.main, menu)
|
||||
|
||||
// Query changes
|
||||
menu?.findItem(R.id.search)
|
||||
?.let { search -> search.actionView as? SearchView }
|
||||
?.queryChanged
|
||||
?.subscribe(queryChangedIntent)
|
||||
|
||||
return super.onCreateOptionsMenu(menu)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user