From 3620e5187b46b17afa507dcfbd1f4470d2b97843 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 19 Jan 2012 13:29:38 +0300 Subject: [PATCH] implement basic search dialog for compat mode --- res/values/strings.xml | 1 + src/org/fox/ttrss/MainActivity.java | 49 ++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6605b52a..3fa95bd9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -116,4 +116,5 @@ Downloading images (%1$d)... Set labels Search + Cancel \ No newline at end of file diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 02f29ebb..0b475946 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -43,6 +43,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.AnimationUtils; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.EditText; import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; @@ -852,6 +853,44 @@ public class MainActivity extends FragmentActivity implements OnlineServices { switch (item.getItemId()) { case android.R.id.home: goBack(false); + return true; + case R.id.search: + if (hf != null && m_compatMode) { + Dialog dialog = new Dialog(this); + + final EditText edit = new EditText(this); + + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.search) + .setPositiveButton(getString(R.string.search), + new OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, + int which) { + + String query = edit.getText().toString().trim(); + + hf.setSearchQuery(query); + + } + }) + .setNegativeButton(getString(R.string.cancel), + new OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, + int which) { + + // + + } + }).setView(edit); + + dialog = builder.create(); + dialog.show(); + } + return true; case R.id.preferences: Intent intent = new Intent(MainActivity.this, @@ -1465,11 +1504,13 @@ public class MainActivity extends FragmentActivity implements OnlineServices { if (!append) { - MenuItem search = m_menu.findItem(R.id.search); + if (m_menu != null) { + MenuItem search = m_menu.findItem(R.id.search); - if (search != null && !m_compatMode) { - SearchView sv = (SearchView) search.getActionView(); - sv.setQuery("", false); + if (search != null && !m_compatMode) { + SearchView sv = (SearchView) search.getActionView(); + sv.setQuery("", false); + } } HeadlinesFragment hf = new HeadlinesFragment();