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

DT @13.01.2016: A LOT OF bugfixes.. und sprachdateien 1.6

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-13 23:33:17 +01:00
parent a482b1fab5
commit 2869054b59
25 changed files with 522 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:layout_marginRight="45dp"
android:layout_marginRight="55dp"
android:layout_weight="1">
<android.support.design.widget.TextInputLayout

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="250dp"
android:minWidth="250dp"
android:width="250dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="6dp"
@@ -55,7 +55,7 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:id="@+id/txt_infowindow_subcategory"
android:singleLine="true"
android:ellipsize="marquee"
@@ -67,7 +67,7 @@
android:textColor="#b9000000"
android:text="Loading subject..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:id="@+id/txt_infowindow_subject"
android:typeface="serif"
android:singleLine="true"
@@ -80,7 +80,7 @@
android:textColor="#b9000000"
android:text="Loading victim..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:id="@+id/txt_infowindow_victim"
android:singleLine="true"
android:ellipsize="marquee"
@@ -93,7 +93,7 @@
android:textColor="#b9000000"
android:text="Loading time..."
android:paddingLeft="5dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:paddingBottom="10dp"
android:id="@+id/txt_infowindow_time"
android:singleLine="true"

72
app/src/main/res/values-de/strings.xml
View File

@@ -147,24 +147,61 @@
<string name="btn_reportwf_reportnow">Jetzt melden!</string>
<string name="btn_reportwf_next">Weiter</string>
<string name="menu_send_feedback">Feedback senden</string>
<string name="txt_errormsg_sociallogin">Could not log-in. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_login">Sorry, could not log-in. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_register">Sorry, could not registrate. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getpwreset">Sorry, could not send E-Mail. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getactivationlink">Sorry, we could not send you an activation link. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getinfowindow">Sorry, could not load info window values. Please try again later or contact RiskAhead support.</string>
<string name="txt_reportwf_newincidenttitle">Create new incident?</string>
<string name="txt_reportwf_newincidenttext">Do you want to reset all values and create a new incident?</string>
<string name="txt_subs_youbought">You have bought</string>
<string name="txt_subs_thankyou">Thank you for your support!</string>
<string name="txt_errormsg_subs">There was an error parsing your purchase data. Please try again or contact RiskAhead support.</string>
<string name="txt_viewreport_deletetitle">Delete incident?</string>
<string name="txt_viewreport_deletetext">Do you really want to delete this incident? A deleted incident can not be restored.</string>
<string name="txt_errormsg_deleteincident">Sorry, we could not delete this incident. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getincidentdetail">Sorry, we could not retrieve incident details. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_cannotvoteowninc">You can not vote your own incident.</string>
<string name="txt_errormsg_couldnotvote">Sorry, we could not save your vote. Please try again later or contact RiskAhead support.</string>
<string name="txt_reportwf_newincidenttitle">Neuen Vorfall anlegen?</string>
<string name="txt_reportwf_newincidenttext">Willst du alle gemachten Eingaben zurücksetzen und einen neuen Vorfall erstellen?</string>
<string name="txt_subs_youbought">Du hast gekauft</string>
<string name="txt_subs_thankyou">Vielen Dank für deine Unterstützung!</string>
<string name="txt_viewreport_deletetitle">Vorfall löschen?</string>
<string name="txt_viewreport_deletetext">Willst du wirklich diesen Vorfall löschen? Ein gelöschter Vorfall kann nicht wiederhergestellt werden.</string>
<string name="txt_errormsg_suffix">Bitte versuche es später erneut oder schreibe dem RiskAhead Support.</string>
<string name="txt_errormsg_login">Anmeldung ist fehlgeschlagen.</string>
<string name="txt_errormsg_register">Registrierung ist fehlgeschlagen.</string>
<string name="txt_errormsg_getpwreset">Konnte keine E-Mail versenden.</string>
<string name="txt_errormsg_getactivationlink">Aktivierungslink konnte nicht versendet werden.</string>
<string name="txt_errormsg_getinfowindow">Vorfall konnte nicht geladen werden.</string>
<string name="txt_errormsg_subs">Es gab einen Fehler bei der Verarbeitung Ihrer Bestellung.</string>
<string name="txt_errormsg_deleteincident">Vorfall konnte nicht gelöscht werden.</string>
<string name="txt_errormsg_getincidentdetail">Vorfall konnte nicht geladen werden.</string>
<string name="txt_errormsg_cannotvoteowninc">Du kannst nicht für deinen eigenen Vorfall stimmen.</string>
<string name="txt_errormsg_couldnotvote">Stimme konnte nicht gespeichert werden.</string>
<string name="txt_errormsg_retrievestats">Konnte Profil nicht abrufen.</string>
<string name="txt_settings_resetpwtitle">Passwort zurücksetzen?</string>
<string name="txt_settings_resetpwtext">Willst du wirklich dein Passwort zurücksetzen? Eine E-Mail wird dazu an deine Adresse versendet. Bitte folge dem Link um dein Passwort zurückzusetzen.</string>
<string name="txt_errormsg_resetpw">Versenden der Passwort-Zurücksetzen E-Mail fehlgeschlagen.</string>
<string name="txt_errormsg_changesettings">Benutzerinstellungen konnten nicht gespeichert werden.</string>
<string name="txt_errormsg_gettop10">Top10 Liste konnte nicht geladen werden.</string>
<string name="txt_success_voted">Stimme erfasst. Wertung aktualisiert!</string>
<string name="txt_success_incidentdel">Vorfall wurde gelöscht</string>
<string name="txt_success_addreport">Vorfall erfolgreich hinzugefügt!</string>
<string name="txt_success_changesett">Benutzereinstellungen erfolgreich geändert</string>
<string name="txt_premium_only">(Nur Premium)</string>
<string name="txt_settings_acc_headline">Benutzereinstellungen</string>
<string name="txt_settings_username">Benutzername</string>
<string name="txt_settings_username_sum">Bitte gebe deinen Benutzernamen ein</string>
<string name="txt_settings_name_title">Name</string>
<string name="txt_settings_name_sum">Bitte gebe deinen Namen ein</string>
<string name="txt_settings_surname_title">Nachname</string>
<string name="txt_settings_surname_sum">Bitte gebe deinen Nachnamen ein</string>
<string name="txt_settings_email_title">E-Mail</string>
<string name="txt_settings_email_sum">Bitte gebe deine E-Mail Adresse ein</string>
<string name="txt_settings_resetpw_title">Passwort zurücksetzen</string>
<string name="txt_settings_resetpw_sum">Fordere ein neues Passwort an</string>
<string name="txt_settings_notify_head">Benachrichtigungen</string>
<string name="txt_settings_showno_title">Zeige Benachrichtigungen</string>
<string name="txt_settings_showno_sum">Aktiviere Benachrichtigungen in deiner Umgebung</string>
<string name="txt_settings_notify_showradius">Radius</string>
<string name="txt_settings_notify_showradius_sum">Wähle den Radius um deine letzte bekannte Position von wo du aus Benachrichtungen erhalten möchtest</string>
<string name="txt_settings_notify_pollfreq">Abrufhäufigkeit</string>
<string name="txt_settings_notify_pollfreq_sum">Wähle wie häufig deine Umgebung nach neuen Vorfällen untersucht werden soll</string>
<string name="txt_settings_gps_enable_title">Aktiviere GPS</string>
<string name="txt_settings_gps_enable_sum">Deine letzte bekannte Position wird automatisch durch GPS bestimmt (GPS muss in den Geräteeinstellungen aktiviert sein)</string>
<string name="txt_settings_gps_loca_title">Wähle deine Position</string>
<string name="txt_settings_gps_loca_sum">Deine Position (Latitude/Longitude):</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
@@ -238,7 +275,6 @@
<item>Regelmäßig</item>
<item>Bestimmter Zeitpunkt</item>
<item>Bestimmter Zeitraum</item>
<item>Weiß ich nicht</item>
</string-array>
<string-array name="cat_time_sub_periodical">

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

