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

23
app/src/main/res/layout/activity_maps.xml
View File

@@ -1,6 +1,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
@@ -22,13 +23,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<fragment
android:id="@+id/frag_maps_map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MapsActivity" />
tools:context=".MapsActivity" >
</fragment>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:tint="@color/white"
android:src="@android:drawable/ic_input_add"
app:layout_anchor="@+id/frag_maps_map"
android:layout_marginLeft="15dp"
android:layout_marginBottom="50dp"
app:layout_anchorGravity="bottom|left|end"
android:layout_alignParentBottom="true"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_maps_confirm_position"
@@ -40,8 +54,11 @@
bootstrap:bootstrapBrand="danger"
bootstrap:bootstrapText="@string/btn_maps_confirm_position"
bootstrap:roundedCorners="true" />
</RelativeLayout>
</RelativeLayout>

19
app/src/main/res/layout/activity_report_wf.xml
View File

@@ -1,4 +1,5 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -34,14 +35,26 @@
android:id="@+id/fragment_reportwf"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal" >
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:clickable="true"
android:src="@android:drawable/ic_dialog_map"
app:layout_anchor="@+id/layoutStatus"
app:layout_anchorGravity="top|right|end"
android:layout_gravity="right|bottom" />
</FrameLayout>
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:padding="5dp"
android:textSize="50dp"
bootstrap:bootstrapBrand="success"

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

20
app/src/main/res/layout/fragment_reportwf_1.xml
View File

@@ -57,7 +57,6 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:visibility="invisible"
android:hint="Please enter your info here"
android:id="@+id/txt_reportwf_1_cat_etc"
android:layout_below="@id/dd_reportwf_1_cat_sub" />
@@ -80,28 +79,17 @@
android:textColor="@color/bg_common" />
<TextView
android:layout_width="200dp"
android:layout_width="250dp"
android:layout_height="70dp"
android:background="@drawable/layout_bg"
android:hint="No position choosen yet"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_reportwf_position_detail"
android:layout_alignTop="@+id/btn_reportwf_position"
android:layout_toRightOf="@+id/btn_reportwf_position"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_position"
android:layout_marginTop="3dp"
bootstrap:bootstrapText="@string/btn_report_position"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
bootstrap:bootstrapSize="lg"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
</RelativeLayout>

2
app/src/main/res/layout/fragment_reportwf_2.xml
View File

@@ -63,7 +63,6 @@
android:id="@+id/lbl_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dd_report_category"
android:layout_marginTop="10dp"
android:text="@string/lbl_report_from_date" />
@@ -111,7 +110,6 @@
android:id="@+id/lbl_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dd_report_category"
android:layout_marginTop="10dp"
android:text="@string/lbl_report_to_date" />

1
app/src/main/res/layout/fragment_reportwf_3.xml
View File

@@ -57,7 +57,6 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:visibility="invisible"
android:hint="Please enter your info here"
android:id="@+id/txt_reportwf_3_suspect_etc"
android:layout_gravity="center_horizontal" />

14
app/src/main/res/layout/map_info_window.xml
View File

@@ -16,7 +16,7 @@
android:layout_marginRight="10dp"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_category"
android:text="Headerfffffffffffffffffffffffffffffffff"
android:text="Loading Header..."
android:textSize="18dp"
android:paddingLeft="30dp"
android:typeface="serif"
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:typeface="serif"
android:textColor="#b9000000"
android:text="subcategory"
android:text="Loading subcategory..."
android:paddingTop="10dp"
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_subcategory"
@@ -60,7 +60,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="subject"
android:text="Loading subject..."
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_subject"
android:typeface="serif" />
@@ -69,7 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="victim"
android:text="Loading victim..."
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_victim"
android:typeface="serif" />
@@ -78,7 +78,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="time"
android:text="Loading time..."
android:paddingLeft="5dp"
android:paddingBottom="10dp"
android:id="@+id/txt_infowindow_time"
@@ -96,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="username"
android:text="Loading username..."
android:id="@+id/txt_infowindow_fromuser"
android:typeface="serif" />
@@ -104,7 +104,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="points:"
android:text="Loading points..."
android:id="@+id/txt_infowindow_points"
android:typeface="serif" />