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

DT @14.01.2016: bugfixes

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-14 07:12:14 +01:00
parent 2869054b59
commit 3e4a1d5833
6 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/app-release.apk
View File

Binary file not shown.

4
app/build.gradle
View File

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

1
app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java
View File

@@ -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());

4
app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java
View File

@@ -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();
}

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

@@ -203,6 +203,9 @@
<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 name="txt_top10_reportedinc">gemeldete Vorfälle</string>
<string name="txt_top10_membersince">Mitglied seit</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>

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

@@ -206,6 +206,8 @@
<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 name="txt_top10_reportedinc">reported incidents</string>
<string name="txt_top10_membersince">Member since</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>