Made the graph line a bit bigger

domoticz · Aug 6, 2020 · 9034dda · 9034dda
1 parent 0524728
commit 9034dda
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/app/src/main/java/nl/hnogames/domoticz/fragments/Graph.java b/app/src/main/java/nl/hnogames/domoticz/fragments/Graph.java
@@ -470,6 +470,7 @@ private LineData generateData(View view) {
                 LineDataSet dataSet = new LineDataSet(valuest, ((TextView) view.findViewById(R.id.legend_temperature)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
                 dataSet.setDrawCircles(false);
+                dataSet.setLineWidth(2);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
 
@@ -484,6 +485,7 @@ private LineData generateData(View view) {
 
                 if (addTemperatureRange) {
                     dataSet = new LineDataSet(valuestMax, "Max"); // add entries to dataset
+                    dataSet.setLineWidth(2);
                     dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -492,6 +494,7 @@ private LineData generateData(View view) {
                     entries.add(dataSet);
 
                     dataSet = new LineDataSet(valuestMin, "Min"); // add entries to dataset
+                    dataSet.setLineWidth(2);
                     dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -506,6 +509,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_humidity)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valueshu, ((TextView) view.findViewById(R.id.legend_humidity)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -515,6 +519,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_barometer)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesba, ((TextView) view.findViewById(R.id.legend_barometer)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_green_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -524,6 +529,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_counter)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesc, ((TextView) view.findViewById(R.id.legend_counter)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_indigo_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -533,6 +539,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_powerusage)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valueeu, ((TextView) view.findViewById(R.id.legend_powerusage)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_yellow_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -541,6 +548,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_powerdeliv)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valueeg, ((TextView) view.findViewById(R.id.legend_powerdeliv)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_deep_purple_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -550,12 +558,14 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_percentage)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesv, ((TextView) view.findViewById(R.id.legend_percentage)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_yellow_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
 
                 if (addPercentageRange) {
                     dataSet = new LineDataSet(valuesvMax, "Max"); // add entries to dataset
+                    dataSet.setLineWidth(2);
                     dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -564,6 +574,7 @@ private LineData generateData(View view) {
                     entries.add(dataSet);
 
                     dataSet = new LineDataSet(valuesvMin, "Min"); // add entries to dataset
+                    dataSet.setLineWidth(2);
                     dataSet.setColor(ContextCompat.getColor(context, R.color.md_blue_50));
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
@@ -578,6 +589,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_percentage2)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesv2, ((TextView) view.findViewById(R.id.legend_percentage2)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -587,6 +599,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_direction)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesdi, ((TextView) view.findViewById(R.id.legend_direction)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_green_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -596,6 +609,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_sunpower)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesuv, ((TextView) view.findViewById(R.id.legend_sunpower)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_deep_purple_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -605,6 +619,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_speed)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuessp, ((TextView) view.findViewById(R.id.legend_speed)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_amber_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -614,6 +629,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_usage)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesu, ((TextView) view.findViewById(R.id.legend_usage)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_orange_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -623,6 +639,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_rain)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesmm, ((TextView) view.findViewById(R.id.legend_rain)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -632,6 +649,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesco2, ((TextView) view.findViewById(R.id.legend_co2)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -641,6 +659,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2min)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesco2min, ((TextView) view.findViewById(R.id.legend_co2min)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -650,6 +669,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_co2max)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesco2max, ((TextView) view.findViewById(R.id.legend_co2max)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.md_red_400));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -659,6 +679,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Lux)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesLux, ((TextView) view.findViewById(R.id.legend_Lux)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_blue_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -668,6 +689,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Luxmin)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesLuxmin, ((TextView) view.findViewById(R.id.legend_Luxmin)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.material_light_green_600));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -677,6 +699,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_Luxmax)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesLuxmax, ((TextView) view.findViewById(R.id.legend_Luxmax)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.md_red_400));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);
@@ -686,6 +709,7 @@ private LineData generateData(View view) {
                     (filterLabels != null && filterLabels.contains(((TextView) view.findViewById(R.id.legend_LuxAvg)).getText().toString()))) {
                 LineDataSet dataSet = new LineDataSet(valuesLuxAvg, ((TextView) view.findViewById(R.id.legend_LuxAvg)).getText().toString()); // add entries to dataset
                 dataSet.setColor(ContextCompat.getColor(context, R.color.md_yellow_400));
+                dataSet.setLineWidth(2);
                 dataSet.setDrawCircles(false);
                 dataSet.setMode(LineDataSet.Mode.LINEAR);
                 entries.add(dataSet);

diff --git a/app/src/main/java/nl/hnogames/domoticz/fragments/TempGraphs.java b/app/src/main/java/nl/hnogames/domoticz/fragments/TempGraphs.java
@@ -396,13 +396,15 @@ private LineData generateData(View view) {
                 if (addTemperature) {
                     LineDataSet dataSet = new LineDataSet(valuest, list.getKey() + " " + getString(R.string.temperature)); // add entries to dataset
                     dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                    dataSet.setLineWidth(2);
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
                     entries.add(dataSet);
 
                     if (addSetpoint) {
                         dataSet = new LineDataSet(valuesse, list.getKey() + " " + getString(R.string.set_point)); // add entries to dataset
                         dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                        dataSet.setLineWidth(2);
                         dataSet.setDrawCircles(false);
                         dataSet.setMode(LineDataSet.Mode.LINEAR);
                         entries.add(dataSet);
@@ -411,6 +413,7 @@ private LineData generateData(View view) {
                     if (addTemperatureRange) {
                         dataSet = new LineDataSet(valuestMax, list.getKey() + " " + "Max"); // add entries to dataset
                         dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                        dataSet.setLineWidth(2);
                         dataSet.setDrawCircles(false);
                         dataSet.setMode(LineDataSet.Mode.LINEAR);
                         dataSet.setDrawFilled(true);
@@ -419,6 +422,7 @@ private LineData generateData(View view) {
 
                         dataSet = new LineDataSet(valuestMin, list.getKey() + " " + "Min"); // add entries to dataset
                         dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                        dataSet.setLineWidth(2);
                         dataSet.setDrawCircles(false);
                         dataSet.setMode(LineDataSet.Mode.LINEAR);
                         dataSet.setFillAlpha(255);
@@ -431,6 +435,7 @@ private LineData generateData(View view) {
                 if (addHumidity) {
                     LineDataSet dataSet = new LineDataSet(valueshu, list.getKey() + " " + getString(R.string.humidity)); // add entries to dataset
                     dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                    dataSet.setLineWidth(2);
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
                     entries.add(dataSet);
@@ -439,6 +444,7 @@ private LineData generateData(View view) {
                 if (addBarometer) {
                     LineDataSet dataSet = new LineDataSet(valuesba, list.getKey() + " " + getString(R.string.barometer)); // add entries to dataset
                     dataSet.setColor(MaterialColorPalette.getRandomColor("600"));
+                    dataSet.setLineWidth(2);
                     dataSet.setDrawCircles(false);
                     dataSet.setMode(LineDataSet.Mode.LINEAR);
                     entries.add(dataSet);

diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Thu Aug 06 10:18:53 CEST 2020
-VERSION_BUILD=7872
+#Thu Aug 06 11:22:02 CEST 2020
+VERSION_BUILD=7873
 VERSION_PATCH=231
 VERSION_CODE=522
diff --git a/domoticzapi/version.properties b/domoticzapi/version.properties
@@ -1,4 +1,4 @@
-#Thu Aug 06 10:18:53 CEST 2020
+#Thu Aug 06 11:22:02 CEST 2020
 VERSION_BUILD=3675
 VERSION_PATCH=254
 VERSION_CODE=254