Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Menu on search results to allow repeat searching (without a hardware search button)

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-01-17 22:36:14 +00:00
parent 3d913be808
commit 25a9c6ab9f
1 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/org/fdroid/fdroid/SearchResults.java
View File

@ -20,11 +20,20 @@ package org.fdroid.fdroid;
import java.util.Vector; import java.util.Vector;
import android.app.AlertDialog;
import android.app.ListActivity; import android.app.ListActivity;
import android.app.SearchManager; import android.app.SearchManager;
import android.app.AlertDialog.Builder;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
@ -33,8 +42,12 @@ public class SearchResults extends ListActivity {
private static final int REQUEST_APPDETAILS = 0; private static final int REQUEST_APPDETAILS = 0;
private static final int SEARCH = Menu.FIRST;
private AppListAdapter applist = new AppListAdapter(this); private AppListAdapter applist = new AppListAdapter(this);
private String mQuery;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -43,27 +56,45 @@ public class SearchResults extends ListActivity {
Intent intent = getIntent(); Intent intent = getIntent();
if (Intent.ACTION_SEARCH.equals(intent.getAction())) { if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
String query = intent.getStringExtra(SearchManager.QUERY); mQuery = intent.getStringExtra(SearchManager.QUERY);
}
}
@Override
protected void onNewIntent(Intent intent) {
if (Intent.ACTION_SEARCH.equals(intent.getAction()))
mQuery = intent.getStringExtra(SearchManager.QUERY);
super.onNewIntent(intent);
}
@Override
protected void onResume() {
updateView();
super.onResume();
}
private void updateView() {
DB db = new DB(this); DB db = new DB(this);
Vector<DB.App> apps = db.getApps(null, query, false); Vector<DB.App> apps = db.getApps(null, mQuery, false);
TextView tv = (TextView) findViewById(R.id.description); TextView tv = (TextView) findViewById(R.id.description);
String headertext; String headertext;
if(apps.size()==0) if(apps.size()==0)
headertext = String.format(getString(R.string.searchres_noapps),query); headertext = String.format(getString(R.string.searchres_noapps),mQuery);
else if(apps.size()==1) else if(apps.size()==1)
headertext = String.format(getString(R.string.searchres_oneapp),query); headertext = String.format(getString(R.string.searchres_oneapp),mQuery);
else else
headertext = String.format(getString(R.string.searchres_napps),apps.size(),query); headertext = String.format(getString(R.string.searchres_napps),apps.size(),mQuery);
tv.setText(headertext); tv.setText(headertext);
Log.d("FDroid", "Search for '" + query + "' returned " Log.d("FDroid", "Search for '" + mQuery + "' returned "
+ apps.size() + " results"); + apps.size() + " results");
applist.clear();
for (DB.App app : apps) { for (DB.App app : apps) {
applist.addItem(app); applist.addItem(app);
} }
applist.notifyDataSetChanged(); applist.notifyDataSetChanged();
setListAdapter(applist); setListAdapter(applist);
db.close(); db.close();
}
} }
@Override @Override
@ -77,4 +108,27 @@ public class SearchResults extends ListActivity {
super.onListItemClick(l, v, position, id); super.onListItemClick(l, v, position, id);
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
menu.add(Menu.NONE, SEARCH, 1, R.string.menu_search).setIcon(
android.R.drawable.ic_menu_search);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case SEARCH:
onSearchRequested();
return true;
}
return super.onOptionsItemSelected(item);
}
} }