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

... and roll back a bit more to old status view, smaller text again

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1431 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-06-15 21:53:48 +00:00
parent b238eb22a0
commit d8233b3ce1
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/res/layout/capture.xml
View file

@ -179,13 +179,20 @@
</LinearLayout> </LinearLayout>
<TextView android:id="@+id/status_view" <LinearLayout android:layout_width="fill_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal"
android:layout_gravity="bottom|center_horizontal" android:background="@color/part_transparent"
android:text="@string/msg_default_status" android:layout_gravity="bottom"
android:background="@color/transparent" android:gravity="center">
android:textColor="@color/status_text"
android.textSize="14sp"/> <TextView android:id="@+id/status_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/msg_default_status"
android:textColor="@color/status_text"
android:textSize="14sp"/>
</LinearLayout>
</FrameLayout> </FrameLayout>

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

@ -36,6 +36,7 @@
<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>
<color name="part_transparent">#7f000000</color>
<color name="viewfinder_frame">#ff000000</color> <color name="viewfinder_frame">#ff000000</color>
<color name="viewfinder_laser">#ffff0000</color> <color name="viewfinder_laser">#ffff0000</color>
<color name="viewfinder_mask">#60000000</color> <color name="viewfinder_mask">#60000000</color>

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

@ -17,7 +17,6 @@
package com.google.zxing.client.android; package com.google.zxing.client.android;
import android.util.TypedValue; import android.util.TypedValue;
import android.widget.Toast;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.ResultPoint; import com.google.zxing.ResultPoint;
@ -136,7 +135,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
private CaptureActivityHandler handler; private CaptureActivityHandler handler;
private ViewfinderView viewfinderView; private ViewfinderView viewfinderView;
private View statusView; private TextView statusView;
private View resultView; private View resultView;
private MediaPlayer mediaPlayer; private MediaPlayer mediaPlayer;
private Result lastResult; private Result lastResult;
@ -182,7 +181,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
CameraManager.init(getApplication()); CameraManager.init(getApplication());
viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view); viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
resultView = findViewById(R.id.result_view); resultView = findViewById(R.id.result_view);
statusView = findViewById(R.id.status_view); statusView = (TextView) findViewById(R.id.status_view);
handler = null; handler = null;
lastResult = null; lastResult = null;
hasSurface = false; hasSurface = false;
@ -522,8 +521,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 42 -- bigger font for shorter text // Crudely scale betweeen 22 and 36 -- bigger font for shorter text
int scaledSize = Math.max(22, 42 - displayContents.length() / 4); int scaledSize = Math.max(22, 36 - 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();
@ -554,7 +553,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
// barcode was found (e.g. contact info) rather than the full contents, which they won't // barcode was found (e.g. contact info) rather than the full contents, which they won't
// have time to read. // have time to read.
ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult); ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
Toast.makeText(this, resultHandler.getDisplayTitle(), Toast.LENGTH_SHORT).show(); statusView.setText(getString(resultHandler.getDisplayTitle()));
if (copyToClipboard) { if (copyToClipboard) {
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
@ -688,6 +687,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
private void resetStatusView() { private void resetStatusView() {
resultView.setVisibility(View.GONE); resultView.setVisibility(View.GONE);
statusView.setText(R.string.msg_default_status);
statusView.setVisibility(View.VISIBLE); statusView.setVisibility(View.VISIBLE);
viewfinderView.setVisibility(View.VISIBLE); viewfinderView.setVisibility(View.VISIBLE);
lastResult = null; lastResult = null;