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

DT @02.01.2016: ReportWF refactored und erweitert. Kategorien in strings.xml hinzugefügt. InAppBillingService hinzugefügt (muss jedoch noch implementiert werden)

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-02 14:14:06 +01:00
parent ebfab3a534
commit 2f81bfa09d
26 changed files with 1106 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@
android:background="@color/btn_login_bg"
android:minWidth="120dp"
android:text="@string/btn_start_login"
android:textColor="@color/btn_login" />
android:textColor="@color/white" />
<TextView
android:id="@+id/lbl_login_policy"

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

@@ -72,7 +72,8 @@
<Button
android:id="@+id/btn_main_report"
android:layout_weight="1"
android:background="#651a1111"
android:background="@color/bg_common_trans"
android:textColor="@color/white"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"
@@ -85,7 +86,8 @@
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:paddingRight="10dp"
android:background="#651a1111"
android:textColor="@color/white"
android:background="@color/bg_common_trans"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Show Map" />

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

@@ -17,7 +17,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<LinearLayout
<RelativeLayout
android:id="@+id/layoutMain"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,53 +25,14 @@
android:animateLayoutChanges="true"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/layoutContent"
<FrameLayout
android:id="@+id/fragment_reportwf"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_weight="1"
android:layout_gravity="center_horizontal" >
<FrameLayout
android:id="@+id/fragment_reportwf"
android:layout_width="match_parent"
android:layout_height="match_parent"
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_centerInParent="true"
android:padding="5dp"
android:textSize="50dp"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o" />
</RelativeLayout>
<LinearLayout
android:id="@+id/layoutStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:animateLayoutChanges="true"
android:gravity="center_horizontal"
android:orientation="horizontal">
</LinearLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/layoutFooter"
@@ -101,7 +62,30 @@
</LinearLayout>
</LinearLayout>
<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:layout_above="@+id/layoutFooter"
android:layout_alignParentEnd="true"
android:clickable="true"
android:src="@android:drawable/ic_dialog_map" />
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/layoutFooter"
android:layout_centerInParent="true"
android:padding="5dp"
android:textSize="40dp"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o" />
</RelativeLayout>
</RelativeLayout>

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

@@ -140,7 +140,8 @@
<Button
android:id="@+id/btn_settings_change"
android:layout_weight="1"
android:background="#651a1111"
android:textColor="@color/white"
android:background="@color/bg_common_trans"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"

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

@@ -3,7 +3,7 @@
android:id="@android:id/text1"
style="?android:attr/spinnerItemStyle"
android:layout_width="150dp"
android:layout_height="47dp"
android:layout_height="45dp"
android:layout_margin="5dp"
android:gravity="left|center"
android:background="@drawable/dd_bg"

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

@@ -8,14 +8,14 @@
android:layout_width="match_parent"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:id="@+id/layoutMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:id="@+id/ll_01_01"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -27,7 +27,7 @@
<TextView
android:id="@+id/lbl_reportwf_1_question"
android:layout_centerHorizontal="true"
android:text="What happened?"
android:text="@string/lbl_question_situation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -37,6 +37,7 @@
<Spinner
android:id="@+id/dd_reportwf_1_cat_main"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -47,6 +48,7 @@
<Spinner
android:id="@+id/dd_reportwf_1_cat_sub"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -57,7 +59,8 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="Please enter your info here"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_1_cat_etc"
android:layout_below="@id/dd_reportwf_1_cat_sub" />
@@ -65,13 +68,14 @@
android:id="@+id/ll_pos"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_below="@+id/txt_reportwf_1_cat_etc"
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:text="@string/lbl_question_place"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -82,19 +86,16 @@
android:layout_width="250dp"
android:layout_height="70dp"
android:background="@drawable/layout_bg"
android:hint="No position choosen yet"
android:hint="@string/hint_place"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_reportwf_position_detail"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_centerInParent="true"
android:layout_marginLeft="20dp" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</ScrollView>

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

@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:text="When did it happen?"
android:text="@string/lbl_question_time"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />

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

@@ -30,13 +30,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:text="Who is the suspect?"
android:text="@string/lbl_question_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_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -47,6 +48,7 @@
<Spinner
android:id="@+id/dd_reportwf_3_suspect_sub"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
android:layout_width="300dp"
android:layout_height="52dp"
android:layout_margin="5dp"
@@ -57,7 +59,8 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:hint="Please enter your info here"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_3_suspect_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>

57
app/src/main/res/layout/fragment_reportwf_4.xml Normal file
View File

@@ -0,0 +1,57 @@
<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_4_question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="20dp"
android:text="@string/lbl_question_weapon"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />
<Spinner
android:id="@+id/dd_reportwf_4_weapon"
android:background="@drawable/dropdown_4"
android:layout_centerInParent="true"
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:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_4_weapon_etc"
android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</ScrollView>