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

DT @03.01.2016: Finished ViewReport Activity and worked on SettingsActivity

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-03 21:13:12 +01:00
parent 014daab5c3
commit 2bec883a46
21 changed files with 631 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/drawable/fragment_reportwf_finish_button.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_report" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_report_pressed" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_report_pressed" />
<item android:drawable="@drawable/btn_report" />
</selector>

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

@@ -62,6 +62,16 @@
</LinearLayout>
<TextView
android:id="@+id/lbl_reportwf_site"
android:text="1/1"
android:layout_alignParentRight="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_margin="5dp"
android:textColor="@color/bg_common" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_reportwf_map"
android:layout_width="wrap_content"

25
app/src/main/res/layout/activity_settings.xml
View File

@@ -49,33 +49,30 @@
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_settings_username">
<EditText
android:id="@+id/txt_settings_name"
android:hint="@string/lbl_settings_name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="8"
/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_settings_surname"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/til_settings_name"
android:layout_below="@+id/til_settings_username">
android:layout_below="@+id/til_settings_name">
<EditText
android:id="@+id/txt_settings_surname"
android:hint="@string/lbl_settings_surname"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="8"
android:layout_alignBottom="@+id/til_settings_name"
android:layout_toRightOf="@+id/til_settings_name"
android:layout_toEndOf="@+id/til_settings_name" />
@@ -86,7 +83,7 @@
android:id="@+id/til_settings_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_settings_name">
android:layout_below="@+id/til_settings_surname">
<EditText
android:id="@+id/txt_settings_email"
@@ -104,24 +101,16 @@
android:layout_height="wrap_content"
android:layout_below="@+id/til_settings_email">
<EditText
android:id="@+id/txt_settings_password"
android:hint="@string/lbl_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="8" />
</android.support.design.widget.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_alignBottom="@+id/til_settings_password"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />

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

@@ -23,19 +23,23 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
android:layout_weight="1">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/svlayoutContent"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:layout_weight="1"
android:orientation="vertical">
android:layout_marginRight="45dp"
android:layout_weight="1">
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentcategory"
@@ -66,49 +70,166 @@
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/lbl_viewreport_position"
android:text="@string/lbl_report_position"
android:layout_width="wrap_content"
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentposition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/til_viewreport_incidentsubcategory" />
android:layout_below="@+id/til_viewreport_incidentsubcategory">
<EditText
android:id="@+id/txt_viewreport_position"
android:hint="@string/lbl_report_position"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_viewreport_position"
android:layout_marginTop="3dp"
bootstrap:bootstrapText="@string/btn_report_position"
android:layout_below="@+id/lbl_viewreport_position"
android:layout_width="wrap_content"
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
bootstrap:bootstrapSize="lg"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
android:layout_below="@+id/til_viewreport_incidentposition">
<EditText
android:id="@+id/txt_viewreport_time"
android:hint="@string/lbl_viewreport_time"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/txt_viewreport_position"
android:layout_width="wrap_content"
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_suspect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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" />
android:layout_below="@+id/til_viewreport_time">
<EditText
android:id="@+id/txt_viewreport_suspect"
android:hint="@string/lbl_viewreport_suspect"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_suspectweapon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_suspect">
<EditText
android:id="@+id/txt_viewreport_suspectweapon"
android:hint="@string/lbl_viewreport_suspectweapon"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_suspectcount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_suspectweapon">
<EditText
android:id="@+id/txt_viewreport_suspectcount"
android:hint="@string/lbl_viewreport_suspectcount"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_victim"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_suspectcount">
<EditText
android:id="@+id/txt_viewreport_victim"
android:hint="@string/lbl_viewreport_victim"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_victimorigin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_victim">
<EditText
android:id="@+id/txt_viewreport_victimorigin"
android:hint="@string/lbl_viewreport_victimorigin"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_suspecttransport"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_victimorigin">
<EditText
android:id="@+id/txt_viewreport_suspecttransport"
android:hint="@string/lbl_viewreport_suspecttransport"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_victimaff"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_suspecttransport">
<EditText
android:id="@+id/txt_viewreport_victimaff"
android:hint="@string/lbl_viewreport_victimaff"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_suspectrecon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_victimaff">
<EditText
android:id="@+id/txt_viewreport_suspectrecon"
android:hint="@string/lbl_viewreport_suspectrecon"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
</RelativeLayout>
</ScrollView>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="5dp"
android:orientation="vertical"
android:layout_weight="1"
android:layout_alignRight="@+id/svlayoutContent"
android:gravity="center"
android:background="#8a98b5c6">
@@ -141,8 +262,17 @@
bootstrap:fontAwesomeIcon="fa_angle_down" />
</RelativeLayout>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/btn_viewreport_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:clickable="true"
android:src="@android:drawable/ic_dialog_map" />
</RelativeLayout>
<LinearLayout
android:id="@+id/layoutFooter"
@@ -168,4 +298,5 @@
</LinearLayout>
</RelativeLayout>

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

