From aa0c983b4c74117f567912f20b442d919c0192d0 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 8 Sep 2018 15:54:27 -0400 Subject: [PATCH] Revert "Use ActionView for main search view" This reverts commit 25580e88e83921ad64d3a3a55a2da9e7477c9f57. --- .../moez/QKSMS/common/widget/SearchView.kt | 64 ------------------- .../moez/QKSMS/feature/main/MainActivity.kt | 24 +++---- .../res/drawable/ic_search_black_24dp.xml | 27 -------- .../src/main/res/layout/main_activity.xml | 20 +++++- .../src/main/res/layout/search_view.xml | 38 ----------- presentation/src/main/res/menu/main.xml | 7 -- presentation/src/main/res/values/strings.xml | 2 - 7 files changed, 27 insertions(+), 155 deletions(-) delete mode 100644 presentation/src/main/java/com/moez/QKSMS/common/widget/SearchView.kt delete mode 100644 presentation/src/main/res/drawable/ic_search_black_24dp.xml delete mode 100644 presentation/src/main/res/layout/search_view.xml diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/SearchView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/SearchView.kt deleted file mode 100644 index c604604e..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/SearchView.kt +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * 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 . - */ -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 - - 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() - } - -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 12067f0b..cf9bc468 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -26,6 +26,7 @@ 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,6 +36,7 @@ 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 @@ -47,7 +49,6 @@ 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 +71,7 @@ class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory override val activityResumedIntent: Subject = PublishSubject.create() - override val queryChangedIntent: Subject = PublishSubject.create() + override val queryChangedIntent by lazy { toolbarSearch.textChanges() } override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent: Observable by lazy { drawerLayout @@ -188,7 +189,9 @@ class MainActivity : QkThemedActivity(), MainView { else -> 0 } - toolbar.menu.findItem(R.id.search)?.isVisible = state.page is Inbox && state.page.selected == 0 || state.page is Searching + 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.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 @@ -211,10 +214,7 @@ class MainActivity : QkThemedActivity(), MainView { when (state.page) { is Inbox -> { showBackButton(state.page.selected > 0) - title = when (state.page.selected != 0) { - true -> getString(R.string.main_title_selected, state.page.selected) - false -> getString(R.string.main_title) - } + title = getString(R.string.main_title_selected, state.page.selected) if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter conversationsAdapter.updateData(state.page.data) itemTouchHelper.attachToRecyclerView(recyclerView) @@ -301,7 +301,8 @@ class MainActivity : QkThemedActivity(), MainView { } override fun clearSearch() { - toolbar.menu.findItem(R.id.search)?.collapseActionView() + dismissKeyboard() + toolbarSearch.text = null } override fun clearSelection() { @@ -324,13 +325,6 @@ 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) } diff --git a/presentation/src/main/res/drawable/ic_search_black_24dp.xml b/presentation/src/main/res/drawable/ic_search_black_24dp.xml deleted file mode 100644 index 1808995e..00000000 --- a/presentation/src/main/res/drawable/ic_search_black_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml index f1a43d5d..c93f6e7f 100644 --- a/presentation/src/main/res/layout/main_activity.xml +++ b/presentation/src/main/res/layout/main_activity.xml @@ -32,7 +32,7 @@ + + + android:layout_marginEnd="16dp" + android:hint="@string/title_conversations" + android:textColorHint="?android:attr/textColorTertiary" + app:textSize="primary" + tools:textSize="16sp" /> @@ -85,6 +93,14 @@ app:layout_constraintEnd_toEndOf="parent" tools:backgroundTint="@color/tools_theme" /> + + - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml index 607b9161..762ad6e8 100644 --- a/presentation/src/main/res/menu/main.xml +++ b/presentation/src/main/res/menu/main.xml @@ -19,13 +19,6 @@ - - Details Save to gallery - Inbox Open navigation drawer %d selected - Search Clear Archive Unarchive