mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge
synced 2024-08-26 01:00:52 +02:00
Update to latest master in mpac and fix labels for sleep chart as well
This commit is contained in:
parent
f35f76a42b
commit
75bca1b924
@ -68,7 +68,7 @@ dependencies {
|
|||||||
compile 'com.android.support:design:23.3.0'
|
compile 'com.android.support:design:23.3.0'
|
||||||
compile 'com.github.tony19:logback-android-classic:1.1.1-4'
|
compile 'com.github.tony19:logback-android-classic:1.1.1-4'
|
||||||
compile 'org.slf4j:slf4j-api:1.7.7'
|
compile 'org.slf4j:slf4j-api:1.7.7'
|
||||||
compile 'com.github.PhilJay:MPAndroidChart:01d8b246869f3d9517b615814d8ecb30cbfebdf0'
|
compile 'com.github.PhilJay:MPAndroidChart:3398cf4462bc7f49bb1156ef22040e8a0d63369f'
|
||||||
compile 'com.github.pfichtner:durationformatter:0.1.1'
|
compile 'com.github.pfichtner:durationformatter:0.1.1'
|
||||||
compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
|
compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
|
||||||
compile 'net.e175.klaus:solarpositioning:0.0.9'
|
compile 'net.e175.klaus:solarpositioning:0.0.9'
|
||||||
|
@ -100,6 +100,7 @@ public class SleepChartFragment extends AbstractChartFragment {
|
|||||||
mSleepAmountChart.setData(mcd.getPieData().getPieData());
|
mSleepAmountChart.setData(mcd.getPieData().getPieData());
|
||||||
|
|
||||||
mActivityChart.setData(null); // workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317
|
mActivityChart.setData(null); // workaround for https://github.com/PhilJay/MPAndroidChart/issues/2317
|
||||||
|
xIndexFormatter.setxLabels(mcd.getChartsData().getXLabels());
|
||||||
mActivityChart.setData(mcd.getChartsData().getCombinedData());
|
mActivityChart.setData(mcd.getChartsData().getCombinedData());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,8 +166,8 @@ public class SleepChartFragment extends AbstractChartFragment {
|
|||||||
y.setDrawGridLines(false);
|
y.setDrawGridLines(false);
|
||||||
// y.setDrawLabels(false);
|
// y.setDrawLabels(false);
|
||||||
// TODO: make fixed max value optional
|
// TODO: make fixed max value optional
|
||||||
y.setAxisMaxValue(1f);
|
y.setAxisMaximum(1f);
|
||||||
y.setAxisMinValue(0);
|
y.setAxisMinimum(0);
|
||||||
y.setDrawTopYLabelEntry(false);
|
y.setDrawTopYLabelEntry(false);
|
||||||
y.setTextColor(CHART_TEXT_COLOR);
|
y.setTextColor(CHART_TEXT_COLOR);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user