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

Back to white backgrounds, somewhat smaller text in the result screen, shorter Toast popup and doesn't interfere with help screen

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1429 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-06-15 18:43:10 +00:00
parent b7d6fcef1d
commit bda97f7c84
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/assets/html/style.css
View file

@ -1,12 +1,9 @@
body { body {
background-color: black; background-color: white;
color: white; color: black;
font-family: Arial sans-serif; font-family: Arial sans-serif;
font-size: 14pt; font-size: 14pt;
} }
a:link, a:visited, a:active {
color: white;
}
ul.touchable li { ul.touchable li {
padding-top:8px; padding-top:8px;
padding-bottom:8px; padding-bottom:8px;

4
android/res/values/colors.xml
View file

@ -31,8 +31,8 @@
<color name="sbc_layout_view">#ffffffff</color> <color name="sbc_layout_view">#ffffffff</color>
<color name="sbc_page_number_text">#ff000000</color> <color name="sbc_page_number_text">#ff000000</color>
<color name="sbc_snippet_text">#ff4b4b4b</color> <color name="sbc_snippet_text">#ff4b4b4b</color>
<color name="share_text">#ffffffff</color> <color name="share_text">#ff000000</color>
<color name="share_view">#ff000000</color> <color name="share_view">#ffffffff</color>
<color name="status_view">#50000000</color> <color name="status_view">#50000000</color>
<color name="status_text">#ffffffff</color> <color name="status_text">#ffffffff</color>
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>

13
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -150,6 +150,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
private String characterSet; private String characterSet;
private String versionName; private String versionName;
private HistoryManager historyManager; private HistoryManager historyManager;
private boolean firstLaunch;
private final OnCompletionListener beepListener = new BeepListener(); private final OnCompletionListener beepListener = new BeepListener();
@ -187,9 +188,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
historyManager = new HistoryManager(this); historyManager = new HistoryManager(this);
historyManager.trimHistory(); historyManager.trimHistory();
showHelpOnFirstLaunch(); firstLaunch = showHelpOnFirstLaunch();
Toast.makeText(this, R.string.msg_default_status, Toast.LENGTH_LONG).show();
} }
@Override @Override
@ -261,6 +260,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false); vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true); copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true);
initBeepSound(); initBeepSound();
if (!firstLaunch) {
Toast.makeText(this, R.string.msg_default_status, Toast.LENGTH_SHORT).show();
}
} }
private static Vector<BarcodeFormat> parseDecodeFormats(Intent intent) { private static Vector<BarcodeFormat> parseDecodeFormats(Intent intent) {
@ -521,8 +524,8 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view); TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
CharSequence displayContents = resultHandler.getDisplayContents(); CharSequence displayContents = resultHandler.getDisplayContents();
contentsTextView.setText(displayContents); contentsTextView.setText(displayContents);
// Crudely scale betweeen 22 and 48 -- bigger font for shorter text // Crudely scale betweeen 22 and 42 -- bigger font for shorter text
int scaledSize = Math.max(22, 48 - displayContents.length() / 4); int scaledSize = Math.max(22, 42 - displayContents.length() / 4);
contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize); contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize);
int buttonCount = resultHandler.getButtonCount(); int buttonCount = resultHandler.getButtonCount();