DT @03.01.2016: Finished ViewReport Activity and worked on SettingsActivity

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

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>