diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml
index 7a1b44dd..5671656b 100644
--- a/QKSMS/src/main/AndroidManifest.xml
+++ b/QKSMS/src/main/AndroidManifest.xml
@@ -99,6 +99,7 @@
+
{
+public class SearchFragment extends QKFragment implements RecyclerCursorAdapter.ItemClickListener {
private AsyncQueryHandler mQueryHandler;
// Track which TextView's show which Contact objects so that we can update
@@ -47,6 +43,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
private SearchAdapter mAdapter;
private Pattern mPattern;
+ public SearchFragment() {
+
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -68,27 +68,21 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
View view = inflater.inflate(R.layout.fragment_search, container, false);
mQuery = (QKEditText) view.findViewById(R.id.search_query);
- mQuery.setTextChangedListener(new QKEditText.TextChangedListener() {
- @Override
- public void onTextChanged(CharSequence s) {
- mSearchString = s.toString();
- query();
- }
+ mQuery.setTextChangedListener(s -> {
+ mSearchString = s.toString();
+ query();
});
- mQuery.setOnEditorActionListener(new QKTextView.OnEditorActionListener() {
- @Override
- public boolean onEditorAction(android.widget.TextView v, int actionId, KeyEvent event) {
- if (actionId == EditorInfo.IME_ACTION_SEARCH) {
- mSearchString = mQuery.getText().toString();
- query();
+ mQuery.setOnEditorActionListener((v, actionId, event) -> {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+ mSearchString = mQuery.getText().toString();
+ query();
- // Hide the keyboard when the user makes a query
- mQuery.clearFocus();
- KeyboardUtils.hide(mContext, mQuery);
- return true;
- }
- return false;
+ // Hide the keyboard when the user makes a query
+ mQuery.clearFocus();
+ KeyboardUtils.hide(mContext, mQuery);
+ return true;
}
+ return false;
});
mLayoutManager = new LinearLayoutManager(mContext);
@@ -100,6 +94,7 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
mRecyclerView.setLayoutManager(mLayoutManager);
mRecyclerView.setAdapter(mAdapter);
+ new Handler().postDelayed(() -> KeyboardUtils.showAndFocus(mContext, mQuery), 50);
return view;
}
@@ -114,12 +109,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
}
- Contact.UpdateListener mContactListener = new Contact.UpdateListener() {
- public void onUpdate(Contact updated) {
- QKTextView tv = mContactMap.get(updated);
- if (tv != null) {
- tv.setText(updated.getNameAndNumber());
- }
+ Contact.UpdateListener mContactListener = updated -> {
+ QKTextView tv = mContactMap.get(updated);
+ if (tv != null) {
+ tv.setText(updated.getNameAndNumber());
}
};
@@ -129,28 +122,10 @@ public class SearchFragment extends QKContentFragment implements RecyclerCursorA
Contact.removeListener(mContactListener);
}
- @Override
- public void onContentOpened() {
- // Show the keyboard and focus on the query text when the fragment is opened.
- KeyboardUtils.showAndFocus(mContext, mQuery);
- }
-
- @Override
- public void onMenuChanging(float percentOpen) {
-
- }
-
- @Override
- public void inflateToolbar(Menu menu, MenuInflater inflater, Context context) {
- inflater.inflate(R.menu.search, menu);
- ((QKActivity) context).setTitle(R.string.title_search);
-
- super.onCreateOptionsMenu(menu, inflater);
- }
-
@Override
public void onItemClick(SearchData data, View view) {
MessageListActivity.launch(mContext, data.threadId, data.rowId, mSearchString, true);
+ mContext.finish();
}
@Override