Android fix
Fix android release
This commit is contained in:
parent
790704f750
commit
2d02b70c07
@ -94,11 +94,6 @@ implements SurfaceHolder.Callback {
|
|||||||
// Set content view
|
// Set content view
|
||||||
setContentView(getResourceId("layout/cszbarscanner"));
|
setContentView(getResourceId("layout/cszbarscanner"));
|
||||||
|
|
||||||
// Update view with customisable strings
|
|
||||||
TextView view_textTitle = (TextView) findViewById(getResourceId("id/csZbarScannerTitle"));
|
|
||||||
TextView view_textInstructions = (TextView) findViewById(getResourceId("id/csZbarScannerInstructions"));
|
|
||||||
view_textTitle.setText(textTitle);
|
|
||||||
view_textInstructions.setText(textInstructions);
|
|
||||||
|
|
||||||
// Create preview SurfaceView
|
// Create preview SurfaceView
|
||||||
scannerSurface = new SurfaceView (this) {
|
scannerSurface = new SurfaceView (this) {
|
||||||
@ -118,8 +113,6 @@ implements SurfaceHolder.Callback {
|
|||||||
|
|
||||||
// Add preview SurfaceView to the screen
|
// Add preview SurfaceView to the screen
|
||||||
((FrameLayout) findViewById(getResourceId("id/csZbarScannerView"))).addView(scannerSurface);
|
((FrameLayout) findViewById(getResourceId("id/csZbarScannerView"))).addView(scannerSurface);
|
||||||
findViewById(getResourceId("id/csZbarScannerTitle")).bringToFront();
|
|
||||||
findViewById(getResourceId("id/csZbarScannerInstructions")).bringToFront();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -3,42 +3,13 @@
|
|||||||
android:id="@+id/csZbarScannerViewContainer"
|
android:id="@+id/csZbarScannerViewContainer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" >
|
android:layout_height="match_parent" >
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/csZbarScannerView"
|
android:id="@+id/csZbarScannerView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/csZbarScannerBackground" >
|
android:background="@color/csZbarScannerBackground" >
|
||||||
|
|
||||||
<TextView android:id="@+id/csZbarScannerTitle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="top|center_horizontal"
|
|
||||||
android:paddingTop="15dp"
|
|
||||||
android:paddingBottom="5dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:paddingRight="5dp"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="@string/csZbarScannerTitle"
|
|
||||||
android:textColor="@color/csZbarScannerTextColor"
|
|
||||||
android:background="@color/csZbarScannerTextBackground"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:textSize="20pt" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/csZbarScannerInstructions"
|
|
||||||
android:layout_gravity="bottom|center_horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="5dp"
|
|
||||||
android:paddingBottom="15dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:paddingRight="5dp"
|
|
||||||
android:gravity="center"
|
|
||||||
android:textSize="12pt"
|
|
||||||
android:textColor="@color/csZbarScannerTextColor"
|
|
||||||
android:background="@color/csZbarScannerTextBackground"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:text="@string/csZbarScannerInstructions" />
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
Loading…
Reference in New Issue
Block a user