fragment samples with fix data

Author: hannesa2

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/BarChartFrag.java

@@ -47,7 +47,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         Typeface tf = Typeface.createFromAsset(requireContext().getAssets(), "OpenSans-Light.ttf");
 
-        chart.setData(generateBarData(1, 20000, 12));
+        chart.setData(generateBarData(1, 20000));
 
         Legend l = chart.getLegend();
         l.setTypeface(tf);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/ScatterChartFrag.java

@@ -41,7 +41,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         chart.setMarker(mv);
 
         chart.setDrawGridBackground(false);
-        chart.setData(generateScatterData(6, 10000, 200));
+        chart.setData(generateScatterData(6, 10000));
 
         XAxis xAxis = chart.getXAxis();
         xAxis.setEnabled(true);

MPChartExample/src/main/java/com/xxmassdeveloper/mpchartexample/fragments/SimpleFragment.java

@@ -26,6 +26,7 @@
 import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet;
 import com.github.mikephil.charting.utils.ColorTemplate;
 import com.github.mikephil.charting.utils.FileUtils;
+import com.xxmassdeveloper.mpchartexample.DataTools;
 
 import java.util.ArrayList;
 
@@ -44,16 +45,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
-    protected BarData generateBarData(int dataSets, float range, int count) {
-
+    protected BarData generateBarData(int dataSets, float range) {
+        int count = 12;
+        Double[] values = DataTools.Companion.getValues(count);
         ArrayList<IBarDataSet> sets = new ArrayList<>();
 
         for(int i = 0; i < dataSets; i++) {
 
             ArrayList<BarEntry> entries = new ArrayList<>();
 
             for(int j = 0; j < count; j++) {
-                entries.add(new BarEntry(j, (float) (Math.random() * range) + range / 4));
+                entries.add(new BarEntry(j, (float) (values[j].floatValue() * range) + range / 4));
             }
 
             BarDataSet ds = new BarDataSet(entries, getLabel(i));
@@ -66,8 +68,9 @@ protected BarData generateBarData(int dataSets, float range, int count) {
         return d;
     }
 
-    protected ScatterData generateScatterData(int dataSets, float range, int count) {
-
+    protected ScatterData generateScatterData(int dataSets, float range) {
+        int count = 100;
+        Double[] values = DataTools.Companion.getValues(count);
         ArrayList<IScatterDataSet> sets = new ArrayList<>();
 
         ScatterChart.ScatterShape[] shapes = ScatterChart.ScatterShape.getAllDefaultShapes();
@@ -77,7 +80,7 @@ protected ScatterData generateScatterData(int dataSets, float range, int count)
             ArrayList<Entry> entries = new ArrayList<>();
 
             for(int j = 0; j < count; j++) {
-                entries.add(new Entry(j, (float) (Math.random() * range) + range / 4));
+                entries.add(new Entry(j, (float) (values[j].floatValue() * range) + range / 4));
             }
 
             ScatterDataSet ds = new ScatterDataSet(entries, getLabel(i));
@@ -100,11 +103,11 @@ protected ScatterData generateScatterData(int dataSets, float range, int count)
     protected PieData generatePieData() {
 
         int count = 4;
-
+        Double[] values = DataTools.Companion.getValues(count);
         ArrayList<PieEntry> entries1 = new ArrayList<>();
 
         for(int i = 0; i < count; i++) {
-            entries1.add(new PieEntry((float) ((Math.random() * 60) + 40), "Quarter " + (i+1)));
+            entries1.add(new PieEntry((float) ((values[i].floatValue() * 60) + 40), "Quarter " + (i+1)));
         }
 
         PieDataSet ds1 = new PieDataSet(entries1, "Quarterly Revenues 2015");