From 58aa4f1323aeb91c64a0521f15c4c12bff76ce57 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Sun, 15 Apr 2018 19:29:23 +0200
Subject: [PATCH] Unbreak wizard xml, small fixes.

---
 .../androidaps/plugins/Overview/Dialogs/WizardDialog.java   | 2 +-
 app/src/main/res/layout/actions_fill_dialog.xml             | 6 +++---
 app/src/main/res/layout/overview_newcarbs_dialog.xml        | 3 +--
 app/src/main/res/layout/overview_newinsulin_dialog.xml      | 2 +-
 app/src/main/res/layout/overview_wizard_dialog.xml          | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

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 b988a368fc..edee0c838d 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
@@ -212,7 +212,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
 
         notesLayout = view.findViewById(R.id.treatments_wizard_notes_layout);
         notesLayout.setVisibility(SP.getBoolean(R.string.key_show_notes_entry_dialogs, false) ? View.VISIBLE : View.GONE);
-        notesEdit = (EditText) view.findViewById(R.id.newcarbs_notes);
+        notesEdit = (EditText) view.findViewById(R.id.treatment_wizard_notes);
 
         bgTrend = (TextView) view.findViewById(R.id.treatments_wizard_bgtrend);
         bgTrendInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bgtrendinsulin);
diff --git a/app/src/main/res/layout/actions_fill_dialog.xml b/app/src/main/res/layout/actions_fill_dialog.xml
index fa1bbd8b83..2883485bf7 100644
--- a/app/src/main/res/layout/actions_fill_dialog.xml
+++ b/app/src/main/res/layout/actions_fill_dialog.xml
@@ -48,13 +48,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginTop="5dp"
-                android:text="Pump site change" />
+                android:text="@string/careportal_pumpsitechange" />
 
             <CheckBox
                 android:id="@+id/fill_cartridge_change"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:text="Insulin cartridge change" />
+                android:text="@string/careportal_insulincartridgechange" />
 
         </LinearLayout>
 
@@ -141,7 +141,7 @@
                 android:id="@+id/fill_notes"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="text|textCapWords" />
+                android:inputType="text|textCapSentences" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_newcarbs_dialog.xml b/app/src/main/res/layout/overview_newcarbs_dialog.xml
index ae97eeaee6..8d0a12e5d2 100644
--- a/app/src/main/res/layout/overview_newcarbs_dialog.xml
+++ b/app/src/main/res/layout/overview_newcarbs_dialog.xml
@@ -69,7 +69,6 @@
                     android:id="@+id/newcarbs_hypo_tt"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginBottom="5dp"
                     android:text="@string/start_hypo_tt" />
 
             </LinearLayout>
@@ -216,7 +215,7 @@
                     android:id="@+id/newcarbs_notes"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="text|textCapWords" />
+                    android:inputType="text|textCapSentences" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_newinsulin_dialog.xml b/app/src/main/res/layout/overview_newinsulin_dialog.xml
index d5836f6b39..781ba60991 100644
--- a/app/src/main/res/layout/overview_newinsulin_dialog.xml
+++ b/app/src/main/res/layout/overview_newinsulin_dialog.xml
@@ -177,7 +177,7 @@
                     android:id="@+id/newcarbs_notes"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="text|textCapWords" />
+                    android:inputType="text|textCapSentences" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_wizard_dialog.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
index b91fbe5f0f..20fdef2ba4 100644
--- a/app/src/main/res/layout/overview_wizard_dialog.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -216,12 +216,12 @@
                 android:textStyle="bold" />
 
             <EditText
-                android:id="@+id/newcarbs_notes"
+                android:id="@+id/treatment_wizard_notes"
                 android:layout_width="155dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:gravity="left"
-                android:inputType="text|textCapWords" />
+                android:inputType="text|textCapSentences"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
         </LinearLayout>