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

app/src/main/res/drawable/fragment_reportwf_finish_button.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_report" />
-    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_report_pressed" />
-    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_report_pressed" />
-    <item android:drawable="@drawable/btn_report" />
+    <item android:state_pressed="false">
+        <shape android:shape="oval">
+            <solid android:color="#cc3b55"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="oval">
+            <solid android:color="#7e0f2b"/>
+        </shape>
+    </item>
 </selector>

app/src/main/res/layout/activity_login.xml

@@ -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>

app/src/main/res/layout/activity_main.xml

@@ -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>
 

app/src/main/res/layout/activity_maps.xml

@@ -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>
 

app/src/main/res/layout/activity_subscriptions.xml

@@ -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"

app/src/main/res/layout/activity_view_report.xml

@@ -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

app/src/main/res/layout/contact_spinner_row_nothing_selected.xml

@@ -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" />
 

app/src/main/res/layout/fragment_profile_stats.xml

@@ -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>

app/src/main/res/layout/fragment_reportwf_1.xml

@@ -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" />
 

app/src/main/res/layout/fragment_reportwf_3.xml

@@ -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"

app/src/main/res/layout/fragment_reportwf_4.xml

@@ -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"

app/src/main/res/layout/fragment_reportwf_5.xml

@@ -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"

app/src/main/res/layout/fragment_reportwf_7.xml

@@ -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"

app/src/main/res/layout/fragment_reportwf_8.xml

@@ -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"

app/src/main/res/layout/fragment_reportwf_finish.xml

@@ -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" />

app/src/main/res/layout/map_info_window.xml

@@ -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"

app/src/main/res/menu/menu_maps.xml

@@ -7,7 +7,7 @@
         android:orderInCategory="100" app:showAsAction="never" />
 
     <item android:id="@+id/location_search"
-        android:title="Search"
+        android:title="@string/lbl_map_search"
         android:icon="@android:drawable/ic_menu_search"
         app:showAsAction="always"
         app:actionViewClass="android.support.v7.widget.SearchView" />

app/src/main/res/menu/menu_reportwf.xml

@@ -5,6 +5,6 @@
     <item android:id="@+id/menu_btn_gotostart"
         android:icon="@android:drawable/ic_menu_revert"
         app:showAsAction="always"
-        android:title="New" />
+        android:title="@string/lbl_reportwf_newreport" />
 
 </menu>

app/src/main/res/values-de/strings.xml

@@ -1,132 +1,92 @@
 <resources>
     <string name="app_name">RiskAhead</string>
 
+    <string name="btn_start_login">Anmelden</string>
+    <string name="btn_start_register">Registrieren</string>
 
-    <string name="btn_start_login">Login</string>
-    <string name="btn_start_register">Register</string>
+    <string name="lbl_login_title">Anmeldung bei RiskAhead</string>
+    <string name="lbl_login_resendPW">Passwort vergessen? Klicke hier</string>
+    <string name="lbl_login_policy"><a href="https://www.riskahead.de/terms/">Impressum</a> und <a href="https://www.riskahead.de/privacy/">Datenschutz</a></string>
+    <string name="lbl_login_usesocialnet">Oder verwende folgende Netzwerke</string>
 
-    <string name="lbl_login_title">Log-in to RiskAhead</string>
-    <string name="lbl_login_resendPW">Forgot your password?\nClick here</string>
-    <string name="lbl_login_policy"><a href="https://www.riskahead.de/terms/">Terms of Service</a> and\n<a href="https://www.riskahead.de/privacy/">Privacy Policy</a></string>
-    <string name="lbl_login_usesocialnet">Or use following social networks to sign in</string>
-
-    <string name="lbl_register_title">Register to RiskAhead</string>
-    <string name="input_register_name_hint">Username</string>
+    <string name="lbl_register_title">Registrierung bei RiskAhead</string>
+    <string name="input_register_name_hint">Benutzername</string>
     <string name="input_register_email_hint">E-Mail</string>
