diff options
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 13 | ||||
| -rw-r--r-- | src/main/res/layout/actionview_search.xml | 5 | ||||
| -rw-r--r-- | src/main/res/layout/activity_search.xml | 50 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/styles.xml | 2 |
5 files changed, 68 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index 2f72964fc..70995e8d2 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -102,6 +102,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne @Override public boolean onMenuItemActionExpand(MenuItem item) { mSearchEditText.post(() -> { + updateSearchViewHint(); mSearchEditText.requestFocus(); if (oneShotKeyboardSuppress.compareAndSet(true, false)) { return; @@ -544,6 +545,17 @@ public class StartConversationActivity extends XmppActivity implements XmppConne super.invalidateOptionsMenu(); } + private void updateSearchViewHint() { + if (binding == null || mSearchEditText == null) { + return; + } + if (binding.startConversationViewPager.getCurrentItem() == 0) { + mSearchEditText.setHint(R.string.search_contacts); + } else { + mSearchEditText.setHint(R.string.search_groups); + } + } + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.start_conversation, menu); @@ -571,6 +583,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne mSearchEditText.append(initialSearchValue); filter(initialSearchValue); } + updateSearchViewHint(); return super.onCreateOptionsMenu(menu); } diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index 856dd03e0..0aff3b156 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -4,9 +4,7 @@ android:layout_height="wrap_content" android:addStatesFromChildren="true" android:focusable="true" - android:gravity="center" - android:paddingLeft="5dp" - android:paddingRight="5dp"> + android:gravity="center"> <EditText android:id="@+id/search_field" @@ -14,7 +12,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:focusable="true" - android:hint="@string/search_for_contacts_or_groups" android:imeOptions="actionSearch" android:inputType="textEmailAddress|textNoSuggestions" /> diff --git a/src/main/res/layout/activity_search.xml b/src/main/res/layout/activity_search.xml new file mode 100644 index 000000000..eaafdf291 --- /dev/null +++ b/src/main/res/layout/activity_search.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (c) 2018, Daniel Gultsch All rights reserved. + ~ + ~ Redistribution and use in source and binary forms, with or without modification, + ~ are permitted provided that the following conditions are met: + ~ + ~ 1. Redistributions of source code must retain the above copyright notice, this + ~ list of conditions and the following disclaimer. + ~ + ~ 2. Redistributions in binary form must reproduce the above copyright notice, + ~ this list of conditions and the following disclaimer in the documentation and/or + ~ other materials provided with the distribution. + ~ + ~ 3. Neither the name of the copyright holder nor the names of its contributors + ~ may be used to endorse or promote products derived from this software without + ~ specific prior written permission. + ~ + ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ~ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ~ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + ~ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + ~ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --> + +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + + <ListView + android:id="@+id/search_results" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_secondary" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 585e87a4b..876bf8f75 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -433,8 +433,9 @@ <string name="pref_quick_action">Quick Action</string> <string name="none">None</string> <string name="recently_used">Most recently used</string> + <string name="search_contacts">Search contacts</string> + <string name="search_groups">Search group chats</string> <string name="choose_quick_action">Choose quick action</string> - <string name="search_for_contacts_or_groups">Search for contacts or groups</string> <string name="send_private_message">Send private message</string> <string name="user_has_left_conference">%1$s has left the group chat!</string> <string name="username">Username</string> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e67e4db1e..3c6edba4f 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -34,6 +34,8 @@ <style name="Widget.Conversations.SearchView" parent="Widget.Conversations.EditText"> <item name="android:textColor">@color/white</item> <item name="android:textColorHint">@color/white70</item> + <item name="android:background">@android:color/transparent</item> + <item name="android:textSize">18sp</item> </style> <style name="Widget.Conversations.CheckBox" parent="Widget.AppCompat.CompoundButton.CheckBox"> |