Skip to content

Commit 95cd4a3

Browse files
authored
Merge pull request #512 from hannesa2/SomeCodeCleanup
some code cleanup
2 parents 9319110 + 0fdfbce commit 95cd4a3

File tree

5 files changed

+12
-19
lines changed

5 files changed

+12
-19
lines changed

sample/src/main/java/example/zxing/ContinuousCaptureActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
* a barcode is scanned.
2525
*/
2626
public class ContinuousCaptureActivity extends Activity {
27-
private static final String TAG = ContinuousCaptureActivity.class.getSimpleName();
2827
private DecoratedBarcodeView barcodeView;
2928
private BeepManager beepManager;
3029
private String lastText;
@@ -43,7 +42,7 @@ public void barcodeResult(BarcodeResult result) {
4342
beepManager.playBeepSoundAndVibrate();
4443

4544
//Added preview of scanned barcode
46-
ImageView imageView = (ImageView) findViewById(R.id.barcodePreview);
45+
ImageView imageView = findViewById(R.id.barcodePreview);
4746
imageView.setImageBitmap(result.getBitmapWithResultPoints(Color.YELLOW));
4847
}
4948

@@ -58,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
5857

5958
setContentView(R.layout.continuous_scan);
6059

61-
barcodeView = (DecoratedBarcodeView) findViewById(R.id.barcode_scanner);
60+
barcodeView = findViewById(R.id.barcode_scanner);
6261
Collection<BarcodeFormat> formats = Arrays.asList(BarcodeFormat.QR_CODE, BarcodeFormat.CODE_39);
6362
barcodeView.getBarcodeView().setDecoderFactory(new DefaultDecoderFactory(formats));
6463
barcodeView.initializeFromIntent(getIntent());

sample/src/main/java/example/zxing/CustomScannerActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ protected void onCreate(Bundle savedInstanceState) {
3030
super.onCreate(savedInstanceState);
3131
setContentView(R.layout.activity_custom_scanner);
3232

33-
barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
33+
barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
3434
barcodeScannerView.setTorchListener(this);
3535

36-
switchFlashlightButton = (Button)findViewById(R.id.switch_flashlight);
36+
switchFlashlightButton = findViewById(R.id.switch_flashlight);
3737

38-
viewfinderView = (ViewfinderView) findViewById(R.id.zxing_viewfinder_view);
38+
viewfinderView = findViewById(R.id.zxing_viewfinder_view);
3939

4040
// if the device does not have flashlight in its camera,
4141
// then remove the switch flashlight button...

sample/src/main/java/example/zxing/MainActivity.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
156156
public View onCreateView(LayoutInflater inflater, ViewGroup container,
157157
Bundle savedInstanceState) {
158158
View view = inflater.inflate(R.layout.fragment_scan, container, false);
159-
Button scan = (Button) view.findViewById(R.id.scan_from_fragment);
160-
scan.setOnClickListener(new View.OnClickListener() {
161-
@Override
162-
public void onClick(View v) {
163-
scanFromFragment();
164-
}
165-
});
159+
Button scan = view.findViewById(R.id.scan_from_fragment);
160+
scan.setOnClickListener(v -> scanFromFragment());
166161
return view;
167162
}
168163

sample/src/main/java/example/zxing/TabbedScanning.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
2020

2121
public class TabbedScanning extends AppCompatActivity implements ActionBar.TabListener {
22-
private static final String TAG = TabbedScanning.class.getSimpleName();
2322

2423
/**
2524
* The {@link PagerAdapter} that will provide
@@ -46,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
4645
mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
4746

4847
// Set up the ViewPager with the sections adapter.
49-
mViewPager = (ViewPager) findViewById(R.id.container);
48+
mViewPager = findViewById(R.id.container);
5049
mViewPager.setAdapter(mSectionsPagerAdapter);
5150

5251
// Set up the action bar.
@@ -114,7 +113,7 @@ public static ScanFragment newInstance() {
114113
public View onCreateView(LayoutInflater inflater, ViewGroup container,
115114
Bundle savedInstanceState) {
116115
View rootView = inflater.inflate(R.layout.fragment_tabbed_scanning, container, false);
117-
barcodeView = (DecoratedBarcodeView)rootView.findViewById(R.id.barcode_view);
116+
barcodeView = rootView.findViewById(R.id.barcode_view);
118117
return rootView;
119118
}
120119

@@ -167,7 +166,7 @@ public static CameraFragment newInstance() {
167166
public View onCreateView(LayoutInflater inflater, ViewGroup container,
168167
Bundle savedInstanceState) {
169168
View rootView = inflater.inflate(R.layout.fragment_tabbed_camera, container, false);
170-
cameraPreview = (CameraPreview)rootView.findViewById(R.id.camera_preview);
169+
cameraPreview = rootView.findViewById(R.id.camera_preview);
171170
return rootView;
172171
}
173172

sample/src/main/java/example/zxing/ToolbarCaptureActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ protected void onCreate(Bundle savedInstanceState) {
2020
super.onCreate(savedInstanceState);
2121

2222
setContentView(R.layout.capture_appcompat);
23-
Toolbar toolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
23+
Toolbar toolbar = findViewById(R.id.my_awesome_toolbar);
2424
toolbar.setTitle("Scan Barcode");
2525
setSupportActionBar(toolbar);
2626
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
2727

28-
barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
28+
barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
2929

3030
capture = new CaptureManager(this, barcodeScannerView);
3131
capture.initializeFromIntent(getIntent(), savedInstanceState);

0 commit comments

Comments
 (0)