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

Change askToAddToDB in order to custom layout.

Browse source
This commit is contained in:
jacques 2023-07-13 22:15:51 +02:00
parent 102ad77932
commit 32ea92d628
1 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import static net.foucry.pilldroid.UtilDate.date2String;
import static net.foucry.pilldroid.Utils.intRandomExclusive; import static net.foucry.pilldroid.Utils.intRandomExclusive;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Dialog;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -11,6 +12,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -23,6 +25,8 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@ -336,7 +340,6 @@ public class DrugListActivity extends AppCompatActivity {
View promptView = layoutInflater.inflate(R.layout.input_dialog, null); View promptView = layoutInflater.inflate(R.layout.input_dialog, null);
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(DrugListActivity.this); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(DrugListActivity.this);
alertDialogBuilder.setView(promptView); alertDialogBuilder.setView(promptView);
final EditText editText = promptView.findViewById(R.id.edittext); final EditText editText = promptView.findViewById(R.id.edittext);
// setup a dialog window // setup a dialog window
@ -378,24 +381,40 @@ public class DrugListActivity extends AppCompatActivity {
* @param aMedicine Prescription- medication to be added * @param aMedicine Prescription- medication to be added
*/ */
private void askToAddInDB(Medicine aMedicine) { private void askToAddInDB(Medicine aMedicine) {
AlertDialog.Builder dlg = new AlertDialog.Builder(this); final Dialog dlg = new Dialog(this);
dlg.setTitle(getString(R.string.app_name)); dlg.requestWindowFeature(Window.FEATURE_NO_TITLE);
dlg.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
dlg.setContentView(R.layout.mylayout);
dlg.setCancelable(false);
TextView msg = dlg.findViewById(R.id.msg);
String msgString;
ImageView icon = dlg.findViewById(R.id.image);
Button btn = (Button)dlg.findViewById(R.id.txtClose);
dlg.show();
if (aMedicine != null) { if (aMedicine != null) {
String msg = aMedicine.getName() + " " + getString(R.string.msgFound); msgString = aMedicine.getName() + " " + getString(R.string.msgFound);
msg.setText(msgString);
dlg.setMessage(msg); icon.setImageResource(R.drawable.tickmark);
dlg.setNegativeButton(getString(R.string.button_cancel), (dialog, which) -> { btn.setOnClickListener(new View.OnClickListener() {
// Nothing to do in case of cancel @Override
}); public void onClick(View v) {
dlg.setPositiveButton(getString(R.string.button_ok), (dialog, which) -> { // TODO Auto-generated method stub
// Add Drug to DB then try to show it dlg.dismiss();
addDrugToList(Utils.medicine2prescription(aMedicine)); finish();
}
}); });
} else { } else {
dlg.setMessage(getString(R.string.msgNotFound)); msgString = getString(R.string.msgNotFound);
dlg.setPositiveButton("OK", (dialog, which) -> { msg.setText(msgString);
// nothing to do to just dismiss dialog icon.setImageResource(R.drawable.tickcross);
btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// TODO Auto-generated method stub
dlg.dismiss();
finish();
}
}); });
} }
dlg.show(); dlg.show();
@ -416,7 +435,7 @@ public class DrugListActivity extends AppCompatActivity {
} }
/** /**
* askForCompréhensive * askForComprehensive
*/ */
private void askForComprehensive() { private void askForComprehensive() {
AlertDialog.Builder dlg = new AlertDialog.Builder(this); AlertDialog.Builder dlg = new AlertDialog.Builder(this);