dennisthiessen/RiskAhead-Android
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

9
app/src/main/res/values/colors.xml
View File

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

13
app/src/main/res/values/dimens.xml
View File

@@ -1,16 +1,7 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fb_margin_override_top">13dp</dimen>
<dimen name="fb_margin_override_bottom">13dp</dimen>
<dimen name="micro_padding">4dp</dimen>
<!--The next value changes the margin between the FB icon and the left border:-->
<dimen name="fb_margin_override_lr">10dp</dimen>
<!--The next value changes the margin between the FB icon and the login text:-->
<dimen name="fb_margin_override_textpadding">17dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_width">240dp</dimen>
<dimen name="micro_padding">4dp</dimen>
</resources>

195
app/src/main/res/values/strings.xml
View File

@@ -7,8 +7,8 @@
<string name="btn_start_register">Register</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_resendPW">Forgot your password? Click here</string>
<string name="lbl_login_policy"><a href="https://www.riskahead.de/terms/">Terms of Service</a> and <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>
@@ -16,71 +16,30 @@
<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="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="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_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="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="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="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="lbl_report_position">Position</string>
<string name="btn_report_position">{fa_search}</string>
<string name="lbl_main_txt1">We have currently &#8230;</string>
<string name="lbl_main_txt2">&#8230; reported incidents</string>
<string name="btn_main_reportinc">Report Incident</string>
<string name="btn_main_showmap">Show Map</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>
@@ -89,14 +48,10 @@
<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="error_anytext">Your username must be at least 5 characters in length.</string>
<string name="error_email">Please enter a valid email address e.g.: abc@xyz.de</string>
<string name="error_password">Your password must be at least 5 characters in length.</string>
<string name="error_validation">Entered fields not valid. Please check errors first.</string>
<string name="message_enteremail">Enter your E-Mail to reset your password</string>
@@ -110,8 +65,9 @@
<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_text">Please wait &#8230;</string>
<string name="progress_getdata_title">Retrieve data from server</string>
<string name="title_activity_report_wf">Report Incident</string>
@@ -120,14 +76,24 @@
<string name="lbl_mapsinfowindow_suspect">Suspect:</string>
<string name="lbl_mapsinfowindow_victim">Victim:</string>
<string name="lbl_mapsinfowindow_time">Time:</string>
<string name="lbl_map_search">Search</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_spinner_choose">Please choose &#8230;</string>
<string name="lbl_report_from_date">Date (yyyy-MM-dd)</string>
<string name="lbl_report_from_time">Time</string>
<string name="lbl_report_position">Position</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_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">New</string>
<string name="btn_reportwf_finish_send">Abschicken!</string>
<string name="lbl_viewreport_incidentcategory">Incident Category</string>
<string name="lbl_viewreport_incidentsubcategory">Incident Subcategory</string>
<string name="lbl_viewreport_etcetc">More Details</string>
<string name="lbl_viewreport_reportedfrom">Reported from user</string>
<string name="lbl_question_situation">Was ist passiert?</string>
<string name="lbl_question_place">Wo passiert es?</string>
@@ -142,7 +108,7 @@
<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>
@@ -155,6 +121,26 @@
<string name="lbl_viewreport_victimaff">Victim affiliation</string>
<string name="lbl_viewreport_suspectrecon">Suspect attributes</string>
<string name="lbl_profile_points_me">You have currently &#8230;</string>
<string name="lvl_profile_points">points</string>
<string name="lbl_profile_numofposts_me">from a total of &#8230;</string>
<string name="lbl_profile_reportedincidents">reported incidents</string>
<string name="lbl_profile_ranking_me">and your rank is &#8230;</string>
<string name="lbl_profile_membersince_me">You are supporting RiskAhead since</string>
<string name="lbl_profile_thanks">Thank you!</string>
<string name="lbl_profile_points_someone">has currently &#8230;</string>
<string name="lbl_profile_ranking_someone">and his/her rank is &#8230;</string>
<string name="lbl_profile_membersince_someone">is supporting RiskAhead since</string>
<string name="lbl_membershiptype_premium">PREMIUM MEMBER</string>
<string name="lbl_membershiptype_free">FREE MEMBER</string>
<string name="lbl_membershiptype_addfree">ADD-FREE MEMBER</string>
<string name="lbl_subs_maintaining">Maintaining RiskAhead is cost-intensive.</string>
<string name="lbl_subs_helpus">Help us by purchasing subscriptions. This allows us to maintain and enhance RiskAhead in the future.</string>
<string name="lbl_dropdown_pleaseselect">Please select &#8230;</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>
@@ -171,7 +157,7 @@
<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">
@@ -179,7 +165,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">
@@ -188,7 +174,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">
@@ -198,7 +184,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">
@@ -208,7 +194,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">
@@ -219,7 +205,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">
@@ -244,8 +230,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">
@@ -258,16 +244,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">
@@ -283,8 +269,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">
@@ -294,7 +280,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">
@@ -304,7 +290,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">
@@ -312,69 +298,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>