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

DT @08.12.2015: Report-Workflow komplett überarbeitet -> noch in entwicklung!

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-08 22:57:52 +01:00
parent e1dc4d624a
commit 6b6f3a8340
25 changed files with 1141 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
style="@style/CustomActionBarTheme"
android:id="@+id/drawer_layout"
android:background="@color/bg_common_2"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -37,8 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_centerHorizontal="true"
android:textSize="40dp" />
android:textSize="40sp" />
<TextView
android:id="@+id/lbl_main_txt2"
@@ -47,8 +47,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="#aa999999"
android:layout_centerHorizontal="true" />
android:textColor="#aa999999"/>
</LinearLayout>
@@ -70,20 +69,22 @@
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
bootstrap:bootstrapText="@string/btn_main_report"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_main_viewmap"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
bootstrap:bootstrapText="@string/btn_main_viewmap"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
</LinearLayout>
</RelativeLayout>

5
app/src/main/res/layout/activity_report.xml
View File

@@ -35,8 +35,6 @@
android:layout_alignLeft="@+id/input_report_short"
android:layout_alignStart="@+id/input_report_short"/>
<EditText
android:id="@+id/input_report_short"
android:hint="@string/input_report_short_hint"
@@ -189,8 +187,7 @@
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

69
app/src/main/res/layout/activity_report_wf.xml Normal file
View File

@@ -0,0 +1,69 @@
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@color/bg_common_2"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearLayout1"
android:animateLayoutChanges="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/fragment_reportwf"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_reportnow"
bootstrap:bootstrapText="Report NOW!"
android:layout_width="0dp"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="danger"
android:layout_weight="1" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_next"
bootstrap:bootstrapText="Continue"
android:layout_height="wrap_content"
android:layout_width="0dp"
bootstrap:bootstrapBrand="success"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff"/>
</android.support.v4.widget.DrawerLayout>

14
app/src/main/res/layout/contact_spinner_row_nothing_selected.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle"
android:layout_width="300dp"
android:layout_height="50dp"
android:maxLength="30"
android:gravity="left|center"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:textSize="18sp"
android:textColor="#808080"
android:text="Please select..." />

68
app/src/main/res/layout/fragment_reportwf_1.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:padding="0dip"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout android:id="@+id/menu_ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:animateLayoutChanges="true">
<TextView
android:id="@+id/lbl_reportwf_1_question"
android:layout_centerHorizontal="true"
android:text="What happened?"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:maxLength="10"
android:background="@drawable/dropbox_2"
android:id="@+id/dd_reportwf_1_cat_main"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
android:layout_below="@id/lbl_reportwf_1_question"/>
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:maxLength="10"
android:background="@drawable/dropbox_2"
android:id="@+id/dd_reportwf_1_cat_sub"
android:spinnerMode="dropdown"
android:layout_below="@id/dd_reportwf_1_cat_main"/>
<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"/>
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atv_reportwf_1_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="80dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o"
android:layout_alignTop="@+id/txt_reportwf_1_cat_etc"
android:layout_centerHorizontal="true"
android:layout_marginTop="19dp" />
</RelativeLayout>
</ScrollView>

148
app/src/main/res/layout/fragment_reportwf_2.xml Normal file
View File

@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout android:id="@+id/menu_ll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:padding="5dp"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_2_question"
android:text="When did it happen?"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common"
android:layout_gravity="center_horizontal" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:id="@+id/dd_reportwf_2_time_main"
android:layout_gravity="center_horizontal" />
<Spinner
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:id="@+id/dd_reportwf_2_time_sub"
android:layout_gravity="center_horizontal" />
<RelativeLayout
android:id="@+id/ll_report_from_time"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_report_from_date"
android:text="@string/lbl_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/dd_report_category" />
<TextView
android:id="@+id/lbl_report_from_time"
android:text="@string/lbl_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/input_report_from_time"
android:layout_alignLeft="@+id/input_report_from_time"
android:layout_alignStart="@+id/input_report_from_time"/>
<EditText
android:id="@+id/input_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:layout_marginRight="5dp"
android:ems="10"
android:layout_below="@+id/lbl_report_from_date"
android:layout_alignLeft="@+id/lbl_report_from_date"
android:layout_alignStart="@+id/lbl_report_from_date"
android:focusable="false"/>
<EditText
android:id="@+id/input_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/input_report_from_date"
android:layout_toRightOf="@+id/input_report_from_date"
android:layout_toEndOf="@+id/input_report_from_date"
android:focusable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_report_to_time"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_report_to_date"
android:text="@string/lbl_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/dd_report_category" />
<TextView
android:id="@+id/lbl_report_to_time"
android:text="@string/lbl_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/input_report_to_time"
android:layout_alignLeft="@+id/input_report_to_time"
android:layout_alignStart="@+id/input_report_to_time"/>
<EditText
android:id="@+id/input_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:layout_marginRight="5dp"
android:ems="10"
android:layout_below="@+id/lbl_report_to_date"
android:layout_alignLeft="@+id/lbl_report_to_date"
android:layout_alignStart="@+id/lbl_report_to_date"
android:focusable="false"/>
<EditText
android:id="@+id/input_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/input_report_to_date"
android:layout_toRightOf="@+id/input_report_to_date"
android:layout_toEndOf="@+id/input_report_to_date"
android:focusable="false"/>
</RelativeLayout>
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atv_reportwf_2_finish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="80dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</ScrollView>

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

@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="200dp"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:background="@drawable/layout_bg">
android:padding="1dp"
android:background="#CCc9c9c9">
<LinearLayout
android:orientation="horizontal"
android:id="@+id/lay_infowindow_color"
android:background="#e45151"
android:layout_width="5dp"
android:layout_marginRight="3dp"
android:layout_height="match_parent">
</LinearLayout>
@@ -28,6 +27,7 @@
android:id="@+id/txt_infowindow_title"
android:text="Header"
android:textSize="16dp"
android:paddingLeft="5dp"
android:typeface="serif" />
<TextView
@@ -35,6 +35,7 @@
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Long Text"
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_description"
android:typeface="serif" />
@@ -43,7 +44,7 @@
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Category"
android:paddingLeft="5dp"
android:paddingBottom="10dp"
android:id="@+id/txt_infowindow_category"
android:typeface="serif" />
@@ -53,7 +54,7 @@
android:id="@+id/lay_infowindow_2"
android:background="#55151515"
android:layout_width="match_parent"
android:layout_marginRight="5dp"
android:padding="3dp"
android:layout_height="match_parent">
<TextView