diff --git a/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java b/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java index a4a63a2..fec670d 100644 --- a/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java +++ b/app/src/main/java/net/foucry/pilldroid/CustomScannerActivity.java @@ -87,7 +87,8 @@ public class CustomScannerActivity extends AppCompatActivity implements Decorate } @Override - public void onBackPressed(){ + public void onBackPressed() { + super.onBackPressed(); onCancel(this.getCurrentFocus()); } diff --git a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java index 0af1a4d..c9b577a 100644 --- a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java +++ b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java @@ -310,8 +310,7 @@ public class DrugListActivity extends AppCompatActivity { startActivity(new Intent(this, WelcomeActivity.class)); return true; } else if (id == R.id.ImportExport) { - //backupPrescriptions(); - // TODO: a changer ainsi que le menu. + backupprefs(); } return super.onOptionsItemSelected(item); } @@ -711,4 +710,33 @@ public class DrugListActivity extends AppCompatActivity { } } } + void backupprefs() { + final Dialog dlg = new Dialog(this); + dlg.requestWindowFeature(Window.FEATURE_NO_TITLE); + Objects.requireNonNull(dlg.getWindow()).setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dlg.setContentView(R.layout.backupprefs); + dlg.setCancelable(false); + + Button btn_export = dlg.findViewById(R.id.switch_btn_export); + Button btn_import = dlg.findViewById(R.id.switch_btn_import); + Button btn_location = dlg.findViewById(R.id.btn_backup_location); + Button btn_properties = dlg.findViewById(R.id.btn_properties); + + btn_export.setEnabled(true); + btn_import.setEnabled(false); + + Button ok = dlg.findViewById(R.id.ok_btn); + Button cancel = dlg.findViewById(R.id.cancel_btn); + ok.setOnClickListener(v -> { + dlg.cancel(); + //TODO: manage the options + Log.i(TAG, "ok button"); + }); + + cancel.setOnClickListener(v -> { + dlg.cancel(); + Log.i(TAG, "dismiss dialog"); + }); + dlg.show(); + } } diff --git a/app/src/main/res/layout/backupprefs.xml b/app/src/main/res/layout/backupprefs.xml index 0daa17e..220bb08 100644 --- a/app/src/main/res/layout/backupprefs.xml +++ b/app/src/main/res/layout/backupprefs.xml @@ -1,75 +1,148 @@ - - + tools:ignore="MissingDefaultResource"> + android:id="@+id/materialCardView" + android:layout_width="370dp" + android:layout_height="319dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" + app:cardCornerRadius="@dimen/btn_radius" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.35"> - - - - - - - - + android:layout_marginEnd="68dp" + android:layout_weight="1" + android:backgroundTint="@color/selected_background" + android:gravity="center" + android:paddingStart="25dp" + android:paddingEnd="25dp" + android:text="@string/export_prescriptions" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="@+id/switch_btn_import" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/switch_btn_import" /> -