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

DT @25.11.2015: General refactoring, improved errortext show up, better position detail when reporting, added german language file (but english at the moment), cleaned strings res

Browse Source
This commit is contained in:
Dennis Thießen
2015-11-25 21:59:00 +01:00
parent 666fa60512
commit 1a358128c4
15 changed files with 315 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,6 @@
android:id="@+id/input_report_position"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="City"
android:editable="false"
android:layout_below="@+id/lbl_report_position"
android:layout_toRightOf="@+id/lbl_report_category"

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

@@ -136,15 +136,16 @@
android:layout_alignLeft="@+id/input_viewreport_date"
android:layout_alignStart="@+id/input_viewreport_time"/>
<EditText
android:id="@+id/input_viewreport_position"
android:enabled="false"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:layout_below="@+id/lbl_viewreport_position"
android:layout_alignLeft="@+id/lbl_viewreport_position"
android:layout_alignStart="@+id/lbl_viewreport_position"
android:layout_toRightOf="@+id/lbl_viewreport_category"
android:layout_toEndOf="@+id/lbl_viewreport_category"
android:editable="false"/>
<com.beardedhen.androidbootstrap.BootstrapButton
@@ -154,19 +155,21 @@
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_marginTop="7dp"
android:layout_alignTop="@+id/lbl_viewreport_position"
android:layout_alignRight="@+id/input_viewreport_time"
android:layout_alignEnd="@+id/input_viewreport_time" />
bootstrap:bootstrapSize="lg"
android:layout_marginTop="3dp"
android:layout_below="@+id/lbl_viewreport_position"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_viewreport_position_detail"
android:layout_alignParentRight="true"
android:layout_below="@+id/input_viewreport_position"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
android:layout_alignParentLeft="@+id/input_viewreport_position"
android:layout_alignParentStart="@+id/input_viewreport_position" />
</RelativeLayout>
<RelativeLayout

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

@@ -8,7 +8,7 @@
android:id="@+id/btn_login_gp"
android:layout_width="225dp"
android:layout_height="50dp"
bootstrap:bootstrapText="{fa_google_plus} Google+"
bootstrap:bootstrapText="{fa_google} Google+"
android:layout_above="@+id/btn_login_gp"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true"

113
app/src/main/res/values-de/strings.xml Normal file
View File

@@ -0,0 +1,113 @@
<resources>
<string name="app_name">RiskAhead</string>
<string name="facebook_app_id">658657714234846</string>
<string name="btn_start_login">Login</string>
<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_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="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="btn_settings_change">{fa_pencil} Confirm changes</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_info} 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="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_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="lbl_settings_password">Confirm Password</string>
<string name="btn_settings_req_password">{fa_envelope} Request New Password</string>
<string name="lbl_settings_retype_password">Retype Password</string>
<string name="btn_maps_confirm_position">{fa_paint_brush} Report this position!</string>
<string name="navigation_start">Start</string>
<string name="navigation_report">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_settings">Settings</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>
</resources>

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

@@ -7,7 +7,7 @@
<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="test.com">Terms of Service</a> and\n<a href="test.com">Privacy Policy</a></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>
@@ -15,96 +15,99 @@
<string name="input_register_email_hint">E-Mail</string>
<string name="input_register_password_hint">Password</string>
<string name="action_about">About</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">Risk Ahead</string>
<string name="title_activity_entrance">RiskAhead</string>
<string name="btn_profile_logout">Logout</string>
<string name="btn_settings_change">{fa_pencil} Confirm changes</string>
<string name="lbl_profile_title">Welcome</string>
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>
<string name="settings_user">Account</string>
<string name="settings_logout">Logout</string>
<string name="find">Find</string>
<string name="hint">Enter Place</string>
<string name="action_search">Search</string>
<string name="menu_action_refresh">Refresh page</string>
<string name="action_help">Help &amp; Feedback</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="app_label">Label</string>
<string name="search_hint">Location</string>
<string name="search_settings">search 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="lbl_main_share">Contribute and share your information</string>
<string name="btn_main_report">{fa_map_marker} Report</string>
<string name="btn_main_viewmap">{fa_info} View Map</string>
<string name="input_report_short_hint">short description</string>
<string name="input_report_long_hint">long descpription</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_date">Date (yyyy-MM-dd)</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_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">Top10</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="lbl_settings_password">Confirm Password</string>
<string name="btn_settings_req_password">{fa_envelope} Request new password</string>
<string name="btn_settings_req_password">{fa_envelope} Request New Password</string>
<string name="lbl_settings_retype_password">Retype Password</string>
<string name="menu_action_about">About</string>
<string name="menu_action_help">Help</string>
<string name="menu_action_exit">Exit</string>
<string name="lbl_report_position">Position</string>
<string name="btn_report_position">{fa_search}</string>
<string name="btn_maps_confirm_position">{fa_paint_brush} Report this position!</string>
<string name="title_activity_reportlist">Report List</string>
<string name="navigation_start">Start</string>
<string name="navigation_report">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_settings">Settings</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="action_settings">Settings</string>
<string name="title_activity_view_report">View Report</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-array name="navigation_drawer_items_array">
<item>Start</item>
<item>Report</item>
<item>Incident Map</item>
<item>User Statistics</item>
<item>Account Settings</item>
<item>Subscriptions</item>
<item>Logout</item>
</string-array>
<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>
</resources>