-    <string name="input_register_password_hint">Password</string>
-
-    <string name="status_signing_in">Signing in...</string>
-    <string name="status_signing_out">Signing out...</string>
+    <string name="input_register_password_hint">Passwort</string>
 
     <string name="title_activity_start">RiskAhead</string>
     <string name="title_activity_entrance">RiskAhead</string>
 
-    <string name="drawer_open">Open navigation drawer</string>
-    <string name="drawer_close">Close navigation drawer</string>
+    <string name="search_hint">Ort</string>
+    <string name="search_settings">Such Einstellungen</string>
 
-    <string name="find">Find</string>
-    <string name="hint">Enter Place</string>
-    <string name="search_hint">Location</string>
-    <string name="search_settings">Search Settings</string>
-
-    <string name="title_activity_base">Base</string>
-    <string name="title_activity_user_config">User Profile</string>
+    <string name="title_activity_user_config">Benutzerprofil</string>
     <string name="title_activity_maps">Risk Map</string>
-    <string name="title_activity_report">Report Incident</string>
-    <string name="title_activity_settings">User Settings</string>
-    <string name="title_activity_subscriptions">Subscriptions</string>
-    <string name="title_activity_view_report">View Report</string>
-    <string name="title_activity_reportlist">Report List</string>
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="title_activity_subscriptions">Abonnements</string>
+    <string name="title_activity_view_report">Zeige Vorfälle</string>
+    <string name="title_activity_report_wf">Vorfall melden</string>
 
-    <string name="menu_action_about">About</string>
-    <string name="menu_action_language">Language</string>
-    <string name="menu_action_help">Help &amp; Contact</string>
-    <string name="menu_action_exit">Exit</string>
-    <string name="menu_action_refresh">Refresh Map</string>
+    <string name="menu_action_about">Info</string>
+    <string name="menu_action_help">Hilfe &amp; Kontakt</string>
+    <string name="menu_action_exit">Beenden</string>
+    <string name="menu_action_refresh">Karte aktualisieren</string>
 
-    <string name="lbl_main_txt1">We have currently ...</string>
-    <string name="lbl_main_txt2">... reported incidents</string>
-    <string name="btn_main_report">{fa_map_marker} Report</string>
-    <string name="btn_main_viewmap">{fa_map} View Map</string>
+    <string name="lbl_main_txt1">Wir haben aktuell &#8230;</string>
+    <string name="lbl_main_txt2">&#8230; gemeldete Vorfälle</string>
+    <string name="btn_main_reportinc">Vorfall melden</string>
+    <string name="btn_main_showmap">Zeige RiskMap</string>
 
