Andreas/solxpect
1
0
Fork 0
mirror of https://github.com/woheller69/solxpect.git synced 2025-09-22 08:50:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix y-axis labels

Browse source
This commit is contained in:
woheller69 2023-04-16 20:05:11 +02:00
parent a3734b9d36
commit 3314f624da
2 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java
View file

@ -26,7 +26,6 @@ import org.woheller69.weather.database.HourlyForecast;
import org.woheller69.weather.database.SQLiteHelper; import org.woheller69.weather.database.SQLiteHelper;
import org.woheller69.weather.database.WeekForecast; import org.woheller69.weather.database.WeekForecast;
import org.woheller69.weather.ui.Help.StringFormatUtils; import org.woheller69.weather.ui.Help.StringFormatUtils;
import org.woheller69.weather.ui.UiResourceProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
@ -181,13 +180,13 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
public class ChartViewHolder extends ViewHolder { public class ChartViewHolder extends ViewHolder {
TextView precipitationunit; TextView energyUnit;
BarChartView barChartView; BarChartView barChartView;
ChartViewHolder(View v) { ChartViewHolder(View v) {
super(v); super(v);
this.barChartView = v.findViewById(R.id.graph_precipitation); this.barChartView = v.findViewById(R.id.graph_energy);
this.precipitationunit=v.findViewById(R.id.graph_precipitationunit); this.energyUnit =v.findViewById(R.id.graph_energyunit);
} }
} }
@ -342,9 +341,9 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
return; return;
} }
float pmax=0; float energyMax=0;
BarSet precipitationDataset = new BarSet(); BarSet energyDataset = new BarSet();
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.setTimeZone(TimeZone.getTimeZone("GMT")); c.setTimeZone(TimeZone.getTimeZone("GMT"));
@ -353,34 +352,46 @@ public class CityWeatherAdapter extends RecyclerView.Adapter<CityWeatherAdapter.
for (int i=0 ; i< weekforecasts.size();i++) { for (int i=0 ; i< weekforecasts.size();i++) {
c.setTimeInMillis(weekforecasts.get(i).getForecastTime()+zonemilliseconds); c.setTimeInMillis(weekforecasts.get(i).getForecastTime()+zonemilliseconds);
int day = c.get(Calendar.DAY_OF_WEEK); int day = c.get(Calendar.DAY_OF_WEEK);
float precip=weekforecasts.get(i).getEnergyDay(); float energyDay=weekforecasts.get(i).getEnergyDay();
String dayString = context.getResources().getString(StringFormatUtils.getDayShort(day)); String dayString = context.getResources().getString(StringFormatUtils.getDayShort(day));
if (weekforecasts.size()>8) dayString=dayString.substring(0,1); //use first character only if more than 8 days to avoid overlapping text if (weekforecasts.size()>8) dayString=dayString.substring(0,1); //use first character only if more than 8 days to avoid overlapping text
precipitationDataset.addBar(dayString, precip); energyDataset.addBar(dayString, energyDay);
if (precip>pmax) pmax=precip; if (energyDay>energyMax) energyMax=energyDay;
} }
ArrayList<ChartSet> precipitation = new ArrayList<>(); //Calculate step size. Target: 4 <= steps < 10, but step size must integer >= 1
precipitation.add(precipitationDataset); int stepSize = 1;
int numSteps;
precipitationDataset.setColor(ContextCompat.getColor(context,R.color.yellow)); do {
precipitationDataset.setAlpha(0.8f); // make precipitation bars transparent numSteps = (int) (energyMax / stepSize);
if (numSteps > 10) stepSize *=10;
else if (numSteps < 4) stepSize /=2;
} while (numSteps > 10 || numSteps < 4 && stepSize>0);
holder.barChartView.addData(precipitation); if (stepSize<1) stepSize=1; //Step size must be integer, min 1
ArrayList<ChartSet> energyData = new ArrayList<>();
energyData.add(energyDataset);
energyDataset.setColor(ContextCompat.getColor(context,R.color.yellow));
energyDataset.setAlpha(0.8f); // make energyData bars transparent
holder.barChartView.addData(energyData);
holder.barChartView.setBarSpacing(10); holder.barChartView.setBarSpacing(10);
holder.barChartView.setStep(stepSize);
holder.barChartView.setXAxis(false); holder.barChartView.setXAxis(false);
holder.barChartView.setYAxis(false); holder.barChartView.setYAxis(false);
holder.barChartView.setYLabels(AxisController.LabelPosition.INSIDE); //no labels for precipitation holder.barChartView.setYLabels(AxisController.LabelPosition.OUTSIDE);
holder.barChartView.setLabelsColor(ContextCompat.getColor(context,R.color.colorPrimaryDark)); //transparent color, make labels invisible holder.barChartView.setLabelsColor(ContextCompat.getColor(context,R.color.colorPrimaryDark)); //transparent color, make labels invisible
holder.barChartView.setAxisColor(ContextCompat.getColor(context,R.color.colorPrimaryDark)); holder.barChartView.setAxisColor(ContextCompat.getColor(context,R.color.colorPrimaryDark));
holder.barChartView.setFontSize((int) Tools.fromDpToPx(17)); holder.barChartView.setFontSize((int) Tools.fromDpToPx(17));
holder.barChartView.setBorderSpacing(Tools.fromDpToPx(30));
holder.barChartView.show(); holder.barChartView.show();
holder.precipitationunit.setText(" " + context.getResources().getString(R.string.units_kWh)+" "); holder.energyUnit.setText(" " + context.getResources().getString(R.string.units_kWh)+" ");
} }
//No update for error needed //No update for error needed
} }

5
app/src/main/res/layout/card_chart.xml
View file

@ -27,7 +27,7 @@
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/graph_precipitationunit" android:id="@+id/graph_energyunit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
@ -48,11 +48,12 @@
android:background="@color/white" /> android:background="@color/white" />
<com.db.chart.view.BarChartView <com.db.chart.view.BarChartView
android:id="@+id/graph_precipitation" android:id="@+id/graph_energy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_below="@+id/spacer" android:layout_below="@+id/spacer"
chart:chart_axisBorderSpacing="8dp" /> chart:chart_axisBorderSpacing="8dp" />
</RelativeLayout> </RelativeLayout>