Merge pull request #1 from PhilJay/master

getting data from master frok

.gitignore

@@ -11,6 +11,11 @@
 # generated files
 bin/
 gen/
+generated/
+docs/
+finalOutput/
+
+build.xml
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -37,3 +42,5 @@ build/
 
 # maven
 target/
+
+.DS_Store

.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Mon Jan 18 23:02:46 CET 2016
+build.family.org.gradle.tooling.model.eclipse.HierarchicalEclipseProject=;MPChartExample;MPChartLib;
+org.springsource.ide.eclipse.gradle.rootprojectloc=

CONTRIBUTING.md

@@ -0,0 +1,49 @@
+# How to contribute
+
+Bug-fixes and features often come from users of the MPAndroidChart library and improve it greatly. We want to keep it as easy as possible to contribute changes that improve the experience for users all around the world. There are a few guidelines that we
+need contributors to follow so that we can have a chance of keeping on
+top of things.
+
+## Simple issues and bug reports
+
+If you are reporting a bug which can be observed visually, please add to your issue either:
+
+* Screenshots, if the bug is easily explainable
+* A working sample project that we can compile, run, and immediately observe the issue
+
+## Getting Started with Contributions
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a ticket for your issue, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version (or commit number) that you know has the issue.
+* Fork the repository on GitHub
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work. This is usually the master branch.
+* Make commits of logical units.
+* Make sure your code conforms to the code style around it. It's easy, just look around!
+* If you have made changes back and forth, or have made merges, your commit history might look messy and hard to understand. A single issue or change should still be in one commit. So please squash those commits together and rebase them however you need to - to make our lives easier when reading it later.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the proper format.
+
+````
+    First line must be up to 50 chars (Fixes #1234)
+
+    The first line should be a short statement as to what have changed, and should also include an issue number, prefixed with a dash.
+    The body of the message comes after an empty new line, and describes the changes
+    more thoroughly, especially if there was a special case handled there,
+    or maybe some trickery that only code wizards can understand.
+````
+
+* Make sure you have tested your changes well.
+* If your changes could theoretically affect some other component or case, which you do not necessarily use, you still have to test it.
+* Create a Pull Request from your topic branch to the relevant branch in the main repo. If you go to the main repo of the framework, you'll see a big green button which pretty much prepares the PR for you. You just have to hit it.
+
+## Making Trivial Changes
+
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new ticket. In this case, it is
+appropriate to start the first line of a commit with '(doc)' instead of
+a ticket number. Even the default commit message the GitHub generates is fine with us.

MPChartExample/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,3 @@
+#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
+#Mon Jan 18 23:02:46 CET 2016
+org.springsource.ide.eclipse.gradle.rootprojectloc=..

MPChartExample/AndroidManifest.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xxmassdeveloper.mpchartexample"
-    android:versionCode="36"
-    android:versionName="2.0.7" >
+    android:versionCode="54"
+    android:versionName="3.0.1" >
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="21" />
+        android:minSdkVersion="16"
+        android:targetSdkVersion="24" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher" 
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
@@ -23,16 +24,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="LineChartActivity1"></activity>
+        <activity android:name="LineChartActivity1"></activity> <!--  android:configChanges="keyboardHidden|orientation|screenSize"  -->
         <activity android:name="LineChartActivity2"></activity>
-        <activity android:screenOrientation="landscape" android:name="MultipleChartsActivity"></activity>
+        <activity android:name=".LineChartTime"></activity>
         <activity android:name="BarChartActivity"></activity>
 		<activity android:name="HorizontalBarChartActivity"></activity>
         <activity android:name="PieChartActivity"></activity>
+        <activity android:name="PiePolylineChartActivity"></activity>
         <activity android:name="MultiLineChartActivity"></activity>
         <activity android:name="BarChartActivityMultiDataset"></activity>
         <activity android:name="DrawChartActivity"></activity>
         <activity android:name="ScatterChartActivity"></activity>
+        <activity android:name="BubbleChartActivity"></activity>
         <activity android:name="com.xxmassdeveloper.mpchartexample.fragments.SimpleChartDemo"></activity>
         <activity android:name="ListViewBarChartActivity"></activity>
         <activity android:name="ListViewMultiChartActivity"></activity>
@@ -44,9 +47,25 @@
         <activity android:name="RadarChartActivitry"></activity>
         <activity android:name="LineChartActivityColored"></activity>
         <activity android:name="DynamicalAddingActivity"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityLine"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityBar"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityHorizontalBar"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityScatter"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityCandle"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityBubble"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityPie"></activity>
+        <activity android:name=".realm.RealmDatabaseActivityRadar"></activity>
+        <activity android:name=".realm.RealmMainActivity"></activity>
         <activity android:name="RealtimeLineChartActivity"></activity>
         <activity android:name="CombinedChartActivity"></activity>
         <activity android:name="PerformanceLineChart"></activity>
+        <activity android:name="BarChartActivitySinus"></activity>
+        <activity android:name="ScrollViewActivity"></activity>
+        <activity android:name="StackedBarActivityNegative"></activity>
+        <activity android:name=".realm.RealmWikiExample"></activity>
+        <activity android:name=".BarChartPositiveNegative"></activity>
+        <activity android:name=".FilledLineActivity"></activity>
+        <activity android:name=".HalfPieChartActivity"></activity>
     </application>
 
 </manifest>