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

DT @12.12.2015: Report-Workflow weiterentwickelt (noch nicht fertig), MapInfoWindow verändert, etc...

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-13 00:34:50 +01:00
parent 69a4493dc4
commit 2885d5b108
25 changed files with 930 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
tools:context=".MainActivity">
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -53,7 +53,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"

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

@@ -8,7 +8,7 @@
tools:context="org.deke.risk.riskahead.MapsActivity">
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent" >

6
app/src/main/res/layout/activity_profile.xml
View File

@@ -9,13 +9,13 @@
tools:context=".ProfileActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:background="@drawable/layout_bg"
android:layout_height="wrap_content"
@@ -178,7 +178,7 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"

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

@@ -14,13 +14,13 @@
android:layout_width="0px" android:layout_height="0px"/>
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="15dp"
@@ -170,7 +170,7 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"

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

@@ -8,54 +8,75 @@
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
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
<LinearLayout
android:id="@+id/layoutContent"
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/layoutStatus"
android:background="#0f4845ff"
android:layout_height="wrap_content"
android:id="@+id/fragment_reportwf"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:animateLayoutChanges="true"
android:layout_weight="0">
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="50dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutFooter"
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>
<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"

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

@@ -8,7 +8,7 @@
tools:context=".ReportlistActivity">
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"

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

@@ -9,13 +9,13 @@
tools:context=".SettingsActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -136,7 +136,7 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"

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

@@ -18,7 +18,7 @@
android:background="#00ffffff" />
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_alignParentBottom="true">

4
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -8,13 +8,13 @@
tools:context=".SubscriptionsActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"

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

@@ -9,7 +9,7 @@
tools:context=".ViewReportActivity">
<LinearLayout
android:id="@+id/linearLayout1"
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
@@ -21,7 +21,7 @@
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_main_content"
android:id="@+id/layoutContent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
@@ -216,7 +216,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"

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

@@ -9,7 +9,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@@ -108,26 +108,5 @@
</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"
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" />
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -9,7 +9,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_01"
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
@@ -151,22 +151,5 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_01_02"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:gravity="center"
android:layout_marginBottom="0dp">
<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>

67
app/src/main/res/layout/fragment_reportwf_3.xml Normal file
View File

@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<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:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:gravity="center"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/layoutSubContent"
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_3_question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:text="Who is the suspect?"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />
<Spinner
android:id="@+id/dd_reportwf_3_suspect"
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_3_suspect_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"/>
<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"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@@ -1,14 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="150dp"
android:layout_width="250dp"
android:minWidth="200dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="7dp"
android:paddingRight="5dp"
android:paddingTop="3dp"
android:paddingBottom="13dp"
android:orientation="vertical"
android:paddingLeft="6dp"
android:paddingRight="7dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@drawable/infowindow">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_title"
android:text="Header"
android:textSize="18dp"
android:paddingLeft="30dp"
android:typeface="serif" />
<LinearLayout
android:orientation="horizontal"
android:id="@+id/lay_infowindow_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="horizontal"
android:id="@+id/lay_infowindow_color"
@@ -19,25 +36,17 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="144dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_title"
android:text="Header"
android:textSize="16dp"
android:paddingLeft="5dp"
android:typeface="serif" />
<TextView
android:layout_width="120dp"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:typeface="serif"
android:textColor="#b9000000"
android:text="Textabfdfdgregreger"
android:paddingTop="10dp"
android:paddingLeft="5dp"
android:id="@+id/txt_infowindow_description"
android:singleLine="true"
@@ -57,11 +66,10 @@
<LinearLayout
android:orientation="vertical"
android:id="@+id/lay_infowindow_2"
android:background="#55151515"
android:background="#55ababab"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="3dp"
>
android:padding="3dp">
<TextView
android:layout_width="match_parent"
@@ -89,5 +97,6 @@
android:rating = "0"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/menu/menu_reportwf.xml
View File

@@ -2,12 +2,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item android:id="@+id/btn_reportwf_new"
<item android:id="@+id/menu_btn_gotostart"
android:title="New Report"
android:icon="@drawable/ic_action_reply_all"
app:showAsAction="always"/>
<item android:id="@+id/btn_reportwf_back"
<item android:id="@+id/menu_btn_goback"
android:title="New Report"
android:icon="@drawable/ic_action_reply"
app:showAsAction="always"/>

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

@@ -207,7 +207,21 @@
<item>Nachts</item>
</string-array>
<string-array name="cat_suspect_main">
<item>Straßenkriminelle/Gangs</item>
<item>Polizei</item>
<item>Volksmenge</item>
<item>Miliz, Kartell, Guerilla (Paramilitär)</item>
<item>Soldaten (Militär)</item>
<item>Terroristen (religiöse oder politische)</item>
<item>Sonstige:…</item>
<item>Weiß ich nicht</item>
</string-array>
<string-array name="cat_suspect_sub_location">
<item>Lokale aus dem Land (National)</item>
<item>Ausländische</item>
</string-array>
</resources>