demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-02-05 05:24:12 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Finalized Sports view. Recalculate seconds to duration.

Browse Source
This commit is contained in:
vanous 2020-08-10 14:55:57 +02:00 committed by Gitea
parent 9d8bd08c23
commit f08b109deb
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
View File

@ -18,6 +18,7 @@
package nodomain.freeyourgadget.gadgetbridge.activities; package nodomain.freeyourgadget.gadgetbridge.activities;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
@ -113,7 +114,6 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
private void makeSummaryContent (JSONObject data){ private void makeSummaryContent (JSONObject data){
//build view, use localized names //build view, use localized names
StringBuilder content = new StringBuilder();
Iterator<String> keys = data.keys(); Iterator<String> keys = data.keys();
DecimalFormat df = new DecimalFormat("#.##"); DecimalFormat df = new DecimalFormat("#.##");
@ -152,15 +152,27 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
value = value /60; value = value /60;
unit = "minutes_km"; unit = "minutes_km";
break; break;
} }
TableRow field_row = new TableRow(ActivitySummaryDetail.this); TableRow field_row = new TableRow(ActivitySummaryDetail.this);
if (i % 2 == 0) field_row.setBackgroundColor(Color.rgb(237,237,237));
TextView name_field = new TextView(ActivitySummaryDetail.this); TextView name_field = new TextView(ActivitySummaryDetail.this);
TextView value_field = new TextView(ActivitySummaryDetail.this); TextView value_field = new TextView(ActivitySummaryDetail.this);
name_field.setGravity(Gravity.START); name_field.setGravity(Gravity.START);
value_field.setGravity(Gravity.END); value_field.setGravity(Gravity.END);
value_field.setText(String.format("%s %s", df.format(value), getStringResourceByName(unit)));
if (unit.equals("seconds")) { //rather then plain seconds, show formatted duration
value_field.setText(DateTimeUtils.formatDurationHoursMinutes((long) value, TimeUnit.SECONDS));
}else {
value_field.setText(String.format("%s %s", df.format(value), getStringResourceByName(unit)));
}
name_field.setText(getStringResourceByName(name)); name_field.setText(getStringResourceByName(name));
TableRow.LayoutParams params = new TableRow.LayoutParams(0, TableRow.LayoutParams.WRAP_CONTENT, 1f);
value_field.setLayoutParams(params);
field_row.addView(name_field); field_row.addView(name_field);
field_row.addView(value_field); field_row.addView(value_field);
fieldLayout.addView(field_row); fieldLayout.addView(field_row);
@ -189,13 +201,15 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
} }
private String getGroup(String searchItem) { private String getGroup(String searchItem) {
String defaultGroup = "Activity";
if (groupData == null) return defaultGroup;
Iterator<String> keys = groupData.keys(); Iterator<String> keys = groupData.keys();
while (keys.hasNext()) { while (keys.hasNext()) {
String key = keys.next(); String key = keys.next();
try { try {
JSONArray itemList = (JSONArray) groupData.get(key); JSONArray itemList = (JSONArray) groupData.get(key);
for (int i = 0; i < itemList.length(); i++) { for (int i = 0; i < itemList.length(); i++) {
if (itemList.getString(i).contains(searchItem)) { if (itemList.getString(i).equals(searchItem)) {
return key; return key;
} }
} }
@ -203,7 +217,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
LOG.error("SportsActivity", e); LOG.error("SportsActivity", e);
} }
} }
return "Activity"; return defaultGroup;
} }
private JSONObject makeSummaryList(JSONObject summaryData){ private JSONObject makeSummaryList(JSONObject summaryData){