-    <string name="input_report_short_hint">Short Description</string>
-    <string name="input_report_long_hint">Long Descpription</string>
-    <string name="lbl_report_short">Title</string>
-    <string name="lbl_report_long">Description</string>
-    <string name="lbl_report_category">Crime Category</string>
-    <string name="lbl_report_time">Time </string>
-    <string name="lbl_report_date">Date (yyyy-MM-dd)</string>
+
+    <string name="navigation_start">Startseite</string>
+    <string name="navigation_report">Vorfall melden</string>
+    <string name="navigation_incident_map">Risk Map</string>
+    <string name="navigation_user_stats">Benutzerstatistik</string>
+    <string name="navigation_acc_settings">Einstellungen</string>
+    <string name="navigation_subscriptions">Abonnements</string>
+    <string name="navigation_logout">Abmelden</string>
+
+    <string name="error_anytext">Dein Benutzername muss mindestens 5 Zeichen beinhalten.</string>
+    <string name="error_email">Bitte gebe eine gültige E-Mail Adresse ein z.B.: abc@xyz.com</string>
+    <string name="error_password">Dein Passwort muss mindestens 5 Zeichen beinhalten.</string>
+    <string name="error_validation">Du hast noch Eingabefehler. Bitte korrigiere diese vorher.</string>
+
+    <string name="message_enteremail">Gebe zunächst deine E-Mail Adresse ein um dein Passwort zurückzusetzen</string>
+
+    <string name="alert_passwordreset_title">Sende E-Mail zur Passwort zurücksetzung</string>
+    <string name="alert_passwordreset_text">Willst du wirklich dein Passwort zurücksetzen? Eine E-Mail wird dir dazu an deine E-Mail Adresse gesendet. Bitte befolge die Anweisungen um dein Passwort zurückzusetzen.</string>
+    <string name="alert_passwordreset_confirmation">E-Mail wurde an deine Adresse versendet</string>
+    <string name="alert_accactivation_title">Aktiviere deinen Account</string>
+    <string name="alert_accactivation_text">Dein Account wurde noch nicht aktiviert. Bitte folge den Anweisungen in der erhaltenden E-Mail. Soll eine weitere E-Mail an deine Adresse gesendet werden?</string>
+    <string name="alert_accactivation_confirmation">E-Mail wurde an deine Adresse versendet</string>
+    <string name="alert_accregistration_title">Aktivierungs E-Mail</string>
+    <string name="alert_accregistration_text">Eine E-Mail zur Aktivierung deines Accounts wurde an dich versendet. Bitte folge den Anweisungen in der E-Mail um deinen Account zu aktivieren.</string>
+    <string name="alert_internetconnection_title">Keine Internet Verbindung</string>
+    <string name="alert_internetconnection_text">Du benötigst eine aktivierte Internet-Verbindung um diese App zu nutzen. Verbinde dich mit dem Internet und melde dich erneut an.</string>
+
+    <string name="errormsg_couldnotretrieve">Konnte keine Daten empfangen. Bitte überprüfe deine Internet Einstellungen.</string>
+    <string name="progress_getdata_text">Bitte warten &#8230;</string>
+    <string name="progress_getdata_title">Empfange Daten vom Server</string>
+
+    <string name="lbl_mapsinfowindow_author">Autor:</string>
+    <string name="lbl_mapsinfowindow_score">Wertung:</string>
+    <string name="lbl_mapsinfowindow_suspect">Täter:</string>
+    <string name="lbl_mapsinfowindow_victim">Opfer:</string>
+    <string name="lbl_mapsinfowindow_time">Zeit:</string>
+
+    <string name="lbl_spinner_choose">Bitte wählen &#8230;</string>
+    <string name="lbl_report_from_date">Tag (yyyy-MM-dd)</string>
+    <string name="lbl_report_from_time">Uhrzeit</string>
+    <string name="lbl_report_to_date">Bis Tag (yyyy-MM-dd)</string>
+    <string name="lbl_report_to_time">Bis Uhrzeit</string>
     <string name="lbl_report_position">Position</string>
