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

refactor a lot of code to make it cleaner and remove debug and test code.

Browse source
This commit is contained in:
jacques 2020-06-29 18:31:25 +02:00
parent c82b1266b6
commit bd4fe6774f
1 changed files with 71 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -274,168 +274,88 @@ public class MedicamentListActivity extends AppCompatActivity {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
return; return;
} }
switch (requestCode) { if (requestCode == CUSTOMIZED_REQUEST_CODE) {
case CUSTOMIZED_REQUEST_CODE: { Toast.makeText(this, "REQUEST_CODE = " + requestCode + "RESULT_CODE = " + resultCode, Toast.LENGTH_LONG).show();
Toast.makeText(this, "REQUEST_CODE = " + requestCode +"RESULT_CODE = " + resultCode, Toast.LENGTH_LONG).show(); Log.d(TAG, "REQUEST_CODE = " + requestCode + " RESULT_CODE = " + resultCode);
Log.d(TAG, "REQUEST_CODE = " + requestCode +" RESULT_CODE = " + resultCode); if (resultCode == 1) {
switch (resultCode) { constructMedsList();
case 1: { } else {
constructMedsList(); Toast.makeText(this, "What are you doing here?", Toast.LENGTH_SHORT).show();
break; Log.d(TAG, "What are you doing here?");
}
case 2: {
Toast.makeText(this, "Cancelled scan", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Cancelled Scan");
break;
}
case 3: {
Toast.makeText(this, "Keyboard input", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Keyboard Input");
String cip13_input = showInputDialog();
final Medicament medoc = dbMedoc.getMedocByCIP13(cip13_input);
if ( medoc != null ) {
medoc.setDateEndOfStock();
dbHelper.addDrug(medoc);
mAdapter.addItem(medoc);
} else {
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
dlg.setTitle(getString(R.string.app_name));
dlg.setMessage(getString(R.string.msgNotFound));
dlg.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// nothing to do to just dismiss dialog
}
});
dlg.show();
}
break;
}
default: {
Toast.makeText(this, "What are you doing here?", Toast.LENGTH_SHORT).show();
Log.d(TAG, "What are you doing here?");
}
}
break;
} }
default: { } else {
IntentResult result = IntentIntegrator.parseActivityResult(resultCode, data); IntentResult result = IntentIntegrator.parseActivityResult(resultCode, data);
Toast.makeText(this, "REQUEST_CODE = " + requestCode, Toast.LENGTH_LONG).show(); Toast.makeText(this, "REQUEST_CODE = " + requestCode, Toast.LENGTH_LONG).show();
Log.d(TAG, "REQUEST_CODE = " + requestCode + "resultCode = " + resultCode); Log.d(TAG, "REQUEST_CODE = " + requestCode + "resultCode = " + resultCode);
if(result.getContents() == null) { if (result.getContents() == null) {
Intent originalIntent = result.getOriginalIntent(); Intent originalIntent = result.getOriginalIntent();
if (originalIntent == null) { if (originalIntent == null) {
Log.d(TAG, "Cancelled scan"); // Todo: put here resultCode =3 test if (resultCode == 3) { // TODO: Should call showInputDialog and have keyboardInput back
Log.d(TAG, "REQUEST_CODE = " + requestCode +" RESULT_CODE = " + resultCode);
Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show();
} else if(originalIntent.hasExtra(Intents.Scan.MISSING_CAMERA_PERMISSION)) {
Log.d(TAG,"Cancelled scan due to missing camera permission");
Log.d(TAG, "REQUEST_CODE = " + requestCode +" RESULT_CODE = " + resultCode);
Toast.makeText(this, "Cancelled due to missing camera permission", Toast.LENGTH_LONG).show();
} else if (resultCode == 3) {
Toast.makeText(this, "Keyboard input", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Keyboard input", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Keyboard Input"); Log.d(TAG, "Keyboard Input");
String cip13_input = showInputDialog();
final Medicament medoc = dbMedoc.getMedocByCIP13(cip13_input);
if ( medoc != null ) {
medoc.setDateEndOfStock();
dbHelper.addDrug(medoc);
mAdapter.addItem(medoc);
} else {
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
dlg.setTitle(getString(R.string.app_name));
dlg.setMessage(getString(R.string.msgNotFound));
dlg.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// nothing to do to just dismiss dialog
}
});
dlg.show();
}
break;
}
} else {
Log.d(TAG, "Scanned");
Log.d(TAG, "REQUEST_CODE = " + requestCode +" RESULT_CODE = " + resultCode);
Log.d(TAG, "result.getContents = " + result.getContents());
Log.d(TAG, "format = " + result.getFormatName());
Toast.makeText(this, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();
String cip13;
if (resultCode == 3) {
Toast.makeText(this, "Keyboard input", Toast.LENGTH_SHORT).show();
Log.d(TAG, "Keyboard Input");
cip13= showInputDialog();
final Medicament medoc = dbMedoc.getMedocByCIP13(cip13);
if ( medoc != null ) {
medoc.setDateEndOfStock();
dbHelper.addDrug(medoc);
mAdapter.addItem(medoc);
} else {
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
dlg.setTitle(getString(R.string.app_name));
dlg.setMessage(getString(R.string.msgNotFound));
dlg.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// nothing to do to just dismiss dialog
}
});
dlg.show();
}
} else { } else {
AlertDialog.Builder dlg = new AlertDialog.Builder(this); Log.d(TAG, "Cancelled scan"); // Todo: put here resultCode =3 test
dlg.setTitle(getString(R.string.app_name)); Log.d(TAG, "REQUEST_CODE = " + requestCode + " RESULT_CODE = " + resultCode);
// Handle successful scan
if (result.getFormatName().equals("CODE_128")) { //CODE_128
cip13 = result.getContents();
} else {
cip13 = result.getContents().substring(4, 17);
}
// Get Medoc from database
final Medicament scannedMedoc = dbMedoc.getMedocByCIP13(cip13);
if (scannedMedoc != null) {
String msg = scannedMedoc.getNom() + " " + getString(R.string.msgFound);
dlg.setMessage(msg);
dlg.setNegativeButton(getString(R.string.button_cancel), (DialogInterface.OnClickListener) (dialog, which) -> {
// Nothing to do in case of cancel
});
dlg.setPositiveButton(getString(R.string.button_ok), (dialog, which) -> {
// Add Medicament to DB then try to show it
scannedMedoc.setDateEndOfStock();
dbHelper.addDrug(scannedMedoc);
mAdapter.addItem(scannedMedoc);
});
dlg.show();
} else {
dlg.setMessage(getString(R.string.msgNotFound));
dlg.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// nothing to do to just dismiss dialog
}
});
dlg.show();
}
} }
Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show();
} else if (originalIntent.hasExtra(Intents.Scan.MISSING_CAMERA_PERMISSION)) {
Log.d(TAG, "Cancelled scan due to missing camera permission");
Log.d(TAG, "REQUEST_CODE = " + requestCode + " RESULT_CODE = " + resultCode);
Toast.makeText(this, "Cancelled due to missing camera permission", Toast.LENGTH_LONG).show();
}
} else {
Log.d(TAG, "Scanned");
Log.d(TAG, "REQUEST_CODE = " + requestCode + " RESULT_CODE = " + resultCode);
Log.d(TAG, "result.getContents = " + result.getContents());
Log.d(TAG, "format = " + result.getFormatName());
Toast.makeText(this, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();
String cip13;
AlertDialog.Builder dlg = new AlertDialog.Builder(this);
dlg.setTitle(getString(R.string.app_name));
// Handle successful scan
if (result.getFormatName().equals("CODE_128")) { //CODE_128
cip13 = result.getContents();
} else {
cip13 = result.getContents().substring(4, 17);
}
// Get Medoc from database
final Medicament scannedMedoc = dbMedoc.getMedocByCIP13(cip13);
if (scannedMedoc != null) {
String msg = scannedMedoc.getNom() + " " + getString(R.string.msgFound);
dlg.setMessage(msg);
dlg.setNegativeButton(getString(R.string.button_cancel), (DialogInterface.OnClickListener) (dialog, which) -> {
// Nothing to do in case of cancel
});
dlg.setPositiveButton(getString(R.string.button_ok), (dialog, which) -> {
// Add Medicament to DB then try to show it
scannedMedoc.setDateEndOfStock();
dbHelper.addDrug(scannedMedoc);
mAdapter.addItem(scannedMedoc);
});
dlg.show();
} else {
dlg.setMessage(getString(R.string.msgNotFound));
dlg.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// nothing to do to just dismiss dialog
}
});
dlg.show();
} }
break;
} }
} }
} }
protected String showInputDialog() { protected void showInputDialog() {
// get prompts.xml view // get prompts.xml view
LayoutInflater layoutInflater = LayoutInflater.from(MedicamentListActivity.this); LayoutInflater layoutInflater = LayoutInflater.from(MedicamentListActivity.this);
@ -461,7 +381,6 @@ public class MedicamentListActivity extends AppCompatActivity {
// create an alert dialog // create an alert dialog
AlertDialog alert = alertDialogBuilder.create(); AlertDialog alert = alertDialogBuilder.create();
alert.show(); alert.show();
return editText.toString();
} }
private void setupRecyclerView(@NonNull RecyclerView recyclerView) { private void setupRecyclerView(@NonNull RecyclerView recyclerView) {