@@ -91,7 +91,8 @@
android:id="@+id/lbl_reportwf_position_detail"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp" />
android:layout_marginLeft="20dp"
android:layout_marginBottom="50dp"/>
</RelativeLayout>

3
app/src/main/res/layout/fragment_reportwf_7.xml
View File

@@ -28,8 +28,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:layout_margin="20dp"
android:text="@string/lbl_question_count"
android:text="@string/lbl_question_victimorigin"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />

12
app/src/main/res/layout/fragment_reportwf_8.xml
View File

@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/lbl_question_etc_vehicle"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/bg_common" />
<Spinner
@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/lbl_question_etc_victimaff"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/bg_common" />
<Spinner
@@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/lbl_question_etc_recon"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/bg_common" />
<Spinner
@@ -150,17 +150,17 @@
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/lbl_question_etc_etc"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/bg_common" />
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_8_etc"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:layout_marginBottom="80dp"/>
</LinearLayout>
</LinearLayout>

83
app/src/main/res/layout/fragment_reportwf_finish.xml Normal file
View File

@@ -0,0 +1,83 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
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:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_final"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_margin="20dp"
android:text="Du hast alles ausgefüllt!"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutMainContent2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:textAlignment="center"
android:gravity="center"
android:orientation="vertical"
android:layout_weight="1">
<Button
android:id="@+id/btn_reportwf_finish_send"
style="?android:attr/borderlessButtonStyle"
android:layout_width="200dp"
android:layout_height="200dp"
android:background="@drawable/fragment_reportwf_finish_button"
android:text="Abschicken!"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutMainContent3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:textAlignment="center"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_reportwf_final_thanks"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textAlignment="center"
android:gravity="center"
android:layout_margin="20dp"
android:text="Wir danken dir für deine Unterstützung!"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/bg_common"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -44,13 +44,15 @@
<TextView
android:layout_width="180dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:typeface="serif"
android:textColor="#b9000000"
android:text="Loading subcategory..."
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:id="@+id/txt_infowindow_subcategory"
android:singleLine="true"
android:ellipsize="marquee"
@@ -62,8 +64,12 @@
android:textColor="#b9000000"
android:text="Loading subject..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:id="@+id/txt_infowindow_subject"
android:typeface="serif" />
android:typeface="serif"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"/>
<TextView
android:layout_width="match_parent"
@@ -71,7 +77,11 @@
android:textColor="#b9000000"
android:text="Loading victim..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:id="@+id/txt_infowindow_victim"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:typeface="serif" />
<TextView
@@ -80,8 +90,12 @@
android:textColor="#b9000000"
android:text="Loading time..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:paddingBottom="10dp"
android:id="@+id/txt_infowindow_time"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:typeface="serif" />
<LinearLayout
@@ -100,22 +114,30 @@
android:id="@+id/txt_infowindow_fromuser"
android:typeface="serif" />
<TextView
<LinearLayout
android:orientation="horizontal"
android:id="@+id/lay_infowindow_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Loading points..."
android:id="@+id/txt_infowindow_points"
android:typeface="serif" />
android:layout_height="match_parent">
<RatingBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/rb_infowindow_rating"
style="?android:attr/ratingBarStyleSmall"
android:stepSize="0.5"
android:numStars="5"
android:rating="0" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textColor="#b9000000"
android:text="@string/lbl_mapsinfowindow_score"
android:id="@+id/txt_infowindow_lblrating"
android:typeface="serif" />
<RatingBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/rb_infowindow_rating"
style="?android:attr/ratingBarStyleSmall"
android:stepSize="0.5"
android:numStars="5"
android:rating="0" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

