Started implementing examples for simple straight forward charts.

PhilJay · PhilJay · commit ff01a15210cb · 2014-07-25T20:09:00.000+02:00
diff --git a/MPChartExample/AndroidManifest.xml b/MPChartExample/AndroidManifest.xml
@@ -31,6 +31,7 @@
         <activity android:name="BarChartActivityMultiDataset"></activity>
         <activity android:name="DrawChartActivity"></activity>
         <activity android:name="ScatterChartActivity"></activity>
+        <activity android:name=".simple.SimpleChartDemo"></activity>
     </application>
 
 </manifest>
diff --git a/MPChartExample/res/layout/activity_main.xml b/MPChartExample/res/layout/activity_main.xml
@@ -6,14 +6,11 @@
     <ScrollView
         android:id="@+id/scrollView1"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true" >
+        android:layout_height="match_parent" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:orientation="vertical"
             android:padding="10dp" >
 
@@ -66,6 +63,13 @@
                 android:layout_margin="4dp"
                 android:text="Draw Chart" />
             
+            <Button
+                android:id="@+id/button8"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:text="Simple Design" />
+            
         </LinearLayout>
     </ScrollView>
 
diff --git a/MPChartExample/res/layout/frag_simple_bar.xml b/MPChartExample/res/layout/frag_simple_bar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <com.github.mikephil.charting.charts.BarChart
+        android:id="@+id/barChart1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/MPChartExample/res/layout/frag_simple_line.xml b/MPChartExample/res/layout/frag_simple_line.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/lineChart1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/MPChartExample/res/layout/frag_simple_pie.xml b/MPChartExample/res/layout/frag_simple_pie.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <com.github.mikephil.charting.charts.PieChart
+        android:id="@+id/pieChart1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/MPChartExample/res/layout/frag_simple_scatter.xml b/MPChartExample/res/layout/frag_simple_scatter.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <com.github.mikephil.charting.charts.ScatterChart
+        android:id="@+id/scatterChart1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/MPChartExample/src/com/example/mpchartexample/LineChartActivity.java b/MPChartExample/src/com/example/mpchartexample/LineChartActivity.java
@@ -139,6 +139,8 @@ protected void onCreate(Bundle savedInstanceState) {
 //        l.setPosition(LegendPosition.LEFT_OF_CHART);   
         l.setForm(LegendForm.LINE);
         
+        mChart.setOffsets(100, 100, 200, 200);
+        
         // dont forget to refresh the drawing
         mChart.invalidate();
     }
diff --git a/MPChartExample/src/com/example/mpchartexample/MainActivity.java b/MPChartExample/src/com/example/mpchartexample/MainActivity.java
@@ -8,6 +8,8 @@
 import android.view.WindowManager;
 import android.widget.Button;
 
