mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for a title when searching for an address, for example a business name. Also changed snipppets --> snippet in book search.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@635 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-10-23 18:34:35 +00:00
parent 0a5cee0307
commit fd9ecdac96
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/values/strings.xml
View file

@ -64,7 +64,7 @@
<string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
<string name="msg_sbc_no_page_returned">No page returned</string>
<string name="msg_sbc_page">Page</string>
<string name="msg_sbc_snippet_unavailable">Snippets not available</string>
<string name="msg_sbc_snippet_unavailable">Snippet not available</string>
<string name="msg_sbc_unknown_page">Unknown page</string>
<string name="msg_searching_book">Searching book\u2026</string>
<string name="msg_share_barcode">Here\'s the contents of a barcode I scanned</string>

4
android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
View file

@ -100,7 +100,9 @@ public class AddressBookResultHandler extends ResultHandler {
addressResult.getTitle());
break;
case 1:
searchMap(addressResult.getAddress());
String[] names = addressResult.getNames();
String title = names != null ? names[0] : null;
searchMap(addressResult.getAddress(), title);
break;
case 2:
dialPhone(addressResult.getPhoneNumbers()[0]);

16
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -207,8 +207,18 @@ public abstract class ResultHandler {
launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse(geoURI)));
}
public void searchMap(String address) {
launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:0,0?q=" + Uri.encode(address))));
/**
* Do a geo search using the address as the query.
*
* @param address The address to find
* @param title An optional title, e.g. the name of the business at this address
*/
public void searchMap(String address, String title) {
String query = address;
if (title != null && title.length() > 0) {
query = query + " (" + title + ")";
}
launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:0,0?q=" + Uri.encode(query))));
}
public void getDirections(float latitude, float longitude) {
@ -255,6 +265,8 @@ public abstract class ResultHandler {
}
}
// TODO: The current Contacts Intent API can only accept one value for each field, so we pick the
// first element in the array for names, phone numbers, and emails. It would be great to fix this.
private static void putExtra(Intent intent, String key, String[] value) {
if (value != null && value.length > 0) {
putExtra(intent, key, value[0]);