dennisthiessen/RiskAhead-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@DT: Changes over Christmas: Maps Performance improved, Report-WF changed, a lot of minor changes

Browse Source
This commit is contained in:
dennis
2015-12-28 08:55:39 +01:00
parent acf1eaa8b0
commit 2bc575a355
26 changed files with 970 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
app/src/main/res/layout/activity_view_report.xml
View File

@@ -37,103 +37,37 @@
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_viewreport_short"
android:text="@string/lbl_report_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/input_viewreport_short"
android:layout_alignStart="@+id/input_viewreport_short" />
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentcategory"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_viewreport_short"
android:inputType="text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:singleLine="true"
android:enabled="false"
android:layout_marginTop="20dp" />
<EditText
android:id="@+id/txt_viewreport_incidentcategory"
android:hint="@string/lbl_viewreport_incidentcategory"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/lbl_viewreport_long"
android:text="@string/lbl_report_long"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/input_viewreport_short" />
</android.support.design.widget.TextInputLayout>
<EditText
android:id="@+id/input_viewreport_long"
android:inputType="textMultiLine"
android:layout_width="fill_parent"
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentsubcategory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|left"
android:padding="10dp"
android:singleLine="true"
android:layout_below="@+id/lbl_viewreport_long"
android:scrollbars="vertical"
android:enabled="false"
android:minLines="1"
android:lines="4"
android:maxLines="4" />
android:layout_below="@+id/til_viewreport_incidentcategory">
<TextView
android:id="@+id/lbl_viewreport_category"
android:text="@string/lbl_report_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/input_viewreport_long" />
<EditText
android:id="@+id/txt_viewreport_incidentsubcategory"
android:hint="@string/lbl_viewreport_incidentsubcategory"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<EditText
android:id="@+id/input_viewreport_category"
android:enabled="false"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_viewreport_category" />
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/lbl_viewreport_date"
android:text="@string/lbl_report_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/input_viewreport_category" />
<TextView
android:id="@+id/lbl_viewreport_time"
android:text="@string/lbl_report_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/input_viewreport_time"
android:layout_alignLeft="@+id/input_viewreport_time"
android:layout_alignStart="@+id/input_viewreport_time" />
<EditText
android:id="@+id/input_viewreport_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:enabled="false"
android:ems="10"
android:layout_below="@+id/lbl_viewreport_date"
android:layout_alignLeft="@+id/lbl_viewreport_date"
android:layout_alignStart="@+id/lbl_viewreport_date"
android:focusable="false" />
<EditText
android:id="@+id/input_viewreport_time"
android:enabled="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/input_viewreport_date"
android:layout_toRightOf="@+id/input_viewreport_date"
android:layout_toEndOf="@+id/input_viewreport_date"
android:focusable="false" />
<TextView
android:id="@+id/lbl_viewreport_position"
@@ -141,21 +75,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/input_viewreport_date"
android:layout_alignLeft="@+id/input_viewreport_date"
android:layout_alignStart="@+id/input_viewreport_time" />
android:layout_below="@+id/til_viewreport_incidentsubcategory" />
<EditText
android:id="@+id/input_viewreport_position"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_viewreport_position"
android:layout_toRightOf="@+id/lbl_viewreport_category"
android:layout_toEndOf="@+id/lbl_viewreport_category"
android:editable="false" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_viewreport_position"
android:layout_marginTop="3dp"
@@ -169,15 +91,17 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/txt_viewreport_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_viewreport_position_detail"
android:layout_alignParentRight="true"
android:layout_below="@+id/input_viewreport_position"
android:layout_alignLeft="@+id/input_viewreport_position"
android:layout_alignStart="@+id/input_viewreport_position" />
android:layout_marginLeft="31dp"
android:layout_alignBaseline="@+id/btn_viewreport_position"
android:layout_alignBottom="@+id/btn_viewreport_position"
android:layout_toRightOf="@+id/lbl_viewreport_position"
android:layout_toEndOf="@+id/lbl_viewreport_position"
android:layout_marginStart="31dp" />
</RelativeLayout>
<RelativeLayout