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

DT @12.09.2015: Refactored, report activity extended

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-12 19:42:18 +02:00
parent 788793d61c
commit 7667064583
23 changed files with 441 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,54 +9,54 @@
tools:context=".MainActivity">
<RelativeLayout
android:id="@+id/content"
android:id="@+id/rl_main_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/textView1"
android:id="@+id/lbl_main_txt1"
android:text="@string/lbl_main_txt1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="We have currently ..."
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="52dp"
android:textColor="@color/white"/>
<TextView
android:id="@+id/txt_incidents"
android:id="@+id/txt_main_incidents"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="0"
android:layout_marginTop="38dp"
android:layout_below="@+id/textView1"
android:layout_below="@+id/lbl_main_txt1"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/textView2"
android:id="@+id/lbl_main_txt2"
android:text="@string/lbl_main_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="... reported incidents"
android:layout_marginTop="34dp"
android:textColor="@color/white"
android:layout_below="@+id/txt_incidents"
android:layout_below="@+id/txt_main_incidents"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/textView3"
android:id="@+id/lbl_main_share"
android:text="@string/lbl_main_share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Contribute and share your information"
android:layout_above="@+id/LinearLayout02"
android:layout_above="@+id/ll_01"
android:layout_centerHorizontal="true"
android:layout_marginBottom="26dp" />
<LinearLayout
android:id="@+id/LinearLayout02"
android:id="@+id/ll_01"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -67,23 +67,24 @@
android:layout_marginBottom="43dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_report"
android:id="@+id/btn_main_report"
android:text="@string/btn_main_report"
android:layout_weight="1"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Report" android:layout_weight="1"
bootstrap:bb_icon_left="fa-map-marker"
bootstrap:bb_type="danger"
bootstrap:bb_roundedCorners="true" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_view_map"
android:id="@+id/btn_main_viewmap"
android:text="@string/btn_main_viewmap"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_weight="1"
android:text="View Map"
bootstrap:bb_icon_left="fa-info"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>