Merge godot branch.v1.0

1 files changed, 0 insertions, 216 deletions

diff --git a/res/layout/fragment_new_entry.xml b/res/layout/fragment_new_entry.xml
deleted file mode 100755
index 350fd2a..0000000
--- a/res/layout/fragment_new_entry.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

-    xmlns:tools="http://schemas.android.com/tools"

-    android:id="@+id/NewEntryView"

-    android:layout_width="fill_parent"

-    android:layout_height="fill_parent"

-    android:paddingTop="@dimen/activity_vertical_margin"

-    tools:context=".MainActivity$NewEntryContext" >

-

-    <LinearLayout

-        android:layout_width="match_parent"

-        android:layout_height="wrap_content"

-        android:orientation="vertical" >

-

-        <EditText

-            android:id="@+id/nProcess"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/nProcess_str"

-            android:inputType="number" >

-

-            <requestFocus />

-        </EditText>

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="5dp" />

-

-        <DatePicker

-            android:id="@+id/datePicker"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:calendarViewShown="false" />

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="5dp" />

-

-        <EditText

-            android:id="@+id/nSurgery"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/nSurgery_str"

-            android:inputType="number" />

-

-        <Spinner

-            android:id="@+id/placeSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/place_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/placeOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/place_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/anesthesiaSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/anesthesia_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/anesthesiaOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/anesthesia_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/firstAiderSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/firstaider_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/firstAiderOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/firstaider_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/medTypeSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/type_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/medTypeOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/type_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/medSubTypeSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/subtype_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/medSubTypeOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/subtype_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/medSubSubTypeSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/subsubtype_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/medSubSubTypeOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/subsubtype_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/pathologySpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/pathology_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/pathologyOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/pathology_str"

-            android:inputType="textMultiLine" />

-

-        <Spinner

-            android:id="@+id/interventionSpinner"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:prompt="@string/intervention_str"

-            android:spinnerMode="dialog" />

-

-        <EditText

-            android:id="@+id/interventionOverride"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/intervention_str"

-            android:inputType="textMultiLine" />

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="5dp" />

-

-        <CheckBox

-            android:id="@+id/urgencyCheckBox"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:text="@string/urgency_str" />

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="5dp" />

-

-        <EditText

-            android:id="@+id/notesText"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:ems="10"

-            android:hint="@string/notes_str"

-            android:inputType="textMultiLine" />

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="25dp" />

-

-        <CheckBox

-            android:id="@+id/overrideCheckBox"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:text="@string/override_str" />

-

-        <Button

-            android:id="@+id/fillOverrideButton"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:text="@string/filloverride_str" />

-

-        <Space

-            android:layout_width="match_parent"

-            android:layout_height="25dp" />

-

-        <Button

-            android:id="@+id/saveButton"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:text="@string/save_str" />

-    </LinearLayout>

-

-</ScrollView>
\ No newline at end of file