-    <string name="btn_report_position">{fa_search}</string>
-
-    <string name="btn_viewreport_delete">Delete Report</string>
-
-    <string name="lbl_settings_name">Name</string>
-    <string name="lbl_settings_surname">Surname</string>
-    <string name="lbl_settings_email">E-Mail</string>
-    <string name="lbl_settings_username">Username</string>
-    <string name="lbl_settings_password">Confirm Password</string>
-    <string name="btn_settings_req_password">{fa_envelope} Reset Password</string>
-    <string name="lbl_settings_retype_password">Retype Password</string>
-    <string name="btn_settings_change">Confirm changes</string>
-
-    <string name="lbl_profile_stats">Profile Stats</string>
-    <string name="lbl_profile_member_since">Member Since</string>
-    <string name="lbl_profile_points">Points</string>
-    <string name="lbl_profile_ranking">Ranking</string>
-    <string name="lbl_profile_numberposts">Number of Posts</string>
-    <string name="btn_profile_viewposts">{fa_search} View Posts</string>
-    <string name="lbl_profile_top10">Top 10</string>
-
-    <string name="btn_maps_confirm_position">{fa_paint_brush} Report this position!</string>
-
-    <string name="navigation_start">Home</string>
-    <string name="navigation_report">Incident Report</string>
-    <string name="navigation_incident_map">Incident Map</string>
-    <string name="navigation_user_stats">User Statistics</string>
-    <string name="navigation_acc_settings">Account Settings</string>
-    <string name="navigation_subscriptions">Subscriptions</string>
-    <string name="navigation_logout">Logout</string>
-
-    <string name="share_item_text">I recommend RiskAhead!</string>
-    <string name="share_item_title">RiskAhead</string>
-
-    <string name="error_enter_value">Please enter a value</string>
-    <string name="error_anytext">Your username must be at least \n 5 characters in length.</string>
-    <string name="error_email">Please enter a valid email address\ne.g.: text@abc.de</string>
-    <string name="error_password">Your password must be at least\n5 characters in length.</string>
-    <string name="error_validation">Entered fields not valid\nPlease check errors first.</string>
-
-    <string name="message_enteremail">Enter your E-Mail to reset your password</string>
-
-    <string name="alert_passwordreset_title">Send Password Reset E-Mail</string>
-    <string name="alert_passwordreset_text">Do you really want to reset your password? An E-Mail will be send to your address. Please follow the instructions to reset your password.</string>
-    <string name="alert_passwordreset_confirmation">E-Mail was sent to your e-mail address</string>
-    <string name="alert_accactivation_title">Activate your account</string>
-    <string name="alert_accactivation_text">Your account is not activated yet. Please follow the instructions in your E-Mail. Do you want to resent the E-Mail?</string>
-    <string name="alert_accactivation_confirmation">E-Mail was sent to your e-mail address</string>
-    <string name="alert_accregistration_title">Activation E-Mail</string>
-    <string name="alert_accregistration_text">An activation link was send to your e-mail address. Please follow the instructions to activate your account. Thank you!</string>
-    <string name="alert_internetconnection_title">No Internet Connection</string>
-    <string name="alert_internetconnection_text">You need an active internet connection to use this app. Please turn on your internet connection and login again.</string>
-    <string name="errormsg_couldnotretrieve">Could not retrieve data from server. Please check internet connection.</string>
-    <string name="progress_getdata_text">Please wait...</string>
-    <string name="progress_getdata_title">Retrieve data from server</string>
-    <string name="title_activity_report_wf">Report Incident</string>
-
-    <string name="lbl_mapsinfowindow_author">Author:</string>
-    <string name="lbl_mapsinfowindow_score">Rating:</string>
-    <string name="lbl_mapsinfowindow_suspect">Suspect:</string>
-    <string name="lbl_mapsinfowindow_victim">Victim:</string>
-    <string name="lbl_mapsinfowindow_time">Time:</string>
-
-    <string name="lbl_spinner_choose">Please choose...</string>
-    <string name="lbl_report_from_date">From date (yyyy-MM-dd)</string>
-    <string name="lbl_report_from_time">From time</string>
-    <string name="lbl_report_to_date">To date (yyyy-MM-dd)</string>
-    <string name="lbl_report_to_time">To time</string>
-    <string name="lbl_viewreport_incidentcategory">Incident Category</string>
-    <string name="lbl_viewreport_incidentsubcategory">Incident Subcategory</string>
+    <string name="lbl_reportwf_finish_msg">Du hast alles ausgefüllt!</string>
+    <string name="lbl_reportwf_finish_thx">Wir danken dir für deine Unterstützung!</string>
+    <string name="lbl_reportwf_newreport">Neu</string>
+    <string name="btn_reportwf_finish_send">Abschicken!</string>
+    <string name="lbl_viewreport_incidentcategory">Vorfall Kategorie</string>
+    <string name="lbl_viewreport_incidentsubcategory">Vorfall Sub-Kategorie</string>
+    <string name="btn_viewreport_delete">Vorfall löschen</string>
 
     <string name="lbl_question_situation">Was ist passiert?</string>
     <string name="lbl_question_place">Wo passiert es?</string>
