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

DT @11.12.2015: Report-Workflow weiterentwickelt (noch nicht fertig), Map-Icons hinzugefügt, Performance auf der Map verbessert, Theme angepasst

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-11 15:22:01 +01:00
parent 6b6f3a8340
commit 69a4493dc4
22 changed files with 767 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/layout_bg.xml
View File

@@ -3,5 +3,5 @@
<solid android:color="#CCdedede"/>
<stroke android:width="1dip" android:color="#66808080" />
<corners android:radius="3dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<padding android:left="5dip" android:top="5dip" android:right="5dip" android:bottom="5dip" />
</shape>

6
app/src/main/res/drawable/layout_bg_gradient.xml
View File

@@ -3,9 +3,9 @@
<item>
<shape>
<gradient
android:angle="90"
android:startColor="#d9d9d9"
android:endColor="#f2f2f2"
android:angle="-90"
android:startColor="#dbe1e1"
android:endColor="#afafaf"
android:type="linear" />
</shape>
</item>

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

@@ -2,7 +2,6 @@
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="@drawable/layout_bg_gradient"
android:layout_width="match_parent"

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

@@ -3,7 +3,7 @@
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:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ReportActivity">
@@ -24,8 +24,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="15dp"
android:layout_weight="1"
android:orientation="vertical">
android:layout_weight="1">
<TextView
android:id="@+id/lbl_report_short"

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

@@ -3,7 +3,7 @@
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:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent">

9
app/src/main/res/layout/contact_spinner_row_nothing_selected.xml
View File

@@ -2,12 +2,11 @@
<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_width="150dp"
android:layout_height="47dp"
android:layout_margin="5dp"
android:background="@drawable/dropdown_2"
android:gravity="left|center"
android:background="@drawable/dd_bg"
android:textSize="18sp"
android:textColor="#808080"
android:text="Please select..." />

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

@@ -1,57 +1,120 @@
<?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:fillViewport="true"
android:background="@drawable/layout_bg_gradient"
android:layout_height="match_parent"
android:layout_width="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">
<LinearLayout
android:id="@+id/ll_01"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical" >
<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" />
<LinearLayout
android:id="@+id/ll_01_01"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_weight="1"
android:animateLayoutChanges="true"
android:orientation="vertical">
<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"/>
<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_sub"
android:spinnerMode="dropdown"
android:layout_below="@id/dd_reportwf_1_cat_main"/>
<Spinner
android:id="@+id/dd_reportwf_1_cat_main"
android:background="@drawable/dropdown_4"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
android:layout_below="@id/lbl_reportwf_1_question"/>
<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"/>
<Spinner
android:id="@+id/dd_reportwf_1_cat_sub"
android:background="@drawable/dropdown_4"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
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"/>
<RelativeLayout
android:id="@+id/ll_pos"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_reportwf_1_question_2"
android:layout_centerHorizontal="true"
android:text="Can you tell us the place?"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common" />
<TextView
android:layout_width="200dp"
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_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>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_01_02"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:animateLayoutChanges="true"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atv_reportwf_1_finish"
@@ -64,5 +127,7 @@
android:layout_alignTop="@+id/txt_reportwf_1_cat_etc"
android:layout_centerHorizontal="true"
android:layout_marginTop="19dp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -1,148 +1,172 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:orientation="vertical">
<LinearLayout android:id="@+id/menu_ll"
<LinearLayout
android:id="@+id/ll_01"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:padding="5dp"
android:orientation="vertical">
android:gravity="center"
android:orientation="vertical" >
<TextView
android:id="@+id/lbl_reportwf_2_question"
android:text="When did it happen?"
<LinearLayout
android:id="@+id/ll_01_01"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_2_question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:text="When did it happen?"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />
<Spinner
android:id="@+id/dd_reportwf_2_time_main"
android:background="@drawable/dropdown_4"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
android:layout_gravity="center_horizontal" />
<Spinner
android:id="@+id/dd_reportwf_2_time_sub"
android:background="@drawable/dropdown_4"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
android:spinnerMode="dialog"
android:prompt="@string/lbl_spinner_choose"
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: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" />
<TextView
android:id="@+id/lbl_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/input_report_from_time"
android:layout_alignLeft="@+id/input_report_from_time"
android:layout_alignStart="@+id/input_report_from_time"
android:layout_marginTop="10dp"
android:text="@string/lbl_report_from_time"/>
<EditText
android:id="@+id/input_report_from_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/lbl_report_from_date"
android:layout_alignStart="@+id/lbl_report_from_date"
android:layout_below="@+id/lbl_report_from_date"
android:layout_marginRight="5dp"
android:ems="10"
android:focusable="false"
android:inputType="date"/>
<EditText
android:id="@+id/input_report_from_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/input_report_from_date"
android:layout_toEndOf="@+id/input_report_from_date"
android:layout_toRightOf="@+id/input_report_from_date"
android:ems="10"
android:focusable="false"
android:inputType="time"/>
</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: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" />
<TextView
android:id="@+id/lbl_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/input_report_to_time"
android:layout_alignLeft="@+id/input_report_to_time"
android:layout_alignStart="@+id/input_report_to_time"
android:layout_marginTop="10dp"
android:text="@string/lbl_report_to_time"/>
<EditText
android:id="@+id/input_report_to_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/lbl_report_to_date"
android:layout_alignStart="@+id/lbl_report_to_date"
android:layout_below="@+id/lbl_report_to_date"
android:layout_marginRight="5dp"
android:ems="10"
android:focusable="false"
android:inputType="date"/>
<EditText
android:id="@+id/input_report_to_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/input_report_to_date"
android:layout_toEndOf="@+id/input_report_to_date"
android:layout_toRightOf="@+id/input_report_to_date"
android:ems="10"
android:focusable="false"
android:inputType="time"/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_01_02"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_margin="20dp"
android:textColor="@color/bg_common"
android:layout_gravity="center_horizontal" />
android:animateLayoutChanges="true"
android:gravity="center"
android:layout_marginBottom="0dp">
<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" />
<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" />
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -3,8 +3,11 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="1dp"
android:background="#CCc9c9c9">
android:paddingLeft="7dp"
android:paddingRight="5dp"
android:paddingTop="3dp"
android:paddingBottom="13dp"
android:background="@drawable/infowindow">
<LinearLayout
android:orientation="horizontal"
@@ -12,16 +15,15 @@
android:background="#e45151"
android:layout_width="5dp"
android:layout_height="match_parent">
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_width="144dp"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_title"
@@ -31,16 +33,19 @@
android:typeface="serif" />
<TextView
android:layout_width="wrap_content"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:typeface="serif"
android:textColor="#b9000000"
android:text="Long Text"
android:text="Textabfdfdgregreger"
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_description"
android:typeface="serif" />
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"/>
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Category"
@@ -54,11 +59,12 @@
android:id="@+id/lay_infowindow_2"
android:background="#55151515"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="3dp"
android:layout_height="match_parent">
>
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Username"
@@ -66,7 +72,7 @@
android:typeface="serif" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Points:"

