mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-03 15:22:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android Studio reformat

Browse Source
This commit is contained in:
Sylvia van Os
2021-11-07 15:38:55 +01:00
parent a348ad62a2
commit 11970004f0
41 changed files with 518 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/protect/card_locker/ScanActivity.java
View File

@@ -25,7 +25,7 @@ import androidx.appcompat.widget.Toolbar;
/**
* Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
*
* <p>
* Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
* originally licensed under Apache 2.0
*/
@@ -54,8 +54,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
if(actionBar != null)
{
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
@@ -127,8 +126,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
}
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
public boolean onCreateOptionsMenu(Menu menu) {
if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
getMenuInflater().inflate(R.menu.scan_menu, menu);
}
@@ -139,10 +137,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
if (item.getItemId() == android.R.id.home)
{
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
setResult(Activity.RESULT_CANCELED);
finish();
return true;
@@ -164,8 +160,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent intent)
{
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
super.onActivityResult(requestCode, resultCode, intent);
BarcodeValues barcodeValues;