DT @12.10.2015: Design changes, User Profile functions implemented

This commit is contained in:
Dennis Thießen
2015-10-12 14:10:58 +02:00
parent 270f24399a
commit 21a5a5f8ab
25 changed files with 264 additions and 152 deletions

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/bg_main2"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -13,81 +13,77 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/lbl_main_txt1"
android:text="@string/lbl_main_txt1"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="52dp"
android:textColor="@color/white"/>
android:gravity="center"
android:layout_marginTop="79dp"
android:layout_centerInParent="true">
<TextView
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:layout_marginTop="38dp"
android:layout_below="@+id/lbl_main_txt1"
android:layout_centerHorizontal="true" />
<TextView
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:layout_marginTop="52dp"
android:textColor="#8a999999"/>
<TextView
android:id="@+id/txt_main_incidents"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_centerHorizontal="true"
android:textSize="40dp" />
<TextView
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:layout_marginTop="34dp"
android:textColor="#8a999999"
android:layout_centerHorizontal="true" />
</LinearLayout>
<TextView
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:layout_marginTop="34dp"
android:textColor="@color/white"
android:layout_below="@+id/txt_main_incidents"
android:layout_centerHorizontal="true" />
<TextView
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:layout_above="@+id/ll_01"
android:layout_centerHorizontal="true"
android:layout_marginBottom="26dp" />
<LinearLayout
android:id="@+id/ll_01"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:gravity="center"
android:background="@color/white"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="43dp">
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
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"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bb_icon_left="fa-map-marker"
bootstrap:bb_type="danger"
bootstrap:bb_roundedCorners="true" />
android:layout_marginRight="20dp"
bootstrap:bootstrapText="@string/btn_main_report"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_main_viewmap"
android:text="@string/btn_main_viewmap"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_weight="1"
bootstrap:bb_icon_left="fa-info"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
bootstrap:bootstrapText="@string/btn_main_viewmap"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
</LinearLayout>
</RelativeLayout>