11
app/src/main/res/values/colors.xml
View File

@@ -2,8 +2,15 @@
<color name="bg_login">#26ae90</color>
<color name="bg_register">#2e3237</color>
<color name="bg_common_2">#ececec</color>
<color name="bg_common">#0461A8</color>
<color name="bg_common">#1175b7</color>
<color name="bg_common_2">#0461a8</color>
<color name="common_text">#333333</color>
<color name="actionbar_text">#fdfdfd</color>
<color name="white">#ffffff</color>
<color name="title">#ffffff</color>
<color name="red">#ff0000</color>

24
app/src/main/res/values/styles.xml
View File

@@ -5,24 +5,16 @@
<item name="android:layout_marginRight">@dimen/micro_padding</item>
</style>
<style name="CustomActionBarTheme" parent="@style/Theme.AppCompat.Light">
<item name="android:actionBarStyle" tools:ignore="NewApi">@style/MyActionBar</item>
<item name="actionBarStyle">@style/MyActionBar</item>
<item name="actionBarTheme">@style/MyActionBarTheme</item>
<style name="MyRiskAheadTheme" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/bg_common</item>
<item name="android:textColorPrimary">@color/actionbar_text</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<item name="android:textColor">@color/common_text</item>
<item name="android:editTextStyle">@style/App_EditTextStyle</item>
</style>
<style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background" tools:ignore="NewApi">@color/white</item>
<item name="titleTextStyle">@style/MyActionBar.ActionBar.TitleTextStyle</item>
<item name="background">@color/bg_common</item>
<style name="App_EditTextStyle" parent="@android:style/Widget.EditText">
<item name="android:textColor">@color/common_text</item>
</style>
<style name="MyActionBarTheme" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="actionMenuTextColor">@color/title</item>
<item name="colorControlNormal">@color/title</item>
</style>
<style name="MyActionBar.ActionBar.TitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/title</item>
</style>
</resources>