diff --git a/app/app-release.apk b/app/app-release.apk index 3ff4e7f..216406d 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index 8f9c974..3667f73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "org.deke.risk.riskahead" minSdkVersion 15 targetSdkVersion 22 - versionCode 8 - versionName "1.5.2" + versionCode 11 + versionName "1.6.2" } buildTypes { release { diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java index 5e12eea..2361974 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java @@ -341,6 +341,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen params.put("happened_to_datetime", incident.getToDate()+" "+incident.getToTime()); params.put("fid_suspect", Integer.toString(incident.getFidSuspectCategory())); params.put("fid_subsuspect", Integer.toString(incident.getFidSuspectSubCategory())); + params.put("etc_suspect", incident.getEtcSuspectCategory()); params.put("fid_weapon", Integer.toString(incident.getFidSuspectWeaponCategory())); params.put("fid_subweapon", Integer.toString(incident.getFidSuspectWeaponSubCategory())); params.put("etc_weapon", incident.getEtcSuspectWeaponCategory()); diff --git a/app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java b/app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java index 758cc25..e0b589e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java +++ b/app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java @@ -60,8 +60,8 @@ public class Top10ListAdapter extends BaseAdapter { name.setTypeface(null, Typeface.BOLD); points.setText(data.get(position).getString("points")); - numberOfIncidents.setText(data.get(position).getString("numberOfPosts")+" reported incidents"); - memberSince.setText("Member since "+data.get(position).getString("created_at").split(" ")[0]); + numberOfIncidents.setText(data.get(position).getString("numberOfPosts")+" "+context.getResources().getString(R.string.txt_top10_reportedinc)); + memberSince.setText(context.getResources().getString(R.string.txt_top10_membersince)+" "+data.get(position).getString("created_at").split(" ")[0]); } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 392b22e..de0dbde 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -203,6 +203,9 @@ Wähle deine Position Deine Position (Latitude/Longitude): + gemeldete Vorfälle + Mitglied seit + Allgemeiner Vorfall/Situation Mündliche Gewalt diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2656010..21a1247 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -206,6 +206,8 @@ Get your last know location with GPS (GPS has to be activated in your device settings) Choose your location Your Location (Latitude/Longitude): + reported incidents + Member since Allgemeiner Vorfall/Situation