@@ -152,24 +152,60 @@
<string name="btn_reportwf_reportnow">Report NOW!</string>
<string name="btn_reportwf_next">Next</string>
<string name="menu_send_feedback">Send Feedback</string>
<string name="txt_errormsg_sociallogin">Could not log-in. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_login">Sorry, could not log-in. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_register">Sorry, could not registrate. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getpwreset">Sorry, could not send E-Mail. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getactivationlink">Sorry, we could not send you an activation link. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getinfowindow">Sorry, could not load info window values. Please try again later or contact RiskAhead support.</string>
<string name="txt_reportwf_newincidenttitle">Create new incident?</string>
<string name="txt_reportwf_newincidenttext">Do you want to reset all values and create a new incident?</string>
<string name="txt_errormsg_createincident">Sorry, we could not save your incident. Please try again later or contact RiskAhead support.</string>
<string name="txt_subs_youbought">You have bought</string>
<string name="txt_subs_thankyou">Thank you for your support!</string>
<string name="txt_errormsg_subs">There was an error parsing your purchase data. Please try again or contact RiskAhead support.</string>
<string name="txt_viewreport_deletetitle">Delete incident?</string>
<string name="txt_viewreport_deletetext">Do you really want to delete this incident? A deleted incident can not be restored.</string>
<string name="txt_errormsg_deleteincident">Sorry, we could not delete this incident. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_getincidentdetail">Sorry, we could not retrieve incident details. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_suffix">Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_login">Could not log-in. .</string>
<string name="txt_errormsg_register">Could not registrate.</string>
<string name="txt_errormsg_getpwreset">Could not send E-Mail.</string>
<string name="txt_errormsg_getactivationlink">Could not send you an activation link.</string>
<string name="txt_errormsg_getinfowindow">Could not load info window values.</string>
<string name="txt_errormsg_createincident">Could not save your incident.</string>
<string name="txt_errormsg_subs">There was an error parsing your purchase data.</string>
<string name="txt_errormsg_deleteincident">Could not delete this incident.</string>
<string name="txt_errormsg_getincidentdetail">Could not retrieve incident details.</string>
<string name="txt_errormsg_cannotvoteowninc">You can not vote your own incident.</string>
<string name="txt_errormsg_couldnotvote">Sorry, we could not save your vote. Please try again later or contact RiskAhead support.</string>
<string name="txt_errormsg_couldnotvote">Could not save your vote.</string>
<string name="txt_errormsg_retrievestats">Could not retrieve profile stats.</string>
<string name="txt_settings_resetpwtitle">Reset password?</string>
<string name="txt_settings_resetpwtext">Do you really want to reset your password? An E-Mail will be send to your address. Please follow the given link to reset your password.</string>
<string name="txt_errormsg_resetpw">Could not send you an password reset E-Mail.</string>
<string name="txt_errormsg_changesettings">Could not change your user settings.</string>
<string name="txt_errormsg_gettop10">Could not get the Top10 list.</string>
<string name="txt_success_voted">Voted! Score updated.</string>
<string name="txt_success_incidentdel">Incident deleted</string>
<string name="txt_success_addreport">Report added!</string>
<string name="txt_success_changesett">User settings changed successfully</string>
<string name="txt_premium_only">(Only Premium)</string>
<string name="txt_settings_acc_headline">Account Settings</string>
<string name="txt_settings_username">Username</string>
<string name="txt_settings_username_sum">Please enter your username</string>
<string name="txt_settings_name_title">Name</string>
<string name="txt_settings_name_sum">Please enter your name</string>
<string name="txt_settings_surname_title">Surname</string>
<string name="txt_settings_surname_sum">Please enter your surname</string>
<string name="txt_settings_email_title">E-Mail</string>
<string name="txt_settings_email_sum">Please enter your email</string>
<string name="txt_settings_resetpw_title">Reset Password</string>
<string name="txt_settings_resetpw_sum">Request a new password</string>
<string name="txt_settings_notify_head">Notifications</string>
<string name="txt_settings_showno_title">Show Notifications</string>
<string name="txt_settings_showno_sum">Enable notifications in your area</string>
<string name="txt_settings_notify_showradius">Radius</string>
<string name="txt_settings_notify_showradius_sum">Choose the radius from your last known location in which notifications will be displayed</string>
<string name="txt_settings_notify_pollfreq">Poll Frequency</string>
<string name="txt_settings_notify_pollfreq_sum">Decide how often notification updates should be received from server</string>
<string name="txt_settings_gps_enable_title">Enable GPS</string>
<string name="txt_settings_gps_enable_sum">Get your last know location with GPS (GPS has to be activated in your device settings)</string>
<string name="txt_settings_gps_loca_title">Choose your location</string>
<string name="txt_settings_gps_loca_sum">Your Location (Latitude/Longitude):</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
@@ -243,7 +279,6 @@
<item>Regelmäßig</item>
<item>Bestimmter Zeitpunkt</item>
<item>Bestimmter Zeitraum</item>
<item>Weiß ich nicht</item>
</string-array>
<string-array name="cat_time_sub_periodical">
@@ -361,5 +396,4 @@
<item>60</item>
</string-array>
</resources>

