diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java index 5cf0f9250..47552ef36 100644 --- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java +++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java @@ -67,7 +67,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity super.onCreate(savedInstanceState); setContentView(R.layout.barcode_selector_activity); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); ActionBar actionBar = getSupportActionBar(); if(actionBar != null) @@ -89,7 +89,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode) .build(); - EditText cardId = (EditText) findViewById(R.id.cardId); + EditText cardId = findViewById(R.id.cardId); cardId.addTextChangedListener(new TextWatcher() { @Override @@ -113,7 +113,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity // Update barcodes for(String key : barcodeViewMap.keySet()) { - ImageView image = (ImageView)findViewById(barcodeViewMap.get(key)); + ImageView image = findViewById(barcodeViewMap.get(key)); createBarcodeOption(image, key, s.toString()); } } diff --git a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java index 78701dcab..3e2c8f639 100644 --- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java +++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java @@ -29,7 +29,7 @@ public class CardShortcutConfigure extends AppCompatActivity setResult(RESULT_CANCELED); setContentView(R.layout.main_activity); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setVisibility(View.GONE); final DBHelper db = new DBHelper(this); @@ -41,7 +41,7 @@ public class CardShortcutConfigure extends AppCompatActivity finish(); } - final ListView cardList = (ListView) findViewById(R.id.list); + final ListView cardList = findViewById(R.id.list); cardList.setVisibility(View.VISIBLE); Cursor cardCursor = db.getLoyaltyCardCursor(); diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java index 690f41c69..e0be204cc 100644 --- a/app/src/main/java/protect/card_locker/ImportExportActivity.java +++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java @@ -49,7 +49,7 @@ public class ImportExportActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.import_export_activity); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); ActionBar actionBar = getSupportActionBar(); if(actionBar != null) @@ -72,7 +72,7 @@ public class ImportExportActivity extends AppCompatActivity } - Button exportButton = (Button)findViewById(R.id.exportButton); + Button exportButton = findViewById(R.id.exportButton); exportButton.setOnClickListener(new View.OnClickListener() { @Override @@ -86,7 +86,7 @@ public class ImportExportActivity extends AppCompatActivity // Check that there is an activity that can bring up a file chooser final Intent intentPickAction = new Intent(Intent.ACTION_PICK); - Button importFilesystem = (Button) findViewById(R.id.importOptionFilesystemButton); + Button importFilesystem = findViewById(R.id.importOptionFilesystemButton); importFilesystem.setOnClickListener(new View.OnClickListener() { @Override @@ -110,7 +110,7 @@ public class ImportExportActivity extends AppCompatActivity intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE); intentGetContentAction.setType("*/*"); - Button importApplication = (Button) findViewById(R.id.importOptionApplicationButton); + Button importApplication = findViewById(R.id.importOptionApplicationButton); importApplication.setOnClickListener(new View.OnClickListener() { @Override @@ -131,7 +131,7 @@ public class ImportExportActivity extends AppCompatActivity // This option, to import from the fixed location, should always be present - Button importButton = (Button)findViewById(R.id.importOptionFixedButton); + Button importButton = findViewById(R.id.importOptionFixedButton); importButton.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 70393dc9f..68daeff39 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -79,20 +79,20 @@ public class LoyaltyCardEditActivity extends AppCompatActivity db = new DBHelper(this); - storeFieldEdit = (EditText) findViewById(R.id.storeNameEdit); - storeFieldView = (TextView) findViewById(R.id.storeNameView); - noteFieldEdit = (EditText) findViewById(R.id.noteEdit); - noteFieldView = (TextView) findViewById(R.id.noteView); - cardIdFieldView = (TextView) findViewById(R.id.cardIdView); + storeFieldEdit = findViewById(R.id.storeNameEdit); + storeFieldView = findViewById(R.id.storeNameView); + noteFieldEdit = findViewById(R.id.noteEdit); + noteFieldView = findViewById(R.id.noteView); + cardIdFieldView = findViewById(R.id.cardIdView); cardIdDivider = findViewById(R.id.cardIdDivider); cardIdTableRow = findViewById(R.id.cardIdTableRow); - barcodeTypeField = (TextView) findViewById(R.id.barcodeType); - barcodeImage = (ImageView) findViewById(R.id.barcode); + barcodeTypeField = findViewById(R.id.barcodeType); + barcodeImage = findViewById(R.id.barcode); barcodeImageLayout = findViewById(R.id.barcodeLayout); barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout); - captureButton = (Button) findViewById(R.id.captureButton); - enterButton = (Button) findViewById(R.id.enterButton); + captureButton = findViewById(R.id.captureButton); + enterButton = findViewById(R.id.enterButton); } @Override @@ -390,10 +390,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity Log.i(TAG, "Read barcode id: " + contents); Log.i(TAG, "Read format: " + format); - TextView cardIdView = (TextView)findViewById(R.id.cardIdView); + TextView cardIdView = findViewById(R.id.cardIdView); cardIdView.setText(contents); - final TextView barcodeTypeField = (TextView) findViewById(R.id.barcodeType); + final TextView barcodeTypeField = findViewById(R.id.barcodeType); barcodeTypeField.setText(format); onResume(); } diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index 39bd3f492..26ed92422 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -40,7 +40,7 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.main_activity); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); updateLoyaltyCardList(); @@ -62,8 +62,8 @@ public class MainActivity extends AppCompatActivity private void updateLoyaltyCardList() { - final ListView cardList = (ListView) findViewById(R.id.list); - final TextView helpText = (TextView) findViewById(R.id.helpText); + final ListView cardList = findViewById(R.id.list); + final TextView helpText = findViewById(R.id.helpText); final DBHelper db = new DBHelper(this); if(db.getLoyaltyCardCount() > 0) @@ -120,7 +120,7 @@ public class MainActivity extends AppCompatActivity public boolean onContextItemSelected(MenuItem item) { AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); - ListView listView = (ListView) findViewById(R.id.list); + ListView listView = findViewById(R.id.list); Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position); LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor); diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java index 2f4ba1f62..7f3b87acb 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java @@ -42,7 +42,7 @@ public class LoyaltyCardCursorAdapterTest private void checkView(final View view, final String store, final String note) { - final TextView storeField = (TextView) view.findViewById(R.id.store); + final TextView storeField = view.findViewById(R.id.store); assertEquals(store, storeField.getText().toString()); final TextView noteField = view.findViewById(R.id.note); diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java index 141930b3a..980155e2c 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java @@ -102,10 +102,10 @@ public class LoyaltyCardViewActivityTest assertEquals(1, db.getLoyaltyCardCount()); } - final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit); - final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit); - final TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView); - final TextView barcodeTypeField = (TextView) activity.findViewById(R.id.barcodeType); + final EditText storeField = activity.findViewById(R.id.storeNameEdit); + final EditText noteField = activity.findViewById(R.id.noteEdit); + final TextView cardIdField = activity.findViewById(R.id.cardIdView); + final TextView barcodeTypeField = activity.findViewById(R.id.barcodeType); storeField.setText(store); noteField.setText(note); @@ -132,7 +132,7 @@ public class LoyaltyCardViewActivityTest private void captureBarcodeWithResult(final Activity activity, final int buttonId, final boolean success) throws IOException { // Start image capture - final Button captureButton = (Button) activity.findViewById(buttonId); + final Button captureButton = activity.findViewById(buttonId); captureButton.performClick(); ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult(); @@ -227,9 +227,9 @@ public class LoyaltyCardViewActivityTest DBHelper db = new DBHelper(activity); assertEquals(0, db.getLoyaltyCardCount()); - final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit); - final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit); - final TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView); + final EditText storeField = activity.findViewById(R.id.storeNameEdit); + final EditText noteField = activity.findViewById(R.id.noteEdit); + final TextView cardIdField = activity.findViewById(R.id.cardIdView); shadowActivity.clickMenuItem(R.id.action_save); assertEquals(0, db.getLoyaltyCardCount()); diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java index 262dd0e57..cddd94353 100644 --- a/app/src/test/java/protect/card_locker/MainActivityTest.java +++ b/app/src/test/java/protect/card_locker/MainActivityTest.java @@ -49,10 +49,10 @@ public class MainActivityTest Activity activity = Robolectric.setupActivity(MainActivity.class); assertTrue(activity != null); - TextView helpText = (TextView)activity.findViewById(R.id.helpText); + TextView helpText = activity.findViewById(R.id.helpText); assertEquals(View.VISIBLE, helpText.getVisibility()); - ListView list = (ListView)activity.findViewById(R.id.list); + ListView list = activity.findViewById(R.id.list); assertEquals(View.GONE, list.getVisibility()); } @@ -95,8 +95,8 @@ public class MainActivityTest activityController.start(); activityController.resume(); - TextView helpText = (TextView)mainActivity.findViewById(R.id.helpText); - ListView list = (ListView)mainActivity.findViewById(R.id.list); + TextView helpText = mainActivity.findViewById(R.id.helpText); + ListView list = mainActivity.findViewById(R.id.list); assertEquals(0, list.getCount());