From 5bad5cf5c94d0b29fac927b93a9296a7c7af8c0d Mon Sep 17 00:00:00 2001 From: Miguel Date: Thu, 17 Sep 2020 20:09:10 +0200 Subject: [PATCH] WorkoutViewerActivity: Fix possible FCs before v8.0 release Signed-off-by: Miguel --- .../saveworkout/ui/WorkoutViewerActivity.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/me/micrusa/amaztimer/saveworkout/ui/WorkoutViewerActivity.java b/app/src/main/java/me/micrusa/amaztimer/saveworkout/ui/WorkoutViewerActivity.java index f8b0c179..96d9c6e5 100644 --- a/app/src/main/java/me/micrusa/amaztimer/saveworkout/ui/WorkoutViewerActivity.java +++ b/app/src/main/java/me/micrusa/amaztimer/saveworkout/ui/WorkoutViewerActivity.java @@ -129,7 +129,7 @@ private void setupHrGraph(List hr){ private void setupRepsGraph(List reps, List setsDuration){ ArrayList dataSets = new ArrayList<>(); - if(reps.get(0) != 0){ + if(reps.size() >= 1 && reps.get(0) != 0){ ArrayList values = new ArrayList<>(); for(int i = 0; i < reps.size(); i++) values.add(new Entry(i, reps.get(i))); @@ -139,25 +139,29 @@ private void setupRepsGraph(List reps, List setsDuration){ dataSets.add(RepsLine); } - ArrayList workValues = new ArrayList<>(); - ArrayList restValues = new ArrayList<>(); - for(int i = 0; i < setsDuration.size(); i++){ - if(i % 2 == 0) //If it's a work set - workValues.add(new Entry((float) i / 2, setsDuration.get(i))); - else - restValues.add(new Entry((float) i / 2, setsDuration.get(i))); + if(setsDuration.size() >= 1){ + ArrayList workValues = new ArrayList<>(); + ArrayList restValues = new ArrayList<>(); + for(int i = 0; i < setsDuration.size(); i++){ + if(i % 2 == 0) //If it's a work set + workValues.add(new Entry((float) i / 2, setsDuration.get(i))); + else + restValues.add(new Entry((float) i / 2, setsDuration.get(i))); + } + + LineDataSet WorkSetsDurationLine = new LineDataSet(workValues, getString(R.string.worktime)); + setupLineDataSet(WorkSetsDurationLine, Color.RED); + dataSets.add(WorkSetsDurationLine); + + LineDataSet RestSetsDurationLine = new LineDataSet(restValues, getString(R.string.resttime)); + setupLineDataSet(RestSetsDurationLine, Color.GREEN); + dataSets.add(RestSetsDurationLine); } - LineDataSet WorkSetsDurationLine = new LineDataSet(workValues, getString(R.string.worktime)); - setupLineDataSet(WorkSetsDurationLine, Color.RED); - dataSets.add(WorkSetsDurationLine); - - LineDataSet RestSetsDurationLine = new LineDataSet(restValues, getString(R.string.resttime)); - setupLineDataSet(RestSetsDurationLine, Color.GREEN); - dataSets.add(RestSetsDurationLine); - - repsGraph.setData(new LineData(dataSets)); - setupGraph(repsGraph, true); + if(dataSets.size() >= 1) { + repsGraph.setData(new LineData(dataSets)); + setupGraph(repsGraph, true); + } } private void setupGraph(LineChart graph, boolean enableX){