18
app/src/main/res/values-de/strings.xml
View File

@@ -17,9 +17,6 @@
<string name="status_signing_in">Signing in...</string>
<string name="status_signing_out">Signing out...</string>
<string name="title_activity_start">RiskAhead</string>
<string name="title_activity_entrance">RiskAhead</string>
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>
@@ -28,6 +25,8 @@
<string name="search_hint">Location</string>
<string name="search_settings">Search Settings</string>
<string name="title_activity_start">RiskAhead</string>
<string name="title_activity_entrance">RiskAhead</string>
<string name="title_activity_base">Base</string>
<string name="title_activity_user_config">User Profile</string>
<string name="title_activity_maps">Risk Map</string>
@@ -36,6 +35,7 @@
<string name="title_activity_subscriptions">Subscriptions</string>
<string name="title_activity_view_report">View Report</string>
<string name="title_activity_reportlist">Report List</string>
<string name="title_activity_report_wf">Report Incident</string>
<string name="menu_action_about">About</string>
<string name="menu_action_language">Language</string>
@@ -112,9 +112,13 @@
<string name="errormsg_couldnotretrieve">Could not retrieve data from server. Please check internet connection.</string>
<string name="progress_getdata_text">Please wait...</string>
<string name="progress_getdata_title">Retrieve data from server</string>
<string name="lbl_mapsinfowindow_author">Author</string>
<string name="lbl_mapsinfowindow_score">Score</string>
<string name="title_activity_report_wf">Report NEW</string>
<string name="lbl_mapsinfowindow_author">Author:</string>
<string name="lbl_mapsinfowindow_score">Rating:</string>
<string name="lbl_mapsinfowindow_suspect">Suspect:</string>
<string name="lbl_mapsinfowindow_victim">Victim:</string>
<string name="lbl_mapsinfowindow_time">Time:</string>
<string name="lbl_spinner_choose">Please choose...</string>
<string name="lbl_report_from_date">From date (yyyy-MM-dd)</string>
@@ -138,6 +142,8 @@
<string name="lbl_question_etc_etc">Weiteres?</string>
<string name="cat_hint">Weitere Details...</string>
<string name="hint_place">Bitte wähle zunächst einen Ort auf der Karte aus</string>
<string name="lbl_viewreport_suspect">Suspect</string>
<string name="lbl_viewreport_victim">Victim</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>

21
app/src/main/res/values/strings.xml
View File

@@ -113,9 +113,13 @@
<string name="errormsg_couldnotretrieve">Could not retrieve data from server. Please check internet connection.</string>
<string name="progress_getdata_text">Please wait...</string>
<string name="progress_getdata_title">Retrieve data from server</string>
<string name="lbl_mapsinfowindow_author">Author</string>
<string name="lbl_mapsinfowindow_score">Score</string>
<string name="title_activity_report_wf">Report NEW</string>
<string name="title_activity_report_wf">Report Incident</string>
<string name="lbl_mapsinfowindow_author">Author:</string>
<string name="lbl_mapsinfowindow_score">Rating:</string>
<string name="lbl_mapsinfowindow_suspect">Suspect:</string>
<string name="lbl_mapsinfowindow_victim">Victim:</string>
<string name="lbl_mapsinfowindow_time">Time:</string>
<string name="lbl_spinner_choose">Please choose...</string>
<string name="lbl_report_from_date">From date (yyyy-MM-dd)</string>
@@ -140,6 +144,15 @@
<string name="lbl_question_etc_etc">Weiteres?</string>
<string name="cat_hint">Weitere Details...</string>
<string name="hint_place">Bitte wähle zunächst einen Ort auf der Karte aus</string>
<string name="lbl_viewreport_time">Time</string>
<string name="lbl_viewreport_suspect">Suspect</string>
<string name="lbl_viewreport_victim">Victim</string>
<string name="lbl_viewreport_suspectweapon">Weapons</string>
<string name="lbl_viewreport_suspectcount">Quantity</string>
<string name="lbl_viewreport_victimorigin">Origin of victim</string>
<string name="lbl_viewreport_suspecttransport">Vehicle</string>
<string name="lbl_viewreport_victimaff">Victim affiliation</string>
<string name="lbl_viewreport_suspectrecon">Suspect attributes</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
@@ -300,7 +313,5 @@
<item>Sonstiges…</item>
</string-array>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>