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

DT @10.01.2016: Icons verändert, Subscription hinzugefügt, Profile von anderen Usern einsehbar. Release 1.3

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-10 22:26:32 +01:00
parent bdcef68772
commit f44042efa8
125 changed files with 1384 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,4 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -53,7 +51,7 @@
android:textColorHint="@color/input_login_hint" />
<Button
android:id="@+id/btn_register"
android:id="@+id/btn_login"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -66,16 +64,32 @@
android:text="@string/btn_start_login"
android:textColor="@color/white" />
<TextView
android:id="@+id/lbl_login_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/lbl_login_resendPW"
android:gravity="end"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="match_parent"
android:layout_below="@+id/btn_login"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="0dp"
android:ellipsize="end"
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:layout_weight=".5"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/lbl_login_policy"
android:ellipsize="end"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_weight=".45"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView
android:id="@+id/lbl_login_usesocialnet"
@@ -117,14 +131,6 @@
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_facebook_button" />
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/btn_register"
android:text="@string/lbl_login_resendPW"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>

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

@@ -32,7 +32,7 @@
android:layout_centerInParent="true">
<TextView
android:id="@+id/lbl_main_txt1"
android:id="@+id/lbl_profile_points"
android:text="@string/lbl_main_txt1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
android:textSize="40sp" />
<TextView
android:id="@+id/lbl_main_txt2"
android:id="@+id/lbl_profile_numberposts"
android:text="@string/lbl_main_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:text="Report Incident" />
android:text="@string/btn_main_reportinc" />
<Button
android:id="@+id/btn_main_viewmap"
@@ -90,7 +90,7 @@
android:background="@color/bg_common_trans"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Show Map" />
android:text="@string/btn_main_showmap" />
</LinearLayout>

13
app/src/main/res/layout/activity_maps.xml
View File

@@ -25,7 +25,7 @@
<fragment
android:id="@+id/frag_maps_map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:name="com.google.android.gms.maps.MapFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MapsActivity" >
@@ -44,17 +44,6 @@
app:layout_anchorGravity="bottom|left|end"
android:layout_alignParentBottom="true"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_maps_confirm_position"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
bootstrap:bootstrapBrand="danger"
bootstrap:bootstrapText="@string/btn_maps_confirm_position"
bootstrap:roundedCorners="true" />
</RelativeLayout>

17
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -26,26 +26,19 @@
android:orientation="vertical">
<TextView
android:id="@+id/lbl_main_txt1"
android:text="Subscriptions"
android:textColor="@color/bg_common_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_margin="5dp"/>
<TextView
android:id="@+id/lbl_main_txt2"
android:text="Maintaining RiskAhead is cost-intensive."
android:id="@+id/lbl_profile_numberposts"
android:text="@string/lbl_subs_maintaining"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_margin="5dp"/>
<TextView
android:id="@+id/lbl_main_txt3"
android:text="Help us by purchasing subscriptions or single packages.\nThis allows us to maintain and enhance RiskAhead."
android:id="@+id/lbl_profile_ranking"
android:text="@string/lbl_subs_helpus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"

27
app/src/main/res/layout/activity_view_report.xml
View File

@@ -42,10 +42,25 @@
android:layout_weight="1">
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentcategory"
android:id="@+id/til_viewreport_reportedfrom"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/txt_viewreport_reportedfrom"
android:hint="@string/lbl_viewreport_reportedfrom"
android:enabled="false"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/til_viewreport_incidentcategory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/til_viewreport_reportedfrom">
<EditText
android:id="@+id/txt_viewreport_incidentcategory"
android:hint="@string/lbl_viewreport_incidentcategory"
@@ -287,6 +302,16 @@
android:layout_alignParentBottom="true"
android:clickable="true"
android:src="@android:drawable/ic_dialog_map" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/btn_viewreport_user"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:clickable="true"
android:src="@android:drawable/ic_menu_search" />
</RelativeLayout>
<LinearLayout

2
app/src/main/res/layout/contact_spinner_row_nothing_selected.xml
View File

@@ -9,5 +9,5 @@
android:background="@drawable/dd_bg"
android:textSize="18sp"
android:textColor="#808080"
android:text="Please select..." />
android:text="@string/lbl_dropdown_pleaseselect" />

56
app/src/main/res/layout/fragment_profile_stats.xml
View File

