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

DT @22.09.2015: Bugfix und ReportActivity-Erweiterung

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-22 21:09:11 +02:00
parent 2ae10881b1
commit 2e74a4a5a3
7 changed files with 111 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_above="@+id/txt_report_time"
android:layout_alignLeft="@+id/txt_report_time"
android:layout_alignStart="@+id/txt_report_time"/>
android:layout_above="@+id/input_report_time"
android:layout_alignLeft="@+id/input_report_time"
android:layout_alignStart="@+id/input_report_time"/>
<EditText
android:id="@+id/txt_report_date"
android:id="@+id/input_report_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
@@ -102,16 +102,50 @@
android:focusable="false"/>
<EditText
android:id="@+id/txt_report_time"
android:id="@+id/input_report_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="time"
android:ems="10"
android:layout_alignBottom="@+id/txt_report_date"
android:layout_toRightOf="@+id/txt_report_date"
android:layout_toEndOf="@+id/txt_report_date"
android:layout_alignBottom="@+id/input_report_date"
android:layout_toRightOf="@+id/input_report_date"
android:layout_toEndOf="@+id/input_report_date"
android:focusable="false"/>
<TextView
android:id="@+id/lbl_report_position"
android:text="@string/lbl_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_below="@+id/input_report_date"
android:layout_alignLeft="@+id/input_report_date"
android:layout_alignStart="@+id/input_report_time"/>
<EditText
android:id="@+id/input_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:ems="10"
android:layout_below="@+id/lbl_report_position"
android:layout_alignLeft="@+id/lbl_report_position"
android:layout_alignStart="@+id/lbl_report_position"
android:editable="false"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_report_position"
android:text="@string/btn_report_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-search"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"
android:layout_marginTop="7dp"
android:layout_alignTop="@+id/lbl_report_position"
android:layout_alignRight="@+id/input_report_time"
android:layout_alignEnd="@+id/input_report_time" />
</RelativeLayout>

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

@@ -85,6 +85,8 @@
<string name="menu_action_about">About</string>
<string name="menu_action_help">Help</string>
<string name="menu_action_exit">Exit</string>
<string name="lbl_report_position">Position</string>
<string name="btn_report_position">Position</string>
<string-array name="incident_categories">
<item>Personal</item>