From f5e7d28aa6f25374df70fc39a317a1810ba5610a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 1 Sep 2018 23:34:35 +0200 Subject: [PATCH] fix WizardInfoDialog 2nd --- .../androidaps/plugins/Actions/dialogs/FillDialog.java | 2 +- .../plugins/Overview/Dialogs/WizardDialog.java | 2 +- .../plugins/Treatments/dialogs/WizardInfoDialog.java | 3 ++- app/src/main/res/layout/treatments_wizardinfo_dialog.xml | 9 +++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java index cd649d30cd..20211e5f22 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java @@ -91,7 +91,7 @@ public class FillDialog extends DialogFragment implements OnClickListener { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.actions_fill_dialog, null, false); + View view = inflater.inflate(R.layout.actions_fill_dialog, container, false); view.findViewById(R.id.ok).setOnClickListener(this); view.findViewById(R.id.cancel).setOnClickListener(this); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java index 458608edbf..28ae009c6e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java @@ -207,7 +207,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.overview_wizard_dialog, null, false); + View view = inflater.inflate(R.layout.overview_wizard_dialog, container, false); getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE); getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java index 2823957b63..25ffc946a2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/dialogs/WizardInfoDialog.java @@ -13,6 +13,7 @@ import android.widget.TextView; import org.json.JSONObject; +import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.JsonHelper; @@ -31,7 +32,7 @@ public class WizardInfoDialog extends DialogFragment implements OnClickListener @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.treatments_wizardinfo_dialog, null, false); + View view = inflater.inflate(R.layout.treatments_wizardinfo_dialog, container, false); getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); diff --git a/app/src/main/res/layout/treatments_wizardinfo_dialog.xml b/app/src/main/res/layout/treatments_wizardinfo_dialog.xml index 12e0e4e73e..9f605ada12 100644 --- a/app/src/main/res/layout/treatments_wizardinfo_dialog.xml +++ b/app/src/main/res/layout/treatments_wizardinfo_dialog.xml @@ -21,6 +21,15 @@ android:layout_marginTop="-15dp" android:background="@color/listdelimiter" /> + +