caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Unbreak wizard xml, small fixes.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-04-15 19:29:23 +02:00
parent 447bd9b6a3
commit 58aa4f1323
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
View file

@ -212,7 +212,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
notesLayout = view.findViewById(R.id.treatments_wizard_notes_layout); 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); 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); bgTrend = (TextView) view.findViewById(R.id.treatments_wizard_bgtrend);
bgTrendInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bgtrendinsulin); bgTrendInsulin = (TextView) view.findViewById(R.id.treatments_wizard_bgtrendinsulin);

6
app/src/main/res/layout/actions_fill_dialog.xml
View file

@ -48,13 +48,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="Pump site change" /> android:text="@string/careportal_pumpsitechange" />
<CheckBox <CheckBox
android:id="@+id/fill_cartridge_change" android:id="@+id/fill_cartridge_change"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="Insulin cartridge change" /> android:text="@string/careportal_insulincartridgechange" />
</LinearLayout> </LinearLayout>
@ -141,7 +141,7 @@
android:id="@+id/fill_notes" android:id="@+id/fill_notes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text|textCapWords" /> android:inputType="text|textCapSentences" />
</LinearLayout> </LinearLayout>

3
app/src/main/res/layout/overview_newcarbs_dialog.xml
View file

@ -69,7 +69,6 @@
android:id="@+id/newcarbs_hypo_tt" android:id="@+id/newcarbs_hypo_tt"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="5dp"
android:text="@string/start_hypo_tt" /> android:text="@string/start_hypo_tt" />
</LinearLayout> </LinearLayout>
@ -216,7 +215,7 @@
android:id="@+id/newcarbs_notes" android:id="@+id/newcarbs_notes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text|textCapWords" /> android:inputType="text|textCapSentences" />
</LinearLayout> </LinearLayout>

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

@ -177,7 +177,7 @@
android:id="@+id/newcarbs_notes" android:id="@+id/newcarbs_notes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text|textCapWords" /> android:inputType="text|textCapSentences" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/overview_wizard_dialog.xml
View file

@ -216,12 +216,12 @@
android:textStyle="bold" /> android:textStyle="bold" />
<EditText <EditText
android:id="@+id/newcarbs_notes" android:id="@+id/treatment_wizard_notes"
android:layout_width="155dp" android:layout_width="155dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="left" android:gravity="left"
android:inputType="text|textCapWords" /> android:inputType="text|textCapSentences"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>