lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-21 20:19:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for loop and small bug in onButtonClick

Browse source
This commit is contained in:
jacques 2022-03-14 10:19:55 +01:00
parent b260220039
commit 3754b3bb22
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
View file

@ -54,7 +54,7 @@ import java.util.Locale;
*/
public class DrugListActivity extends AppCompatActivity {
// Used for dev and debug
final Boolean DEMO = true;
final Boolean DEMO = false;
public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
public final String BARCODE_FORMAT_NAME = "Barcode Format name";
@ -84,8 +84,7 @@ public class DrugListActivity extends AppCompatActivity {
DBHelper dbHelper = new DBHelper(this);
if (dbHelper.getCount() !=0) {
List<Drug> drugs=dbHelper.getAllDrugs();
for (int count=1; count==dbHelper.getCount(); count++) {
for (int count=0; count < dbHelper.getCount(); count++) {
Drug drug = drugs.get(count);
Medic medic = new Medic();
@ -267,17 +266,6 @@ public class DrugListActivity extends AppCompatActivity {
startActivity(new Intent(this, WelcomeActivity.class));
return true;
}
/*switch (item.getItemId()) {
case R.id.about:
startActivity(new Intent(this, About.class));
return true;
case R.id.help:
PrefManager prefManager = new PrefManager(this);
prefManager.setFirstTimeLaunch(true);
startActivity(new Intent(this, WelcomeActivity.class));
return true;
}*/
return super.onOptionsItemSelected(item);
}
@ -299,7 +287,7 @@ public class DrugListActivity extends AppCompatActivity {
// Launch scan
public void onButtonClick() {
public void onButtonClick(View v) {
Log.d(TAG, "add medication");
ScanOptions options = new ScanOptions();
options.setDesiredBarcodeFormats(ScanOptions.DATA_MATRIX, ScanOptions.CODE_128);