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

Added a specific message for unsearchable books, and changed the Exit button in the help to Done to be a little clearer.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@766 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-12-01 16:10:28 +00:00
parent c3564411fb
commit 7f5c93a71d
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/layout/help.xml
View file

@ -39,10 +39,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/button_back"/> android:text="@string/button_back"/>
<Button android:id="@+id/exit_button" <Button android:id="@+id/done_button"
android:layout_width="100px" android:layout_width="100px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/button_exit"/> android:text="@string/button_done"/>
</LinearLayout> </LinearLayout>

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

@ -25,8 +25,8 @@
<string name="button_cancel">Cancel</string> <string name="button_cancel">Cancel</string>
<string name="button_clipboard_empty">Clipboard empty</string> <string name="button_clipboard_empty">Clipboard empty</string>
<string name="button_dial">Dial number</string> <string name="button_dial">Dial number</string>
<string name="button_done">Done</string>
<string name="button_email">Send email</string> <string name="button_email">Send email</string>
<string name="button_exit">Exit</string>
<string name="button_get_directions">Get directions</string> <string name="button_get_directions">Get directions</string>
<string name="button_mms">Send MMS</string> <string name="button_mms">Send MMS</string>
<string name="button_ok">OK</string> <string name="button_ok">OK</string>
@ -65,6 +65,7 @@
<string name="msg_encode_contents_failed">Could not encode a barcode from the data provided. <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.
</string> </string>
<string name="msg_encode_in_progress">Generating a barcode\u2026</string> <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
<string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
<string name="msg_sbc_failed">Sorry, the search encountered a problem.</string> <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_no_page_returned">No page returned</string>
<string name="msg_sbc_page">Page</string> <string name="msg_sbc_page">Page</string>

6
android/src/com/google/zxing/client/android/HelpActivity.java
View file

@ -50,8 +50,8 @@ public final class HelpActivity extends Activity {
mBackButton = (Button)findViewById(R.id.back_button); mBackButton = (Button)findViewById(R.id.back_button);
mBackButton.setOnClickListener(mBackListener); mBackButton.setOnClickListener(mBackListener);
Button exitButton = (Button)findViewById(R.id.exit_button); Button doneButton = (Button)findViewById(R.id.done_button);
exitButton.setOnClickListener(mExitListener); doneButton.setOnClickListener(mDoneListener);
} }
@Override @Override
@ -81,7 +81,7 @@ public final class HelpActivity extends Activity {
} }
}; };
private final Button.OnClickListener mExitListener = new Button.OnClickListener() { private final Button.OnClickListener mDoneListener = new Button.OnClickListener() {
public void onClick(View view) { public void onClick(View view) {
finish(); finish();
} }

11
android/src/com/google/zxing/client/android/SearchBookContentsActivity.java
View file

@ -179,6 +179,10 @@ public final class SearchBookContentsActivity extends Activity {
} }
mResultListView.setAdapter(new SearchBookContentsAdapter(this, items)); mResultListView.setAdapter(new SearchBookContentsAdapter(this, items));
} else { } else {
String searchable = json.optString("searchable");
if (searchable != null && searchable.equals("false")) {
mHeaderView.setText(R.string.msg_sbc_book_not_searchable);
}
mResultListView.setAdapter(null); mResultListView.setAdapter(null);
} }
} catch (JSONException e) { } catch (JSONException e) {
@ -237,9 +241,10 @@ public final class SearchBookContentsActivity extends Activity {
AndroidHttpClient client = null; AndroidHttpClient client = null;
try { try {
// These return a JSON result which describes if and where the query was found. This API may // These return a JSON result which describes if and where the query was found. This API may
// break or disappear at any time in the future. Since this is an API call rather than a website, // break or disappear at any time in the future. Since this is an API call rather than a
// we don't use LocaleManager to change the TLD. // website, we don't use LocaleManager to change the TLD.
URI uri = new URI("http", null, "www.google.com", -1, "/books", "vid=isbn" + mISBN + "&jscmd=SearchWithinVolume2&q=" + mQuery, null); URI uri = new URI("http", null, "www.google.com", -1, "/books", "vid=isbn" + mISBN +
"&jscmd=SearchWithinVolume2&q=" + mQuery, null);
HttpUriRequest get = new HttpGet(uri); HttpUriRequest get = new HttpGet(uri);
get.setHeader("cookie", getCookie(uri.toString())); get.setHeader("cookie", getCookie(uri.toString()));
client = AndroidHttpClient.newInstance(mUserAgent); client = AndroidHttpClient.newInstance(mUserAgent);