Merge branch 'develop'

Author: Kamil Svoboda

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="230"
-    android:versionName="2.3.0"
+    android:versionCode="231"
+    android:versionName="2.3.1"
     package="cz.tmapy.android.trex">
     <!--Dangerous-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

app/src/main/java/cz/tmapy/android/trex/layout/TrackDataCursorAdapter.java

@@ -36,26 +36,26 @@ public void bindView(View view, Context context, Cursor cursor) {
         tagView.setVisibility((tag != null && !tag.isEmpty()) ? View.VISIBLE : View.GONE);
 
         TextView lengthView = (TextView) view.findViewById(R.id.text_tracks_list_item_length);
-        Long d = (cursor.getLong(5) - cursor.getLong(1)) / 1000;
-        lengthView.setText(String.format("%.2f", (cursor.getFloat(9) / 1000)) + " km");
+        Long d = (cursor.getLong(6) - cursor.getLong(2)) / 1000;
+        lengthView.setText(String.format("%.2f", (cursor.getFloat(10) / 1000)) + " km");
 
         TextView durationView = (TextView) view.findViewById(R.id.text_tracks_list_item_duration);
         durationView.setText(String.format("%d:%02d:%02d", d / 3600, (d % 3600) / 60, (d % 60)));
 
         TextView timeView = (TextView) view.findViewById(R.id.text_tracks_list_item_time);
-        timeView.setText(new SimpleDateFormat("H:mm").format(cursor.getLong(1)));
+        timeView.setText(new SimpleDateFormat("H:mm").format(cursor.getLong(2)));
 
         TextView dateView = (TextView) view.findViewById(R.id.text_tracks_list_item_date);
-        dateView.setText(new SimpleDateFormat("d.M.").format(cursor.getLong(1)));
+        dateView.setText(new SimpleDateFormat("d.M.").format(cursor.getLong(2)));
 
         TextView speedView = (TextView) view.findViewById(R.id.text_tracks_list_item_speed);
-        speedView.setText(String.format("%.0f", (cursor.getFloat(10) / 1000) * 3600) + "/" + String.format("%.0f", (cursor.getFloat(11) / 1000) * 3600) + " km/h");
+        speedView.setText(String.format("%.0f", (cursor.getFloat(11) / 1000) * 3600) + "/" + String.format("%.0f", (cursor.getFloat(12) / 1000) * 3600) + " km/h");
 
         TextView elevView = (TextView) view.findViewById(R.id.text_tracks_list_item_elevation);
-        elevView.setText(String.format("%.0f", cursor.getDouble(12)) + "/" + String.format("%.0f", cursor.getDouble(13)) + " m");
+        elevView.setText(String.format("%.0f", cursor.getDouble(13)) + "/" + String.format("%.0f", cursor.getDouble(14)) + " m");
 
         TextView addView = (TextView) view.findViewById(R.id.text_tracks_list_item_address);
-        addView.setText((cursor.getString(4) != null ? cursor.getString(4) + " - " : "") + (cursor.getString(8) != null ? cursor.getString(8) : ""));
+        addView.setText((cursor.getString(5) != null ? cursor.getString(5) + " - " : "") + (cursor.getString(9) != null ? cursor.getString(9) : ""));
     }
 
     @Override