@@ -141,18 +101,42 @@
     <string name="lbl_question_etc_victimaff">Haben die Opfer etwas gemeinsam?</string>
     <string name="lbl_question_etc_recon">Wie erkennt man die Täter?</string>
     <string name="lbl_question_etc_etc">Weiteres?</string>
-    <string name="cat_hint">Weitere Details...</string>
+    <string name="cat_hint">Weitere Details &#8230;</string>
 
     <string name="hint_place">Bitte wähle zunächst einen Ort auf der Karte aus</string>
-    <string name="lbl_viewreport_time">Time</string>
-    <string name="lbl_viewreport_suspect">Suspect</string>
-    <string name="lbl_viewreport_victim">Victim</string>
-    <string name="lbl_viewreport_suspectweapon">Weapons</string>
-    <string name="lbl_viewreport_suspectcount">Quantity</string>
-    <string name="lbl_viewreport_victimorigin">Origin of victim</string>
-    <string name="lbl_viewreport_suspecttransport">Vehicle</string>
-    <string name="lbl_viewreport_victimaff">Victim affiliation</string>
-    <string name="lbl_viewreport_suspectrecon">Suspect attributes</string>
+    <string name="lbl_viewreport_time">Zeitpunkt des Vorfalls</string>
+    <string name="lbl_viewreport_suspect">Täter</string>
+    <string name="lbl_viewreport_victim">Opfer</string>
+    <string name="lbl_viewreport_suspectweapon">Waffen des Täters</string>
+    <string name="lbl_viewreport_suspectcount">Anzahl der Täter</string>
+    <string name="lbl_viewreport_victimorigin">Herkunft des Opfers</string>
+    <string name="lbl_viewreport_suspecttransport">Fortbewegung Täter</string>
+    <string name="lbl_viewreport_victimaff">Opferzugehörigkeit</string>
+    <string name="lbl_viewreport_suspectrecon">Merkmale Täter</string>
+    <string name="lbl_viewreport_etcetc">Weitere Details</string>
+    <string name="lbl_viewreport_reportedfrom">Gemeldet von Benutzer</string>
+
+    <string name="lbl_profile_points_me">Du hast aktuell &#8230;</string>
+    <string name="lvl_profile_points">Punkte</string>
+    <string name="lbl_profile_numofposts_me">durch eine Anzahl von &#8230;</string>
+    <string name="lbl_profile_reportedincidents">gemeldeten Vorfällen</string>
+    <string name="lbl_profile_ranking_me">und dein Rang ist &#8230;</string>
+    <string name="lbl_profile_membersince_me">Du unterstützt RiskAhead seit</string>
+    <string name="lbl_profile_thanks">Vielen Dank!</string>
+    <string name="lbl_profile_points_someone">hat aktuell &#8230;</string>
+    <string name="lbl_profile_ranking_someone">und sein Rang ist &#8230;</string>
+    <string name="lbl_profile_membersince_someone">unterstützt RiskAhead seit</string>
+
+    <string name="lbl_membershiptype_premium">PREMIUM NUTZER</string>
+    <string name="lbl_membershiptype_free">FREE NUTZER</string>
+    <string name="lbl_membershiptype_addfree">ADD-FREE NUTZER</string>
+
+    <string name="lbl_subs_maintaining">Das Betreiben von RiskAhead verursacht hohe Kosten.</string>
+    <string name="lbl_subs_helpus">Hilfe uns bei der Betreibung von RiskAhead durch InApp-Käufe. Dies erlaubt uns auch in Zukunft RiskAhead zu warten und mit neuen Funktionen auszustatten.</string>
+
+    <string name="lbl_map_search">Suche</string>
+    <string name="lbl_dropdown_pleaseselect">Bitte wählen &#8230;</string>
+
 
     <string-array name="cat_situation_main">
         <item>Allgemeiner Vorfall/Situation</item>
