DT @2.11.2015: Vote Functions implemented. Deactive incident now possible (but has to be tested).

This commit is contained in:
Dennis Thießen
2015-11-02 22:44:48 +01:00
parent c050980797
commit ea40208fdb
5 changed files with 271 additions and 24 deletions

View File

@@ -151,6 +151,17 @@
android:layout_alignStart="@+id/lbl_viewreport_position"
android:editable="false"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_viewreport_position"
bootstrap:bootstrapText="@string/btn_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_marginTop="7dp"
android:layout_alignTop="@+id/lbl_viewreport_position"
android:layout_alignRight="@+id/input_viewreport_time"
android:layout_alignEnd="@+id/input_viewreport_time" />
<TextView
android:layout_width="wrap_content"
@@ -216,15 +227,14 @@
android:layout_alignParentStart="true"
android:layout_marginBottom="0dp">
<Button
android:text="Edit"
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_viewreport_delete"
bootstrap:bootstrapText="@string/btn_viewreport_delete"
android:minWidth="300dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:text="Delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
</LinearLayout>

View File

@@ -65,7 +65,7 @@
<string name="lbl_report_category">Crime Category</string>
<string name="lbl_report_time">Time </string>
<string name="lbl_report_date">Date (yyyy-mm-dd)</string>
<string name="btn_viewreport_delete">Delete Report</string>
<string name="lbl_settings_name">Name</string>
<string name="lbl_settings_surname">Surname</string>
<string name="lbl_settings_email">E-Mail</string>