Skip to content

Commit 9034dda

Browse files
galadrilgaladril
committed
Made the graph line a bit bigger
1 parent 0524728 commit 9034dda

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

‎app/src/main/java/nl/hnogames/domoticz/fragments/Graph.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ private LineData generateData(View view) {
470470
LineDataSet dataSet = new LineDataSet(valuest, ((TextView) view.findViewById(R.id.legend_temperature)).getText().toString()); // add entries to dataset
471471
dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
472472
dataSet.setDrawCircles(false);
473+
dataSet.setLineWidth(2);
473474
dataSet.setMode(LineDataSet.Mode.LINEAR);
474475
entries.add(dataSet);
475476

@@ -484,6 +485,7 @@ private LineData generateData(View view) {
484485

485486
if (addTemperatureRange) {
486487
dataSet = new LineDataSet(valuestMax, "Max"); // add entries to dataset
488+
dataSet.setLineWidth(2);
487489
dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
488490
dataSet.setDrawCircles(false);
489491
dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -492,6 +494,7 @@ private LineData generateData(View view) {
492494
entries.add(dataSet);
493495

494496
dataSet = new LineDataSet(valuestMin, "Min"); // add entries to dataset
497+
dataSet.setLineWidth(2);
495498
dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
496499
dataSet.setDrawCircles(false);
497500
dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -506,6 +509,7 @@ private LineData generateData(View view) {
506509
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_humidity)).getText().toString()))) {
507510
LineDataSet dataSet = new LineDataSet(valueshu, ((TextView) view.findViewById(R.id.legend_humidity)).getText().toString()); // add entries to dataset
508511
dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
512+
dataSet.setLineWidth(2);
509513
dataSet.setDrawCircles(false);
510514
dataSet.setMode(LineDataSet.Mode.LINEAR);
511515
entries.add(dataSet);
@@ -515,6 +519,7 @@ private LineData generateData(View view) {
515519
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_barometer)).getText().toString()))) {
516520
LineDataSet dataSet = new LineDataSet(valuesba, ((TextView) view.findViewById(R.id.legend_barometer)).getText().toString()); // add entries to dataset
517521
dataSet.setColor(ContextCompat.getColor(context, R.color.material_green_600));
522+
dataSet.setLineWidth(2);
518523
dataSet.setDrawCircles(false);
519524
dataSet.setMode(LineDataSet.Mode.LINEAR);
520525
entries.add(dataSet);
@@ -524,6 +529,7 @@ private LineData generateData(View view) {
524529
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_counter)).getText().toString()))) {
525530
LineDataSet dataSet = new LineDataSet(valuesc, ((TextView) view.findViewById(R.id.legend_counter)).getText().toString()); // add entries to dataset
526531
dataSet.setColor(ContextCompat.getColor(context, R.color.material_indigo_600));
532+
dataSet.setLineWidth(2);
527533
dataSet.setDrawCircles(false);
528534
dataSet.setMode(LineDataSet.Mode.LINEAR);
529535
entries.add(dataSet);
@@ -533,6 +539,7 @@ private LineData generateData(View view) {
533539
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_powerusage)).getText().toString()))) {
534540
LineDataSet dataSet = new LineDataSet(valueeu, ((TextView) view.findViewById(R.id.legend_powerusage)).getText().toString()); // add entries to dataset
535541
dataSet.setColor(ContextCompat.getColor(context, R.color.material_yellow_600));
542+
dataSet.setLineWidth(2);
536543
dataSet.setDrawCircles(false);
537544
dataSet.setMode(LineDataSet.Mode.LINEAR);
538545
entries.add(dataSet);
@@ -541,6 +548,7 @@ private LineData generateData(View view) {
541548
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_powerdeliv)).getText().toString()))) {
542549
LineDataSet dataSet = new LineDataSet(valueeg, ((TextView) view.findViewById(R.id.legend_powerdeliv)).getText().toString()); // add entries to dataset
543550
dataSet.setColor(ContextCompat.getColor(context, R.color.material_deep_purple_600));
551+
dataSet.setLineWidth(2);
544552
dataSet.setDrawCircles(false);
545553
dataSet.setMode(LineDataSet.Mode.LINEAR);
546554
entries.add(dataSet);
@@ -550,12 +558,14 @@ private LineData generateData(View view) {
550558
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_percentage)).getText().toString()))) {
551559
LineDataSet dataSet = new LineDataSet(valuesv, ((TextView) view.findViewById(R.id.legend_percentage)).getText().toString()); // add entries to dataset
552560
dataSet.setColor(ContextCompat.getColor(context, R.color.material_yellow_600));
561+
dataSet.setLineWidth(2);
553562
dataSet.setDrawCircles(false);
554563
dataSet.setMode(LineDataSet.Mode.LINEAR);
555564
entries.add(dataSet);
556565

557566
if (addPercentageRange) {
558567
dataSet = new LineDataSet(valuesvMax, "Max"); // add entries to dataset
568+
dataSet.setLineWidth(2);
559569
dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
560570
dataSet.setDrawCircles(false);
561571
dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -564,6 +574,7 @@ private LineData generateData(View view) {
564574
entries.add(dataSet);
565575

566576
dataSet = new LineDataSet(valuesvMin, "Min"); // add entries to dataset
577+
dataSet.setLineWidth(2);
567578
dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
568579
dataSet.setDrawCircles(false);
569580
dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -578,6 +589,7 @@ private LineData generateData(View view) {
578589
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_percentage2)).getText().toString()))) {
579590
LineDataSet dataSet = new LineDataSet(valuesv2, ((TextView) view.findViewById(R.id.legend_percentage2)).getText().toString()); // add entries to dataset
580591
dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
592+
dataSet.setLineWidth(2);
581593
dataSet.setDrawCircles(false);
582594
dataSet.setMode(LineDataSet.Mode.LINEAR);
583595
entries.add(dataSet);
@@ -587,6 +599,7 @@ private LineData generateData(View view) {
587599
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_direction)).getText().toString()))) {
588600
LineDataSet dataSet = new LineDataSet(valuesdi, ((TextView) view.findViewById(R.id.legend_direction)).getText().toString()); // add entries to dataset
589601
dataSet.setColor(ContextCompat.getColor(context, R.color.material_green_600));
602+
dataSet.setLineWidth(2);
590603
dataSet.setDrawCircles(false);
591604
dataSet.setMode(LineDataSet.Mode.LINEAR);
592605
entries.add(dataSet);
@@ -596,6 +609,7 @@ private LineData generateData(View view) {
596609
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_sunpower)).getText().toString()))) {
597610
LineDataSet dataSet = new LineDataSet(valuesuv, ((TextView) view.findViewById(R.id.legend_sunpower)).getText().toString()); // add entries to dataset
598611
dataSet.setColor(ContextCompat.getColor(context, R.color.material_deep_purple_600));
612+
dataSet.setLineWidth(2);
599613
dataSet.setDrawCircles(false);
600614
dataSet.setMode(LineDataSet.Mode.LINEAR);
601615
entries.add(dataSet);
@@ -605,6 +619,7 @@ private LineData generateData(View view) {
605619
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_speed)).getText().toString()))) {
606620
LineDataSet dataSet = new LineDataSet(valuessp, ((TextView) view.findViewById(R.id.legend_speed)).getText().toString()); // add entries to dataset
607621
dataSet.setColor(ContextCompat.getColor(context, R.color.material_amber_600));
622+
dataSet.setLineWidth(2);
608623
dataSet.setDrawCircles(false);
609624
dataSet.setMode(LineDataSet.Mode.LINEAR);
610625
entries.add(dataSet);
@@ -614,6 +629,7 @@ private LineData generateData(View view) {
614629
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_usage)).getText().toString()))) {
615630
LineDataSet dataSet = new LineDataSet(valuesu, ((TextView) view.findViewById(R.id.legend_usage)).getText().toString()); // add entries to dataset
616631
dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
632+
dataSet.setLineWidth(2);
617633
dataSet.setDrawCircles(false);
618634
dataSet.setMode(LineDataSet.Mode.LINEAR);
619635
entries.add(dataSet);
@@ -623,6 +639,7 @@ private LineData generateData(View view) {
623639
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_rain)).getText().toString()))) {
624640
LineDataSet dataSet = new LineDataSet(valuesmm, ((TextView) view.findViewById(R.id.legend_rain)).getText().toString()); // add entries to dataset
625641
dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
642+
dataSet.setLineWidth(2);
626643
dataSet.setDrawCircles(false);
627644
dataSet.setMode(LineDataSet.Mode.LINEAR);
628645
entries.add(dataSet);
@@ -632,6 +649,7 @@ private LineData generateData(View view) {
632649
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2)).getText().toString()))) {
633650
LineDataSet dataSet = new LineDataSet(valuesco2, ((TextView) view.findViewById(R.id.legend_co2)).getText().toString()); // add entries to dataset
634651
dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
652+
dataSet.setLineWidth(2);
635653
dataSet.setDrawCircles(false);
636654
dataSet.setMode(LineDataSet.Mode.LINEAR);
637655
entries.add(dataSet);
@@ -641,6 +659,7 @@ private LineData generateData(View view) {
641659
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2min)).getText().toString()))) {
642660
LineDataSet dataSet = new LineDataSet(valuesco2min, ((TextView) view.findViewById(R.id.legend_co2min)).getText().toString()); // add entries to dataset
643661
dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
662+
dataSet.setLineWidth(2);
644663
dataSet.setDrawCircles(false);
645664
dataSet.setMode(LineDataSet.Mode.LINEAR);
646665
entries.add(dataSet);
@@ -650,6 +669,7 @@ private LineData generateData(View view) {
650669
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2max)).getText().toString()))) {
651670
LineDataSet dataSet = new LineDataSet(valuesco2max, ((TextView) view.findViewById(R.id.legend_co2max)).getText().toString()); // add entries to dataset
652671
dataSet.setColor(ContextCompat.getColor(context, R.color.md_red_400));
672+
dataSet.setLineWidth(2);
653673
dataSet.setDrawCircles(false);
654674
dataSet.setMode(LineDataSet.Mode.LINEAR);
655675
entries.add(dataSet);
@@ -659,6 +679,7 @@ private LineData generateData(View view) {
659679
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Lux)).getText().toString()))) {
660680
LineDataSet dataSet = new LineDataSet(valuesLux, ((TextView) view.findViewById(R.id.legend_Lux)).getText().toString()); // add entries to dataset
661681
dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
682+
dataSet.setLineWidth(2);
662683
dataSet.setDrawCircles(false);
663684
dataSet.setMode(LineDataSet.Mode.LINEAR);
664685
entries.add(dataSet);
@@ -668,6 +689,7 @@ private LineData generateData(View view) {
668689
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Luxmin)).getText().toString()))) {
669690
LineDataSet dataSet = new LineDataSet(valuesLuxmin, ((TextView) view.findViewById(R.id.legend_Luxmin)).getText().toString()); // add entries to dataset
670691
dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
692+
dataSet.setLineWidth(2);
671693
dataSet.setDrawCircles(false);
672694
dataSet.setMode(LineDataSet.Mode.LINEAR);
673695
entries.add(dataSet);
@@ -677,6 +699,7 @@ private LineData generateData(View view) {
677699
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Luxmax)).getText().toString()))) {
678700
LineDataSet dataSet = new LineDataSet(valuesLuxmax, ((TextView) view.findViewById(R.id.legend_Luxmax)).getText().toString()); // add entries to dataset
679701
dataSet.setColor(ContextCompat.getColor(context, R.color.md_red_400));
702+
dataSet.setLineWidth(2);
680703
dataSet.setDrawCircles(false);
681704
dataSet.setMode(LineDataSet.Mode.LINEAR);
682705
entries.add(dataSet);
@@ -686,6 +709,7 @@ private LineData generateData(View view) {
686709
(filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_LuxAvg)).getText().toString()))) {
687710
LineDataSet dataSet = new LineDataSet(valuesLuxAvg, ((TextView) view.findViewById(R.id.legend_LuxAvg)).getText().toString()); // add entries to dataset
688711
dataSet.setColor(ContextCompat.getColor(context, R.color.md_yellow_400));
712+
dataSet.setLineWidth(2);
689713
dataSet.setDrawCircles(false);
690714
dataSet.setMode(LineDataSet.Mode.LINEAR);
691715
entries.add(dataSet);

‎app/src/main/java/nl/hnogames/domoticz/fragments/TempGraphs.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,13 +396,15 @@ private LineData generateData(View view) {
396396
if (addTemperature) {
397397
LineDataSet dataSet = new LineDataSet(valuest, list.getKey() + " " + getString(R.string.temperature)); // add entries to dataset
398398
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
399+
dataSet.setLineWidth(2);
399400
dataSet.setDrawCircles(false);
400401
dataSet.setMode(LineDataSet.Mode.LINEAR);
401402
entries.add(dataSet);
402403

403404
if (addSetpoint) {
404405
dataSet = new LineDataSet(valuesse, list.getKey() + " " + getString(R.string.set_point)); // add entries to dataset
405406
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
407+
dataSet.setLineWidth(2);
406408
dataSet.setDrawCircles(false);
407409
dataSet.setMode(LineDataSet.Mode.LINEAR);
408410
entries.add(dataSet);
@@ -411,6 +413,7 @@ private LineData generateData(View view) {
411413
if (addTemperatureRange) {
412414
dataSet = new LineDataSet(valuestMax, list.getKey() + " " + "Max"); // add entries to dataset
413415
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
416+
dataSet.setLineWidth(2);
414417
dataSet.setDrawCircles(false);
415418
dataSet.setMode(LineDataSet.Mode.LINEAR);
416419
dataSet.setDrawFilled(true);
@@ -419,6 +422,7 @@ private LineData generateData(View view) {
419422

420423
dataSet = new LineDataSet(valuestMin, list.getKey() + " " + "Min"); // add entries to dataset
421424
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
425+
dataSet.setLineWidth(2);
422426
dataSet.setDrawCircles(false);
423427
dataSet.setMode(LineDataSet.Mode.LINEAR);
424428
dataSet.setFillAlpha(255);
@@ -431,6 +435,7 @@ private LineData generateData(View view) {
431435
if (addHumidity) {
432436
LineDataSet dataSet = new LineDataSet(valueshu, list.getKey() + " " + getString(R.string.humidity)); // add entries to dataset
433437
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
438+
dataSet.setLineWidth(2);
434439
dataSet.setDrawCircles(false);
435440
dataSet.setMode(LineDataSet.Mode.LINEAR);
436441
entries.add(dataSet);
@@ -439,6 +444,7 @@ private LineData generateData(View view) {
439444
if (addBarometer) {
440445
LineDataSet dataSet = new LineDataSet(valuesba, list.getKey() + " " + getString(R.string.barometer)); // add entries to dataset
441446
dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
447+
dataSet.setLineWidth(2);
442448
dataSet.setDrawCircles(false);
443449
dataSet.setMode(LineDataSet.Mode.LINEAR);
444450
entries.add(dataSet);

‎app/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Aug 06 10:18:53 CEST 2020
2-
VERSION_BUILD=7872
1+
#Thu Aug 06 11:22:02 CEST 2020
2+
VERSION_BUILD=7873
33
VERSION_PATCH=231
44
VERSION_CODE=522

‎domoticzapi/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Aug 06 10:18:53 CEST 2020
1+
#Thu Aug 06 11:22:02 CEST 2020
22
VERSION_BUILD=3675
33
VERSION_PATCH=254
44
VERSION_CODE=254

0 commit comments

Comments
 (0)