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 an old bug on showInputDialog

Browse source
This commit is contained in:
jacques 2024-10-16 21:36:29 +02:00
parent 52ec18251c
commit 55575b5605
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
/** /**
* An activity representing a list of Drugs is activity * An activity representing a list of Drugs is activity
@ -354,7 +355,8 @@ public class DrugListActivity extends AppCompatActivity {
ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(this, R.drawable.rounded_btn_disabled))); ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(this, R.drawable.rounded_btn_disabled)));
MaterialTextView title = dialog.findViewById(R.id.title); MaterialTextView title = dialog.findViewById(R.id.title);
final EditText editText = dialog.findViewById(R.id.editcip13); final EditText editText = dialog.findViewById(R.id.editcip13);
String cip13 = String.valueOf(editText.getText()); String input = "";
AtomicReference<String> cip13 = new AtomicReference<>(String.valueOf(editText.getText()));
// TODO change the color of ok button when the number of character is correct. // TODO change the color of ok button when the number of character is correct.
@ -372,8 +374,7 @@ public class DrugListActivity extends AppCompatActivity {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
//alert.getButton(alert.BUTTON_POSITIVE).setEnabled(s.length() == 8); if (s.length() == 7) {
if (s.length() == 8) {
ok.setEnabled(true); ok.setEnabled(true);
ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn))); ok.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn)));
} }
@ -386,8 +387,9 @@ public class DrugListActivity extends AppCompatActivity {
ok.setOnClickListener(v -> { ok.setOnClickListener(v -> {
dialog.cancel(); dialog.cancel();
Log.i("EditText Value",editText.getEditableText().toString()); Log.i("EditText Value",editText.getEditableText().toString());
cip13.set(340093 + editText.getEditableText().toString());
MedicinesDAO medicinesDAO = medicines.getMedicinesDAO(); MedicinesDAO medicinesDAO = medicines.getMedicinesDAO();
Medicine aMedicine = medicinesDAO.getMedicineByCIP13(cip13); Medicine aMedicine = medicinesDAO.getMedicineByCIP13(String.valueOf(cip13));
askToAddInDB(aMedicine); askToAddInDB(aMedicine);
}); });
cancel.setOnClickListener(v -> { cancel.setOnClickListener(v -> {
@ -407,7 +409,7 @@ public class DrugListActivity extends AppCompatActivity {
private void askToAddInDB(Medicine aMedicine) { private void askToAddInDB(Medicine aMedicine) {
final Dialog dlg = new Dialog(this); final Dialog dlg = new Dialog(this);
dlg.requestWindowFeature(Window.FEATURE_NO_TITLE); dlg.requestWindowFeature(Window.FEATURE_NO_TITLE);
Objects.requireNonNull(dlg.getWindow()).setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); Objects.requireNonNull(dlg.getWindow()).setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
dlg.setContentView(R.layout.custom_dialog_layout_one_button); dlg.setContentView(R.layout.custom_dialog_layout_one_button);
dlg.setCancelable(true); dlg.setCancelable(true);
MaterialTextView msg = dlg.findViewById(R.id.msg); MaterialTextView msg = dlg.findViewById(R.id.msg);

2
app/src/main/res/layout/input_dialog.xml
View file

@ -99,7 +99,7 @@
android:id="@+id/textView4" android:id="@+id/textView4"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="34dp" android:layout_height="34dp"
android:text="340009" android:text="340093"
android:textAlignment="textEnd" android:textAlignment="textEnd"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"