Work on radarchart
diff --git a/MPChartExample/res/layout/activity_radarchart_noseekbar.xml b/MPChartExample/res/layout/activity_radarchart_noseekbar.xml
index 1de38d5..2e8d7b5 100644
--- a/MPChartExample/res/layout/activity_radarchart_noseekbar.xml
+++ b/MPChartExample/res/layout/activity_radarchart_noseekbar.xml
@@ -1,11 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="0.5"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="YOUR PREFERENCES"
+ android:id="@+id/textView"/>
<com.github.mikephil.charting.charts.RadarChart
android:id="@+id/chart1"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_height="0dp"
+ android:layout_weight="2" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
index 66d9f53..5062ab3 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/RadarChartActivitry.java
@@ -1,11 +1,13 @@
package com.xxmassdeveloper.mpchartexample;
+import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.WindowManager;
+import android.widget.TextView;
import android.widget.Toast;
import com.github.mikephil.charting.animation.Easing;
@@ -37,16 +39,23 @@
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
- setContentView(R.layout.activity_radarchart);
-
- mChart = (RadarChart) findViewById(R.id.chart1);
+ setContentView(R.layout.activity_radarchart_noseekbar);
tf = Typeface.createFromAsset(getAssets(), "OpenSans-Regular.ttf");
+ TextView tv = (TextView) findViewById(R.id.textView);
+ tv.setTypeface(tf);
+ tv.setTextColor(Color.WHITE);
+ tv.setBackgroundColor(Color.rgb(60, 65, 82));
+
+ mChart = (RadarChart) findViewById(R.id.chart1);
+ mChart.setBackgroundColor(Color.rgb(60, 65, 82));
+
mChart.setDescription("");
- mChart.setWebLineWidth(1.5f);
- mChart.setWebLineWidthInner(0.75f);
+ mChart.setWebLineWidth(1f);
+ mChart.setWebColor(Color.LTGRAY);
+ mChart.setWebLineWidthInner(1f);
mChart.setWebAlpha(100);
// create a custom MarkerView (extend MarkerView) and specify the layout
@@ -66,10 +75,14 @@
XAxis xAxis = mChart.getXAxis();
xAxis.setTypeface(tf);
xAxis.setTextSize(9f);
+ xAxis.setYOffset(0f);
+ xAxis.setXOffset(0f);
xAxis.setValueFormatter(new AxisValueFormatter() {
+
+ private String[] mActivities = new String[]{"Burger", "Steak", "Salad", "Pasta", "Pizza"};
@Override
public String getFormattedValue(float value, AxisBase axis) {
- return mMonths[(int) value % mMonths.length];
+ return mActivities[(int) value % mActivities.length];
}
@Override
@@ -77,18 +90,21 @@
return 0;
}
});
+ xAxis.setTextColor(Color.WHITE);
YAxis yAxis = mChart.getYAxis();
yAxis.setTypeface(tf);
yAxis.setLabelCount(5, false);
yAxis.setTextSize(9f);
yAxis.setAxisMinValue(0f);
+ yAxis.setDrawLabels(false);
Legend l = mChart.getLegend();
- l.setPosition(LegendPosition.RIGHT_OF_CHART);
+ l.setPosition(LegendPosition.ABOVE_CHART_CENTER);
l.setTypeface(tf);
l.setXEntrySpace(7f);
l.setYEntrySpace(5f);
+ l.setTextColor(Color.WHITE);
}
@Override
@@ -190,15 +206,11 @@
return true;
}
- private String[] mParties = new String[]{
- "Party A", "Party B", "Party C", "Party D", "Party E", "Party F", "Party G", "Party H",
- "Party I"
- };
-
public void setData() {
- float mult = 150;
- int cnt = 9;
+ float mult = 80;
+ float min = 20;
+ int cnt = 5;
ArrayList<Entry> yVals1 = new ArrayList<Entry>();
ArrayList<Entry> yVals2 = new ArrayList<Entry>();
@@ -207,25 +219,27 @@
// xIndex (even if from different DataSets), since no values can be
// drawn above each other.
for (int i = 0; i < cnt; i++) {
- float val = (float) (Math.random() * mult) + mult / 2;
+ float val = (float) (Math.random() * mult) + min;
yVals1.add(new Entry(i, val));
}
for (int i = 0; i < cnt; i++) {
- float val = (float) (Math.random() * mult) + mult / 2;
+ float val = (float) (Math.random() * mult) + min;
yVals2.add(new Entry(i, val));
}
- RadarDataSet set1 = new RadarDataSet(yVals1, "Set 1");
- set1.setColor(ColorTemplate.VORDIPLOM_COLORS[0]);
- set1.setFillColor(ColorTemplate.VORDIPLOM_COLORS[0]);
+ RadarDataSet set1 = new RadarDataSet(yVals1, "Last Week");
+ set1.setColor(Color.rgb(103, 110, 129));
+ set1.setFillColor(Color.rgb(103, 110, 129));
set1.setDrawFilled(true);
+ set1.setFillAlpha(180);
set1.setLineWidth(2f);
- RadarDataSet set2 = new RadarDataSet(yVals2, "Set 2");
- set2.setColor(ColorTemplate.VORDIPLOM_COLORS[4]);
- set2.setFillColor(ColorTemplate.VORDIPLOM_COLORS[4]);
+ RadarDataSet set2 = new RadarDataSet(yVals2, "This Week");
+ set2.setColor(Color.rgb(121, 162, 175));
+ set2.setFillColor(Color.rgb(121, 162, 175));
set2.setDrawFilled(true);
+ set2.setFillAlpha(180);
set2.setLineWidth(2f);
ArrayList<IRadarDataSet> sets = new ArrayList<IRadarDataSet>();
@@ -236,6 +250,7 @@
data.setValueTypeface(tf);
data.setValueTextSize(8f);
data.setDrawValues(false);
+ data.setValueTextColor(Color.WHITE);
mChart.setData(data);
mChart.invalidate();
diff --git a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
index 0bac51c..7c5652f 100644
--- a/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
+++ b/MPChartExample/src/com/xxmassdeveloper/mpchartexample/ScatterChartActivity.java
@@ -62,8 +62,8 @@
mChart.setOnChartValueSelectedListener(this);
mChart.setDrawGridBackground(false);
-
mChart.setTouchEnabled(true);
+ mChart.setMaxHighlightDistance(50f);
// enable scaling and dragging
mChart.setDragEnabled(true);
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
index 9dbdfc8..c3d14c0 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.java
@@ -217,7 +217,7 @@
XAxis x = this.getXAxis();
if (x.isEnabled() && x.isDrawLabelsEnabled()) {
- minOffset = Math.max(minOffset, x.mLabelRotatedWidth * 2f);
+ minOffset = Math.max(minOffset, x.mLabelRotatedWidth);
}
}
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java
index e8c086c..7519d50 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.java
@@ -228,7 +228,7 @@
mWebPaint.setColor(mChart.getWebColorInner());
mWebPaint.setAlpha(mChart.getWebAlpha());
- int labelCount = mChart.getYAxis().mEntries.length;
+ int labelCount = mChart.getYAxis().mEntryCount;
for (int j = 0; j < labelCount; j++) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java
index 8dd2191..ed30084 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererRadarChart.java
@@ -47,7 +47,7 @@
float angle = (sliceangle * i + mChart.getRotationAngle()) % 360f;
PointF p = Utils.getPosition(center, mChart.getYRange() * factor
- + mXAxis.mLabelRotatedWidth, angle);
+ + mXAxis.mLabelRotatedWidth / 2f, angle);
drawLabel(c, label, p.x, p.y - mXAxis.mLabelRotatedHeight / 2.f,
drawLabelAnchor, labelRotationAngleDegrees);