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

DT @06.09.2015: Reset Password, Activation Link and Main Page included

Browse Source
This commit is contained in:
Dennis Thießen
2015-09-06 15:37:42 +02:00
parent d4937df616
commit 89ce650489
12 changed files with 430 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/activity_login.xml
View File

@@ -13,6 +13,9 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:textSize="20sp"
android:typeface="sans"
android:textStyle="bold"
android:id="@+id/hello" />
@@ -117,6 +120,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onClick"
android:clickable="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/txt_resend_password"
android:id="@+id/txt_resend_password"

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

@@ -1,7 +1,9 @@
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/vAGZp"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -12,14 +14,81 @@
android:layout_height="match_parent" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Welcome!"
android:id="@+id/textView2"
android:text="We have currently ..."
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="52dp" />
android:layout_marginTop="52dp"
android:textColor="@color/white"/>
<TextView
android:id="@+id/txt_incidents"
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_centerHorizontal="true" />
<TextView
android:id="@+id/textView2"
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_centerHorizontal="true" />
<TextView
android:id="@+id/textView3"
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_centerHorizontal="true"
android:layout_marginBottom="26dp" />
<LinearLayout
android:id="@+id/LinearLayout02"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="43dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_report"
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: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-map"
bootstrap:bb_type="primary"
bootstrap:bb_roundedCorners="true"/>
</LinearLayout>
</RelativeLayout>
<ListView

6
app/src/main/res/layout/activity_register.xml
View File

@@ -15,6 +15,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:textSize="20sp"
android:typeface="sans"
android:textStyle="bold"
android:layout_centerHorizontal="true" />
<EditText
@@ -93,8 +96,7 @@
android:layout_height="wrap_content"
android:id="@+id/textView"
android:layout_above="@+id/fragment_btn_gp"
android:layout_alignRight="@+id/hello"
android:layout_alignEnd="@+id/hello" />
android:layout_centerHorizontal="true" />
<fragment
android:layout_width="wrap_content"

12
app/src/main/res/layout/activity_report.xml Normal file
View File

@@ -0,0 +1,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.deke.risk.riskahead.ReportActivity">
<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>

10
app/src/main/res/layout/fragment_facebook_button.xml
View File

@@ -4,15 +4,7 @@
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.fragments.FacebookButtonFragment">
<!--
<com.facebook.login.widget.LoginButton
android:id="@+id/btn_login_fb"
android:layout_width="225dp"
android:layout_height="50dp"
fb:com_facebook_login_text="Facebook"
fb:com_facebook_logout_text="Facebook"
/>
-->
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_fb"
android:layout_width="225dp"