@@ -164,13 +148,13 @@
     </string-array>
 
     <string-array name="cat_situation_sub_general">
-        <item>Diebstahl, Betrug</item>
+        <item>Diebstahl, Betrug, Einbruch</item>
         <item>Drogenmissbrauch z.B.Getränk</item>
         <item>Protest, Unruhe, Straßenblockade</item>
         <item>Checkpoint, Kontrollen</item>
         <item>Korruption, Erpressung</item>
         <item>Einfluss Kriminalität, Milizen, Terror</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_situation_sub_verbal">
@@ -178,7 +162,7 @@
         <item>Beleidigung, Drohung</item>
         <item>Nötigung/Vernehmung</item>
         <item>Aufhetzung</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_situation_sub_force">
@@ -187,7 +171,7 @@
         <item>Schlägerei</item>
         <item>Festnahme/Gefangennahme  </item>
         <item>Zwangsarbeit</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_situation_sub_force_serious">
@@ -197,7 +181,7 @@
         <item>Explosion, Selbstmordattentat</item>
         <item>Mord, Tötung, Hinrichtung</item>
         <item>Leiche in Öffentlichkeit</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_situation_sub_nature">
@@ -207,7 +191,7 @@
         <item>Erdbeben, Berghang Einsturz</item>
         <item>Feuer, Rauch, Vulkanausbruch</item>
         <item>Hungersnot, Tierplage</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_situation_sub_infrastructure">
@@ -218,7 +202,7 @@
         <item>Chemiekatastrophe, Ölpest</item>
         <item>Seuche, Krankheit</item>
         <item>Chaos Bevölkerung, Anarchie</item>
-        <item>Sonstiges...</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_time_main">
@@ -243,8 +227,8 @@
         <item>Auftragskiller, Kartell, Miliz, Guerilla</item>
         <item>Soldaten (Militär)</item>
         <item>Terroristen (religiöse oder politische)</item>
-        <item>Sonstiges…</item>
         <item>Weiß ich nicht</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_suspect_sub_location">
@@ -257,16 +241,16 @@
         <item>Schusswaffe</item>
         <item>Explosionswaffen oder Sprengkörper</item>
         <item>Großwaffen z.B. Panzer, Flugbombe</item>
-        <item>Sonstiges…</item>
         <item>Weiß ich nicht</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_suspect_count">
         <item>Einzelperson</item>
-        <item>Kleine Gruppe (2-5)</item>
+        <item>Kleine Gruppe (2–5)</item>
         <item>Große Gruppe (mehr als 5)</item>
-        <item>Sonstiges…</item>
         <item>Weiß ich nicht</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_victim">
@@ -282,8 +266,8 @@
         <item>Heimische Bevölkerung</item>
         <item>Touristen</item>
         <item>Ausländer, der dort arbeitet z.B. Expat</item>
-        <item>Sonstiges…</item>
         <item>Weiß ich nicht</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_details_vehicle">
@@ -293,7 +277,7 @@
         <item>Lkw, Bus</item>
         <item>Militärfahrzeug, Panzer</item>
         <item>Flugzeug, Helikopter</item>
-        <item>Sonstiges…</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_details_victimaff">
@@ -303,7 +287,7 @@
         <item>Soziale Gruppe z.B. Einwanderer</item>
         <item>Beruf z.B. Journalisten, Prostituierte</item>
         <item>Sprachzugehörigkeit</item>
-        <item>Sonstiges…</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
 
     <string-array name="cat_details_suspect_recon">
@@ -311,69 +295,8 @@
         <item>Frauen</item>
         <item>Kinder</item>
         <item>Tiere</item>