56
app/src/main/res/xml/settings.xml
View File

@@ -3,74 +3,74 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:title="Account Settings">
android:title="@string/txt_settings_acc_headline">
<org.deke.risk.riskahead.helper.ValidatedEditTextPreference
android:key="usernamePref"
android:title="Username"
android:summary="Please enter your username"
android:dialogTitle="Enter your username" />
android:title="@string/txt_settings_username"
android:summary="@string/txt_settings_username_sum"
android:dialogTitle="@string/txt_settings_username_sum" />
<EditTextPreference
android:key="namePref"
android:title="Name"
android:summary="Please enter your name"
android:dialogTitle="Enter your name" />
android:title="@string/txt_settings_name_title"
android:summary="@string/txt_settings_name_sum"
android:dialogTitle="@string/txt_settings_name_sum" />
<EditTextPreference
android:key="surnamePref"
android:title="Surname"
android:summary="Please enter your surname"
android:dialogTitle="Enter your surname" />
android:title="@string/txt_settings_surname_title"
android:summary="@string/txt_settings_surname_sum"
android:dialogTitle="@string/txt_settings_surname_sum" />
<org.deke.risk.riskahead.helper.ValidatedEditTextPreference
android:key="emailPref"
android:inputType="textEmailAddress"
android:title="E-Mail"
android:summary="Please enter your email"
android:dialogTitle="Enter your email" />
android:title="@string/txt_settings_email_title"
android:summary="@string/txt_settings_email_sum"
android:dialogTitle="@string/txt_settings_email_sum" />
<Preference
android:key="resetPassword"
android:title="Reset Password"
android:summary="Request a new password" />
android:title="@string/txt_settings_resetpw_title"
android:summary="@string/txt_settings_resetpw_sum" />
</PreferenceCategory>
<PreferenceCategory
android:title="Notifications">
android:title="@string/txt_settings_notify_head">
<SwitchPreference
android:key="notifyEnable"
android:title="Show Notifications"
android:summary="Enable notifications in your area" />
android:title="@string/txt_settings_showno_title"
android:summary="@string/txt_settings_showno_sum" />
<ListPreference
android:key="notifyRadius"
android:title="Radius"
android:title="@string/txt_settings_notify_showradius"
android:entries="@array/notification_radius"
android:entryValues="@array/notification_radius_entry"
android:summary="Choose the radius from your last known location in which notifications will be displayed"
android:dialogTitle="Notification Radius" />
android:summary="@string/txt_settings_notify_showradius_sum"
android:dialogTitle="@string/txt_settings_notify_showradius" />
<ListPreference
android:key="notifyFrequency"
android:title="Poll Frequency"
android:title="@string/txt_settings_notify_pollfreq"
android:entries="@array/notification_freq"
android:entryValues="@array/notification_freq_entry"
android:summary="Decide how often notification updates should be received from server"
android:dialogTitle="Poll Frequency" />
android:summary="@string/txt_settings_notify_pollfreq_sum"
android:dialogTitle="@string/txt_settings_notify_pollfreq" />
<SwitchPreference
android:key="notifyEnableGPS"
android:title="Enable GPS"
android:summary="Get your last know location with GPS (GPS has to be activated in your device settings)" />
android:title="@string/txt_settings_gps_enable_title"
android:summary="@string/txt_settings_gps_enable_sum" />
<Preference
android:key="notifyChooseLocation"
android:title="Choose your location"
android:summary="Your Location (Latitude/Longitude):" />
android:title="@string/txt_settings_gps_loca_title"
android:summary="@string/txt_settings_gps_loca_sum" />
</PreferenceCategory>