@@ -1,25 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:fillViewport="true"
android:padding="10dp"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_profile_membershiptype"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="success"
android:text="@string/lbl_membershiptype_free"
bootstrap:showOutline="true"
android:layout_gravity="center|top"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
<TextView
android:id="@+id/lbl_main_txt1"
android:text="You have currently..."
android:id="@+id/lbl_profile_points"
android:text="@string/lbl_profile_points_me"
android:layout_below="@+id/btn_profile_membershiptype"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -31,12 +44,12 @@
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/lbl_main_txt1"
android:layout_below="@id/lbl_profile_points"
android:textSize="30sp" />
<TextView
android:id="@+id/llb_fff"
android:text="points"
android:text="@string/lvl_profile_points"
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:paddingLeft="5dp"
@@ -49,8 +62,8 @@
android:layout_toEndOf="@+id/txt_profile_points" />
<TextView
android:id="@+id/lbl_main_txt2"
android:text="from a total of..."
android:id="@+id/lbl_profile_numberposts"
android:text="@string/lbl_profile_numofposts_me"
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
@@ -65,14 +78,14 @@
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
android:layout_below="@id/lbl_main_txt2"
android:layout_below="@id/lbl_profile_numberposts"
android:textSize="30sp"
android:layout_marginTop="10dp"
/>
<TextView
android:id="@+id/llb_ffff"
android:text="reported incidents"
android:text="@string/lbl_profile_reportedincidents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
@@ -84,8 +97,8 @@
android:layout_toEndOf="@+id/txt_profile_numberposts" />
<TextView
android:id="@+id/lbl_main_txt3"
android:text="and your rank is..."
android:id="@+id/lbl_profile_ranking"
android:text="@string/lbl_profile_ranking_me"
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
@@ -101,13 +114,13 @@
android:layout_height="wrap_content"
android:textSize="30sp"
android:layout_centerHorizontal="true"
android:layout_below="@+id/lbl_main_txt3"
android:layout_below="@+id/lbl_profile_ranking"
android:layout_marginTop="10dp"
/>
<TextView
android:id="@+id/lbl_main_txt4"
android:text="You are supporting RiskAhead since"
android:id="@+id/lbl_profile_membersince"
android:text="@string/lbl_profile_membersince_me"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -129,7 +142,7 @@
<TextView
android:id="@+id/lbl_main_txt5"
android:text="Thank you!"
android:text="@string/lbl_profile_thanks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
@@ -140,4 +153,5 @@
</RelativeLayout>
</RelativeLayout>
</ScrollView>

1
app/src/main/res/layout/fragment_reportwf_1.xml
View File

@@ -61,6 +61,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:maxLength="50"
android:id="@+id/txt_reportwf_1_cat_etc"
android:layout_below="@id/dd_reportwf_1_cat_sub" />

1
app/src/main/res/layout/fragment_reportwf_3.xml
View File

@@ -58,6 +58,7 @@
<EditText
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"

1
app/src/main/res/layout/fragment_reportwf_4.xml
View File

@@ -47,6 +47,7 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_4_weapon_etc"

1
app/src/main/res/layout/fragment_reportwf_5.xml
View File

@@ -47,6 +47,7 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_5_count_etc"

1
app/src/main/res/layout/fragment_reportwf_7.xml
View File

@@ -48,6 +48,7 @@
<EditText
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLength="50"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
android:id="@+id/txt_reportwf_7_victimorigin_etc"

4
app/src/main/res/layout/fragment_reportwf_8.xml
View File

@@ -55,6 +55,7 @@
<EditText
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
@@ -92,6 +93,7 @@
<EditText
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
@@ -129,6 +131,7 @@
<EditText
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"
@@ -155,6 +158,7 @@
<EditText
android:layout_width="300dp"
android:maxLength="50"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:hint="@string/cat_hint"

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

@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:layout_margin="20dp"
android:text="Du hast alles ausgefüllt!"
android:text="@string/lbl_reportwf_finish_msg"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/bg_common" />
@@ -49,7 +49,7 @@
android:layout_width="200dp"
android:layout_height="200dp"
android:background="@drawable/fragment_reportwf_finish_button"
android:text="Abschicken!"
android:text="@string/btn_reportwf_finish_send"
android:textColor="@color/white" />
@@ -72,7 +72,7 @@
android:textAlignment="center"
android:gravity="center"
android:layout_margin="20dp"
android:text="Wir danken dir für deine Unterstützung!"
android:text="@string/lbl_reportwf_finish_thx"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/bg_common"
android:layout_weight="1" />

29
app/src/main/res/layout/map_info_window.xml
View File

@@ -10,19 +10,22 @@
android:paddingBottom="8dp"
android:background="@drawable/infowindow">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_category"
android:text="Loading Header..."
android:textSize="18dp"
android:paddingLeft="30dp"
android:typeface="serif"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#a6000000"
android:id="@+id/txt_infowindow_category"
android:text="Loading Header..."
android:textSize="18dp"
android:paddingLeft="30dp"
android:layout_marginRight="10dp"
android:typeface="serif"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"/>
<LinearLayout
android:orientation="horizontal"