-        <item>Sonstiges…</item>
+        <item>Sonstiges &#8230;</item>
     </string-array>
-    <string name="title_activity_settings_activityv2">Settings</string>
-
-    <!-- Strings related to Settings -->
-
-    <!-- Example General settings -->
-    <string name="pref_header_general">General</string>
-
-    <string name="pref_title_social_recommendations">Enable social recommendations</string>
-    <string name="pref_description_social_recommendations">Recommendations for people to contact
-        based on your message history
-    </string>
-
-    <string name="pref_title_display_name">Display name</string>
-    <string name="pref_default_display_name">John Smith</string>
-
-    <string name="pref_title_add_friends_to_messages">Add friends to messages</string>
-    <string-array name="pref_example_list_titles">
-        <item>Always</item>
-        <item>When possible</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_example_list_values">
-        <item>1</item>
-        <item>0</item>
-        <item>-1</item>
-    </string-array>
-
-    <!-- Example settings for Data & Sync -->
-    <string name="pref_header_data_sync">Data &amp; sync</string>
-
-    <string name="pref_title_sync_frequency">Sync frequency</string>
-    <string-array name="pref_sync_frequency_titles">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>3 hours</item>
-        <item>6 hours</item>
-        <item>Never</item>
-    </string-array>
-    <string-array name="pref_sync_frequency_values">
-        <item>15</item>
-        <item>30</item>
-        <item>60</item>
-        <item>180</item>
-        <item>360</item>
-        <item>-1</item>
-    </string-array>
-
-    <string name="pref_title_system_sync_settings">System sync settings</string>
-
-    <!-- Example settings for Notifications -->
-    <string name="pref_header_notifications">Notifications</string>
-
-    <string name="pref_title_new_message_notifications">New message notifications</string>
-
-    <string name="pref_title_ringtone">Ringtone</string>
-    <string name="pref_ringtone_silent">Silent</string>
-
-    <string name="pref_title_vibrate">Vibrate</string>
-    <string name="title_activity_settings_activity_v2">Settings</string>
-    <string name="lbl_viewreport_etcetc">More Details</string>
 
     <string-array name="notification_radius">
         <item>1 KM</item>
@@ -390,11 +313,11 @@
     </string-array>
 
     <string-array name="notification_freq">
-        <item>Every 5 Minutes</item>
-        <item>Every 10 Minutes</item>
-        <item>Every 15 Minutes</item>
-        <item>Every 30 Minutes</item>
-        <item>Every hour</item>
+        <item>Jede 5 Minuten</item>
+        <item>Jede 10 Minuten</item>
+        <item>Jede 15 Minuten</item>
+        <item>Jede 30 Minuten</item>
+        <item>Stündlich</item>
     </string-array>
 
     <string-array name="notification_freq_entry">
@@ -405,6 +328,4 @@
         <item>60</item>
     </string-array>
 
-
-
 </resources>

app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <color name="bg_login">#a9a9a9</color>
+    <color name="bg_login">#c7c7c7</color>
     <color name="bg_register">#2e3237</color>
 
 
@@ -13,18 +13,11 @@
     <color name="text_light_grey">#aa4b4b4b</color>
 
     <color name="white">#ffffff</color>
-    <color name="title">#ffffff</color>
-    <color name="red">#ff0000</color>
-    <color name="my_awesome_red">#ff4400</color>
-    <color name="dark_red">#03518c</color>
     <color name="input_login">#222222</color>
     <color name="input_login_hint">#999999</color>
     <color name="input_register">#888888</color>
     <color name="input_register_bg">#3b4148</color>
     <color name="input_register_hint">#5e6266</color>
-    <color name="btn_login">#26ae90</color>
     <color name="btn_login_bg">#1175b7</color>
-    <color name="lbl_name">#333333</color>
-    <color name="btn_logut_bg">#ff6861</color>
 
 </resources>