+import com.example.mpchartexample.simple.SimpleChartDemo;
+
 public class MainActivity extends Activity implements OnClickListener {
 
 	@Override
@@ -23,13 +25,15 @@ protected void onCreate(Bundle savedInstanceState) {
 		Button btn5 = (Button) findViewById(R.id.button5);
 		Button btn6 = (Button) findViewById(R.id.button6);
 		Button btn7 = (Button) findViewById(R.id.button7);
+		Button btn8 = (Button) findViewById(R.id.button8);
 		btn1.setOnClickListener(this);
 		btn2.setOnClickListener(this);
 		btn3.setOnClickListener(this);
 		btn4.setOnClickListener(this);
 		btn5.setOnClickListener(this);
 		btn6.setOnClickListener(this);
 		btn7.setOnClickListener(this);
+		btn8.setOnClickListener(this);
 	}
 
 	@Override
@@ -66,6 +70,10 @@ public void onClick(View v) {
 			i = new Intent(this, DrawChartActivity.class);
 			startActivity(i);
 			break;
+		case R.id.button8:
+            i = new Intent(this, SimpleChartDemo.class);
+            startActivity(i);
+            break;
 		}
 	}
 }
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/BarChartFrag.java b/MPChartExample/src/com/example/mpchartexample/simple/BarChartFrag.java
@@ -0,0 +1,30 @@
+package com.example.mpchartexample.simple;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.mpchartexample.R;
+import com.github.mikephil.charting.charts.BarChart;
+
+
+public class BarChartFrag extends SimpleFragment {
+
+    public static Fragment newInstance() {
+        return new BarChartFrag();
+    }
+
+    private BarChart mChart;
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.frag_simple_bar, container, false);
+        
+        mChart = (BarChart) v.findViewById(R.id.barChart1);
+        
+        mChart.setData(generateData());
+        
+        return v;
+    }
+}
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/LineChartFrag.java b/MPChartExample/src/com/example/mpchartexample/simple/LineChartFrag.java
@@ -0,0 +1,30 @@
+package com.example.mpchartexample.simple;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.mpchartexample.R;
+import com.github.mikephil.charting.charts.LineChart;
+
+
+public class LineChartFrag extends SimpleFragment {
+
+    public static Fragment newInstance() {
+        return new LineChartFrag();
+    }
+
+    private LineChart mChart;
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.frag_simple_line, container, false);
+        
+        mChart = (LineChart) v.findViewById(R.id.lineChart1);
+        
+        mChart.setData(generateData());
+        
+        return v;
+    }
+}
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/PieChartFrag.java b/MPChartExample/src/com/example/mpchartexample/simple/PieChartFrag.java
@@ -0,0 +1,31 @@
+package com.example.mpchartexample.simple;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.mpchartexample.R;
+import com.github.mikephil.charting.charts.LineChart;
+import com.github.mikephil.charting.charts.PieChart;
+
+
+public class PieChartFrag extends SimpleFragment {
+
+    public static Fragment newInstance() {
+        return new PieChartFrag();
+    }
+
+    private PieChart mChart;
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.frag_simple_pie, container, false);
+        
+        mChart = (PieChart) v.findViewById(R.id.pieChart1);
+        
+        mChart.setData(generateLessData());
+        
+        return v;
+    }
+}
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/ScatterChartFrag.java b/MPChartExample/src/com/example/mpchartexample/simple/ScatterChartFrag.java
@@ -0,0 +1,31 @@
+package com.example.mpchartexample.simple;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.mpchartexample.R;
+import com.github.mikephil.charting.charts.LineChart;
+import com.github.mikephil.charting.charts.ScatterChart;
+
+
+public class ScatterChartFrag extends SimpleFragment {
+
+    public static Fragment newInstance() {
+        return new ScatterChartFrag();
+    }
+
+    private ScatterChart mChart;
+    
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.frag_simple_scatter, container, false);
+        
+        mChart = (ScatterChart) v.findViewById(R.id.scatterChart1);
+        
+        mChart.setData(generateData());
+        
+        return v;
+    }
+}
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/SimpleChartDemo.java b/MPChartExample/src/com/example/mpchartexample/simple/SimpleChartDemo.java
@@ -0,0 +1,65 @@
+
+package com.example.mpchartexample.simple;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+
+/**
+ * Demonstrates how to keep your charts straight forward, simple and beautiful with the MPAndroidChart library.
+ * 
+ * @author Philipp Jahoda
+ */
+public class SimpleChartDemo extends FragmentActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        ViewPager pager = new ViewPager(this);  
+        pager.setId(1000);
+        pager.setOffscreenPageLimit(3);
+        setContentView(pager);
+        
+        PageAdapter a = new PageAdapter(getSupportFragmentManager());
+        pager.setAdapter(a);
+    }
+    
+    
+    private class PageAdapter extends FragmentPagerAdapter {
+
+        public PageAdapter(FragmentManager fm) {
+            super(fm); 
+        }
+
+        @Override
+        public Fragment getItem(int pos) {  
+            Fragment f = null;
+            
+            switch(pos) {
+            case 0:
+                f = LineChartFrag.newInstance();
+                break;
+            case 1:
+                f = BarChartFrag.newInstance();
+                break;
+            case 2:
+                f = ScatterChartFrag.newInstance();
+                break;
+            case 3:
+                f = PieChartFrag.newInstance();
+                break;
+            }
+
+            return f;
+        }
+
+        @Override
+        public int getCount() {
+            return 4;
+        }       
+    }
+}
diff --git a/MPChartExample/src/com/example/mpchartexample/simple/SimpleFragment.java b/MPChartExample/src/com/example/mpchartexample/simple/SimpleFragment.java
@@ -0,0 +1,70 @@
+package com.example.mpchartexample.simple;
+
+import android.support.v4.app.Fragment;
+
+import com.github.mikephil.charting.data.ChartData;
+import com.github.mikephil.charting.data.DataSet;
+import com.github.mikephil.charting.data.Entry;
+
+import java.util.ArrayList;
+
+public abstract class SimpleFragment extends Fragment {
+
+    /**
+     * generates some random data, (2 DataSets, 2x20 values)
+     * @return
+     */
+    protected ChartData generateData() {
+        
+        int count = 20;
+        
+        ArrayList<String> xVals = new ArrayList<String>();
+        ArrayList<Entry> entries1 = new ArrayList<Entry>();
+        ArrayList<Entry> entries2 = new ArrayList<Entry>();
+        
+        for(int i = 0; i < count; i++) {
+            xVals.add("entry" + (i+1));
+    
+            entries1.add(new Entry((float) (Math.random() * 10000), i));
+            entries2.add(new Entry((float) (Math.random() * 10000), i));
+        }
+        
+        DataSet ds1 = new DataSet(entries1, "Company A");
+        DataSet ds2 = new DataSet(entries1, "Company B");
+        
+        ArrayList<DataSet> sets = new ArrayList<DataSet>();
+        sets.add(ds1);
+        sets.add(ds2);
+        
+        ChartData d = new ChartData(xVals, sets);
+        return d;
+    }
+    
+    /**
+     * generates less data (1 DataSet, 4 values)
+     * @return
+     */
+    protected ChartData generateLessData() {
+        
+        int count = 4;
+        
+        ArrayList<Entry> entries1 = new ArrayList<Entry>();
+        ArrayList<String> xVals = new ArrayList<String>();
+        
+        xVals.add("Quarter 1");
+        xVals.add("Quarter 2");
+        xVals.add("Quarter 3");
+        xVals.add("Quarter 4");
+        
+        for(int i = 0; i < count; i++) {
+            xVals.add("entry" + (i+1));
+    
+            entries1.add(new Entry((float) (Math.random() * 100), i));
+        }
+        
+        DataSet ds1 = new DataSet(entries1, "Quarterly revenues");
+        
+        ChartData d = new ChartData(xVals, ds1);
+        return d;
+    }
+}
diff --git a/MPChartLib/res/values/colors.xml b/MPChartLib/res/values/colors.xml
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/BarChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/BarChart.java
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/com/github/mikephil/charting/charts/Chart.java
diff --git a/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java b/MPChartLib/src/com/github/mikephil/charting/charts/PieChart.java
diff --git a/MPChartLib/src/com/github/mikephil/charting/utils/ColorTemplate.java b/MPChartLib/src/com/github/mikephil/charting/utils/ColorTemplate.java
diff --git a/screenshots/MPAndroidChart_trending.png b/screenshots/MPAndroidChart_trending.png

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ protected void onCreate(Bundle savedInstanceState) {`
`139`	`139`	`// l.setPosition(LegendPosition.LEFT_OF_CHART);`
`140`	`140`	`l.setForm(LegendForm.LINE);`
`141`	`141`
	`142`	`+ mChart.setOffsets(100, 100, 200, 200);`
	`143`	`+`
`142`	`144`	`// dont forget to refresh the drawing`
`143`	`145`	`mChart.invalidate();`
`144`	`146`	`}`