From 6ca5517aefac7f7e1878e64ecdd8f97c1b49cb10 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 6 Jul 2016 11:11:12 +0200 Subject: [PATCH] switch + and - in dialogs --- .idea/misc.xml | 2 +- app/build.gradle | 4 +- .../Dialogs/NewExtendedBolusDialog.java | 2 +- .../Overview/Dialogs/NewTempBasalDialog.java | 2 +- .../Overview/Dialogs/NewTreatmentDialog.java | 2 +- .../Overview/Dialogs/WizardDialog.java | 4 +- .../careportal_newnstreatment_dialog.xml | 64 +-- ...l => overview_newextendedbolus_dialog.xml} | 8 +- ...t.xml => overview_newtempbasal_dialog.xml} | 16 +- ...t.xml => overview_newtreatment_dialog.xml} | 16 +- ...ragment.xml => overview_wizard_dialog.xml} | 539 +++++++++--------- 11 files changed, 329 insertions(+), 330 deletions(-) rename app/src/main/res/layout/{overview_newextendedbolus_fragment.xml => overview_newextendedbolus_dialog.xml} (100%) rename app/src/main/res/layout/{overview_newtempbasal_fragment.xml => overview_newtempbasal_dialog.xml} (100%) rename app/src/main/res/layout/{overview_newtreatment_fragment.xml => overview_newtreatment_dialog.xml} (100%) rename app/src/main/res/layout/{overview_wizard_fragment.xml => overview_wizard_dialog.xml} (77%) diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb68289f4..5d19981032 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 910f84362c..214175aa23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "info.nightscout.androidaps" minSdkVersion 21 targetSdkVersion 23 - versionCode 1004 - versionName "1.0.04" + versionCode 1005 + versionName "1.0.05" } buildTypes { release { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java index 85a41ac66d..fe4adf2729 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java @@ -38,7 +38,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli Bundle savedInstanceState) { getDialog().setTitle(getString(R.string.overview_extendedbolus_button)); - View view = inflater.inflate(R.layout.overview_newextendedbolus_fragment, container, false); + View view = inflater.inflate(R.layout.overview_newextendedbolus_dialog, container, false); okButton = (Button) view.findViewById(R.id.overview_newextendedbolus_okbutton); insulinEdit = (EditText) view.findViewById(R.id.overview_newextendedbolus_insulin); h05Radio = (RadioButton) view.findViewById(R.id.overview_newextendedbolus_05h); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java index 8febc6e7b2..4a0cd0c314 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java @@ -49,7 +49,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi Bundle savedInstanceState) { getDialog().setTitle(getString(R.string.overview_tempbasal_button)); - View view = inflater.inflate(R.layout.overview_newtempbasal_fragment, container, false); + View view = inflater.inflate(R.layout.overview_newtempbasal_dialog, container, false); okButton = (Button) view.findViewById(R.id.overview_newtempbasal_okbutton); basalPercentEdit = (EditText) view.findViewById(R.id.overview_newtempbasal_basalpercentinput); basalAbsoluteEdit = (EditText) view.findViewById(R.id.overview_newtempbasal_basalabsoluteinput); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java index 6ea7c3a92f..98a2f1cb37 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java @@ -31,7 +31,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.overview_newtreatment_fragment, null, false); + View view = inflater.inflate(R.layout.overview_newtreatment_dialog, null, false); deliverButton = (Button) view.findViewById(R.id.treatments_newtreatment_deliverbutton); 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 594f88d4ee..2c0c91eec9 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 @@ -27,6 +27,8 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.IobTotal; import info.nightscout.client.data.NSProfile; import info.nightscout.utils.*; +// TODO: wizard upload top NS calculation +// TODO: add carbtime public class WizardDialog extends DialogFragment implements OnClickListener { Button wizardDialogDeliverButton; @@ -78,7 +80,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.overview_wizard_fragment, null, false); + View view = inflater.inflate(R.layout.overview_wizard_dialog, null, false); wizardDialogDeliverButton = (Button) view.findViewById(R.id.treatments_wizard_deliverButton); wizardDialogDeliverButton.setOnClickListener(this); diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml index f515ea73dd..a6c12858e9 100644 --- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml +++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml @@ -25,13 +25,13 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -142,13 +142,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -203,13 +203,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -264,13 +264,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -324,13 +324,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -386,13 +386,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -446,13 +446,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -506,13 +506,13 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> diff --git a/app/src/main/res/layout/overview_newtempbasal_fragment.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml similarity index 100% rename from app/src/main/res/layout/overview_newtempbasal_fragment.xml rename to app/src/main/res/layout/overview_newtempbasal_dialog.xml index 23ccf0b904..81b64f0da9 100644 --- a/app/src/main/res/layout/overview_newtempbasal_fragment.xml +++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml @@ -57,13 +57,13 @@ @@ -81,13 +81,13 @@ android:gravity="center_horizontal" /> @@ -103,13 +103,13 @@ @@ -127,13 +127,13 @@ android:gravity="center_horizontal" /> diff --git a/app/src/main/res/layout/overview_newtreatment_fragment.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml similarity index 100% rename from app/src/main/res/layout/overview_newtreatment_fragment.xml rename to app/src/main/res/layout/overview_newtreatment_dialog.xml index a74ad64cc4..b95b333b74 100644 --- a/app/src/main/res/layout/overview_newtreatment_fragment.xml +++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml @@ -21,13 +21,13 @@ android:orientation="horizontal"> @@ -68,13 +68,13 @@ android:layout_gravity="center_horizontal"> diff --git a/app/src/main/res/layout/overview_wizard_fragment.xml b/app/src/main/res/layout/overview_wizard_dialog.xml similarity index 77% rename from app/src/main/res/layout/overview_wizard_fragment.xml rename to app/src/main/res/layout/overview_wizard_dialog.xml index c2278357f7..82dc753c24 100644 --- a/app/src/main/res/layout/overview_wizard_fragment.xml +++ b/app/src/main/res/layout/overview_wizard_dialog.xml @@ -1,428 +1,425 @@ - + android:orientation="vertical" + android:padding="10dp"> + android:layout_height="wrap_content" + android:orientation="horizontal"> + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:inputType="numberDecimal" + android:padding="10dp" + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:text="mg/dl" + android:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_height="wrap_content" + android:orientation="horizontal"> + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:inputType="numberDecimal" + android:minWidth="200dp" + android:padding="10dp" + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:text="g" + android:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_height="wrap_content" + android:orientation="horizontal"> + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:inputType="numberSigned|numberDecimal" + android:minWidth="200dp" + android:padding="10dp" + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> + android:text="@string/treatments_wizard_unit_label" + android:textAppearance="?android:attr/textAppearanceSmall" /> + android:layout_gravity="center" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + android:textAppearance="?android:attr/textAppearanceSmall" /> + android:textAppearance="?android:attr/textAppearanceSmall" /> + android:gravity="end" + android:textAppearance="?android:attr/textAppearanceSmall" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -