From c17fa03c47d55530ab4f4a00f47aed2b2cac4497 Mon Sep 17 00:00:00 2001
From: 张海江 <181069201@qq.com>
Date: Wed, 21 Dec 2016 11:24:01 +0800
Subject: [PATCH] 图表demo
---
ChartDemo/gradle/wrapper/gradle-wrapper.properties | 6
ChartDemo/.idea/compiler.xml | 22 +
ChartDemo/gradlew.bat | 90 ++++++
ChartDemo/.idea/misc.xml | 62 ++++
ChartDemo/build.gradle | 23 +
ChartDemo/.idea/modules.xml | 9
MapCoordinatesApp/.idea/vcs.xml | 6
ChartDemo/app/src/test/java/com/moral/chartdemo/ExampleUnitTest.java | 17 +
ChartDemo/app/src/main/AndroidManifest.xml | 20 +
ChartDemo/app/src/main/res/layout/activity_main.xml | 17 +
ChartDemo/app/src/main/res/values/dimens.xml | 5
ChartDemo/gradle.properties | 17 +
ChartDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png | 0
ChartDemo/app/src/main/res/values/styles.xml | 11
ChartDemo/app/src/main/res/values-w820dp/dimens.xml | 6
ChartDemo/.idea/gradle.xml | 19 +
ChartDemo/app/src/main/res/values/colors.xml | 6
ChartDemo/gradlew | 160 ++++++++++++
ChartDemo/app/src/main/res/values/strings.xml | 3
ChartDemo/app/build.gradle | 32 ++
ChartDemo/settings.gradle | 1
ChartDemo/.gitignore | 9
ChartDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png | 0
ChartDemo/app/proguard-rules.pro | 17 +
ChartDemo/.idea/runConfigurations.xml | 12
ChartDemo/app/src/main/java/com/moral/chartdemo/MainActivity.java | 177 +++++++++++++
ChartDemo/app/.gitignore | 1
ChartDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png | 0
ChartDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | 0
ChartDemo/.idea/copyright/profiles_settings.xml | 3
ChartDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png | 0
ChartDemo/app/src/androidTest/java/com/moral/chartdemo/ExampleInstrumentedTest.java | 26 ++
MapCoordinatesApp/.idea/misc.xml | 2
ChartDemo/gradle/wrapper/gradle-wrapper.jar | 0
34 files changed, 778 insertions(+), 1 deletions(-)
diff --git a/ChartDemo/.gitignore b/ChartDemo/.gitignore
new file mode 100644
index 0000000..39fb081
--- /dev/null
+++ b/ChartDemo/.gitignore
@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/ChartDemo/.idea/compiler.xml b/ChartDemo/.idea/compiler.xml
new file mode 100644
index 0000000..96cc43e
--- /dev/null
+++ b/ChartDemo/.idea/compiler.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ <entry name="!?*.form" />
+ <entry name="!?*.class" />
+ <entry name="!?*.groovy" />
+ <entry name="!?*.scala" />
+ <entry name="!?*.flex" />
+ <entry name="!?*.kt" />
+ <entry name="!?*.clj" />
+ <entry name="!?*.aj" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
+ </component>
+</project>
\ No newline at end of file
diff --git a/ChartDemo/.idea/copyright/profiles_settings.xml b/ChartDemo/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/ChartDemo/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="" />
+</component>
\ No newline at end of file
diff --git a/ChartDemo/.idea/gradle.xml b/ChartDemo/.idea/gradle.xml
new file mode 100644
index 0000000..124aaaa
--- /dev/null
+++ b/ChartDemo/.idea/gradle.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="distributionType" value="LOCAL" />
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleHome" value="D:\myprogramfiles\Android\Android Studio\gradle\gradle-2.14.1" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/app" />
+ </set>
+ </option>
+ <option name="resolveModulePerSourceSet" value="false" />
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/ChartDemo/.idea/misc.xml b/ChartDemo/.idea/misc.xml
new file mode 100644
index 0000000..7158618
--- /dev/null
+++ b/ChartDemo/.idea/misc.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="NullableNotNullManager">
+ <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+ <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+ <option name="myNullables">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+ </list>
+ </value>
+ </option>
+ <option name="myNotNulls">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+ <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+ <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+ <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+ </list>
+ </value>
+ </option>
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
+ <component name="ProjectType">
+ <option name="id" value="Android" />
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
+</project>
\ No newline at end of file
diff --git a/ChartDemo/.idea/modules.xml b/ChartDemo/.idea/modules.xml
new file mode 100644
index 0000000..da358bb
--- /dev/null
+++ b/ChartDemo/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/ChartDemo.iml" filepath="$PROJECT_DIR$/ChartDemo.iml" />
+ <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/ChartDemo/.idea/runConfigurations.xml b/ChartDemo/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/ChartDemo/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RunConfigurationProducerService">
+ <option name="ignoredProducers">
+ <set>
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+ <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/ChartDemo/app/.gitignore b/ChartDemo/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/ChartDemo/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/ChartDemo/app/build.gradle b/ChartDemo/app/build.gradle
new file mode 100644
index 0000000..c1b6a39
--- /dev/null
+++ b/ChartDemo/app/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.1"
+ defaultConfig {
+ applicationId "com.moral.chartdemo"
+ minSdkVersion 15
+ targetSdkVersion 25
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ })
+ compile 'com.android.support:appcompat-v7:25.0.1'
+ testCompile 'junit:junit:4.12'
+ dependencies{
+ compile 'com.github.lecho:hellocharts-library:1.5.8@aar'
+ }
+}
diff --git a/ChartDemo/app/proguard-rules.pro b/ChartDemo/app/proguard-rules.pro
new file mode 100644
index 0000000..67ae207
--- /dev/null
+++ b/ChartDemo/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\haijiang\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/ChartDemo/app/src/androidTest/java/com/moral/chartdemo/ExampleInstrumentedTest.java b/ChartDemo/app/src/androidTest/java/com/moral/chartdemo/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..5d0180c
--- /dev/null
+++ b/ChartDemo/app/src/androidTest/java/com/moral/chartdemo/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.moral.chartdemo;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() throws Exception {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getTargetContext();
+
+ assertEquals("com.moral.chartdemo", appContext.getPackageName());
+ }
+}
diff --git a/ChartDemo/app/src/main/AndroidManifest.xml b/ChartDemo/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..30c4e4a
--- /dev/null
+++ b/ChartDemo/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.moral.chartdemo">
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme">
+ <activity android:name=".MainActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
\ No newline at end of file
diff --git a/ChartDemo/app/src/main/java/com/moral/chartdemo/MainActivity.java b/ChartDemo/app/src/main/java/com/moral/chartdemo/MainActivity.java
new file mode 100644
index 0000000..2eeb558
--- /dev/null
+++ b/ChartDemo/app/src/main/java/com/moral/chartdemo/MainActivity.java
@@ -0,0 +1,177 @@
+package com.moral.chartdemo;
+
+import android.graphics.Color;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import lecho.lib.hellocharts.gesture.ContainerScrollType;
+import lecho.lib.hellocharts.gesture.ZoomType;
+import lecho.lib.hellocharts.model.Axis;
+import lecho.lib.hellocharts.model.AxisValue;
+import lecho.lib.hellocharts.model.Line;
+import lecho.lib.hellocharts.model.LineChartData;
+import lecho.lib.hellocharts.model.PointValue;
+import lecho.lib.hellocharts.model.ValueShape;
+import lecho.lib.hellocharts.model.Viewport;
+import lecho.lib.hellocharts.view.LineChartView;
+
+public class MainActivity extends AppCompatActivity {
+ private LineChartView lineChart;
+ Random random;
+ Line line;
+ LineChartData data;
+ Axis axisX;
+ private List<PointValue> mPointValues = new ArrayList<PointValue>();
+ private List<AxisValue> mAxisXValues = new ArrayList<AxisValue>();
+ private List<AxisValue> mAxisYValues = new ArrayList<AxisValue>();
+
+ private Timer timer;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ lineChart = (LineChartView) findViewById(R.id.chart);
+ random = new Random();
+ getAxisPoints();//���������������
+ initLineChart();//���������
+
+ showChangeLineChart();
+ }
+
+ /**
+ * ������X ������������
+ */
+ private void getAxisXLables(){
+// for (int i = 0; i < date.length; i++) {
+// mAxisXValues.add(new AxisValue(i).setLabel(date[i]));
+// }
+ } /**
+ * ������Y������������
+ */
+ private void getAxisYLables(){
+ for(int i = 0; i < 100; i++){
+ AxisValue value = new AxisValue(i);
+ String label = ""+i;
+ value.setLabel(label);
+ mAxisYValues.add(value);
+ }
+
+ }
+ /**
+ * ���������������������������
+ */
+ private void getAxisPoints() {
+// for (int i = 0; i < score.length; i++) {
+// mPointValues.add(new PointValue(i, score[i]));
+// }
+ }
+ private void initLineChart() {
+ line = new Line(mPointValues).setColor(Color.parseColor("#FFCD41")); //���������������������������
+ List<Line> lines = new ArrayList<Line>();
+ line.setShape(ValueShape.CIRCLE);//������������������������������������ ��������������� ������������ ���ValueShape.SQUARE ValueShape.CIRCLE ValueShape.DIAMOND���
+ line.setCubic(true);//���������������������������������������������
+ line.setFilled(false);//���������������������������
+ line.setHasLabels(true);//���������������������������������������
+// line.setHasLabelsOnlyForSelected(true);//������������������������������������������������line.setHasLabels(true);������������
+ line.setHasLines(true);//������������������������������false ������������������������������
+ line.setHasPoints(true);//������������������ ���������false ������������������������������������������������������������������������
+ lines.add(line);
+ data = new LineChartData();
+ data.setLines(lines);
+
+ //���������
+ axisX = new Axis(); //X���
+ axisX.setHasTiltedLabels(false); //X���������������������������������������������true���������������
+ axisX.setTextColor(Color.WHITE); //������������������
+ axisX.setName("������"); //������������
+ axisX.setTextSize(10);//������������������
+ axisX.setTextColor(Color.GRAY);
+// axisX.setMaxLabelChars(7); //������������X���������������������������������������X���������������������7<=x<=mAxisXValues.length
+ axisX.setValues(mAxisXValues); //������X������������������
+ data.setAxisXBottom(axisX); //x ������������
+ //data.setAxisXTop(axisX); //x ������������
+ axisX.setHasLines(true); //x ������������
+
+ // Y���������������������������������������Y���������(���������������������������Y������������������������������)
+ Axis axisY = Axis.generateAxisFromRange(0,100,1); //Y���
+ axisY.setAutoGenerated(false);
+ axisY.setHasLines(true);
+ axisY.setName("������");//y���������
+ axisY.setTextSize(10);//������������������
+ axisX.setTextColor(Color.GRAY);
+// axisY.setValues(mAxisYValues);
+ data.setAxisYLeft(axisY); //Y������������������
+ //data.setAxisYRight(axisY); //y������������������
+
+
+ //������������������������������������������������������
+ lineChart.setInteractive(true);
+ lineChart.setZoomType(ZoomType.HORIZONTAL);
+ lineChart.setMaxZoom((float) 2);//������������������
+ lineChart.setContainerScrollEnabled(true, ContainerScrollType.HORIZONTAL);
+ lineChart.setLineChartData(data);
+ lineChart.setVisibility(View.VISIBLE);
+
+ /**���������������7���10���������������������������������������
+ * ���������������������X������������������������������http://forum.xda-developers.com/tools/programming/library-hellocharts-charting-library-t2904456/page2���;
+ */
+ lineChart.setCurrentViewport(initViewPort(0,7));
+ lineChart.startDataAnimation();
+ }
+
+
+ /**
+ * ������������������������������������������������������������������������������������������
+ */
+ private boolean isFinish = false;
+ private int index = 0;
+ private void showChangeLineChart() {
+ timer = new Timer();
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if(!isFinish){
+ mPointValues.add(new PointValue(index,random.nextInt(100)));
+ mAxisXValues.add(new AxisValue(index).setLabel(index+""));
+ if(mPointValues.size()>7){
+ mPointValues.remove(0);
+ }
+ if(mAxisXValues.size()>7){
+ mAxisXValues.remove(0);
+ }
+// axisX.setMaxLabelChars(10);
+ axisX.setValues(mAxisXValues);
+ data.setAxisXBottom(axisX);
+// line.setValues(null);
+ line.setValues(mPointValues);
+ List<Line> lines = new ArrayList<Line>();
+ lines.add(line);
+ data.setLines(lines);
+ lineChart.setLineChartData(data);
+ index++;
+// int dx = mAxisXValues.size();
+// if(dx<7){
+// lineChart.setCurrentViewport(initViewPort(0,7));
+// }else{
+// lineChart.setCurrentViewport(initViewPort((dx/7-1)*7+dx%7,dx));
+// }
+
+ }
+ }
+ },1000,2000);
+ }
+
+ private Viewport initViewPort(float left, float right) {
+ Viewport port = new Viewport();
+ port.left = left;
+ port.right = right;
+ return port;
+ }
+}
diff --git a/ChartDemo/app/src/main/res/layout/activity_main.xml b/ChartDemo/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..1e78984
--- /dev/null
+++ b/ChartDemo/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,17 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ >
+
+ <lecho.lib.hellocharts.view.LineChartView
+ android:id="@+id/chart"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </lecho.lib.hellocharts.view.LineChartView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ChartDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ChartDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
--- /dev/null
+++ b/ChartDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/ChartDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ChartDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
--- /dev/null
+++ b/ChartDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/ChartDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ChartDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
--- /dev/null
+++ b/ChartDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ChartDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ChartDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
--- /dev/null
+++ b/ChartDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ChartDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ChartDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
--- /dev/null
+++ b/ChartDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/ChartDemo/app/src/main/res/values-w820dp/dimens.xml b/ChartDemo/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/ChartDemo/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/ChartDemo/app/src/main/res/values/colors.xml b/ChartDemo/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..3ab3e9c
--- /dev/null
+++ b/ChartDemo/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="colorPrimary">#3F51B5</color>
+ <color name="colorPrimaryDark">#303F9F</color>
+ <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/ChartDemo/app/src/main/res/values/dimens.xml b/ChartDemo/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/ChartDemo/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/ChartDemo/app/src/main/res/values/strings.xml b/ChartDemo/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..13307ab
--- /dev/null
+++ b/ChartDemo/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">ChartDemo</string>
+</resources>
diff --git a/ChartDemo/app/src/main/res/values/styles.xml b/ChartDemo/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/ChartDemo/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <!-- Customize your theme here. -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ </style>
+
+</resources>
diff --git a/ChartDemo/app/src/test/java/com/moral/chartdemo/ExampleUnitTest.java b/ChartDemo/app/src/test/java/com/moral/chartdemo/ExampleUnitTest.java
new file mode 100644
index 0000000..b531002
--- /dev/null
+++ b/ChartDemo/app/src/test/java/com/moral/chartdemo/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.moral.chartdemo;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() throws Exception {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/ChartDemo/build.gradle b/ChartDemo/build.gradle
new file mode 100644
index 0000000..c20bca1
--- /dev/null
+++ b/ChartDemo/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.2.2'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/ChartDemo/gradle.properties b/ChartDemo/gradle.properties
new file mode 100644
index 0000000..aac7c9b
--- /dev/null
+++ b/ChartDemo/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/ChartDemo/gradle/wrapper/gradle-wrapper.jar b/ChartDemo/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
--- /dev/null
+++ b/ChartDemo/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ChartDemo/gradle/wrapper/gradle-wrapper.properties b/ChartDemo/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..04e285f
--- /dev/null
+++ b/ChartDemo/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/ChartDemo/gradlew b/ChartDemo/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/ChartDemo/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/ChartDemo/gradlew.bat b/ChartDemo/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/ChartDemo/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ChartDemo/settings.gradle b/ChartDemo/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/ChartDemo/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/MapCoordinatesApp/.idea/misc.xml b/MapCoordinatesApp/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/MapCoordinatesApp/.idea/misc.xml
+++ b/MapCoordinatesApp/.idea/misc.xml
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/MapCoordinatesApp/.idea/vcs.xml b/MapCoordinatesApp/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/MapCoordinatesApp/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
--
Gitblit v1.8.0