Merge pull request ylyc#3 from markus2610/master

support gradle and android target 22
hishamMuneer · May 8, 2015 · 034d358 · 034d358
2 parents 5904e3c + 8616430
commit 034d358
Show file tree

Hide file tree

Showing 73 changed files with 635 additions and 532 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,30 @@
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+/*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# android studio
+.idea
diff --git a/.project b/.project
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
diff --git a/bin/CircularProgressBarExample.apk b/bin/CircularProgressBarExample.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/lylc/.DS_Store b/bin/classes/com/lylc/.DS_Store
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/BuildConfig.class b/bin/classes/com/lylc/widget/circularprogressbar/example/BuildConfig.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar$1.class b/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar$1.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar$2.class b/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar$2.class
diff --git a/...lc/widget/circularprogressbar/example/CircularProgressBar$ProgressAnimationListener.class b/...lc/widget/circularprogressbar/example/CircularProgressBar$ProgressAnimationListener.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar.class b/bin/classes/com/lylc/widget/circularprogressbar/example/CircularProgressBar.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/MainActivity$1.class b/bin/classes/com/lylc/widget/circularprogressbar/example/MainActivity$1.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/MainActivity.class b/bin/classes/com/lylc/widget/circularprogressbar/example/MainActivity.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$attr.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$attr.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$color.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$color.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$dimen.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$dimen.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$drawable.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$drawable.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$id.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$id.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$layout.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$layout.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$menu.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$menu.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$string.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$string.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$style.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$style.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R$styleable.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R$styleable.class
diff --git a/bin/classes/com/lylc/widget/circularprogressbar/example/R.class b/bin/classes/com/lylc/widget/circularprogressbar/example/R.class
diff --git a/bin/dexedLibs/android-support-v4-af20d359211d95ff945fdbdc9d6824f9.jar b/bin/dexedLibs/android-support-v4-af20d359211d95ff945fdbdc9d6824f9.jar
diff --git a/bin/jarlist.cache b/bin/jarlist.cache
diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png
diff --git a/bin/res/drawable-mdpi/ic_launcher.png b/bin/res/drawable-mdpi/ic_launcher.png
diff --git a/bin/res/drawable-xhdpi/ic_launcher.png b/bin/res/drawable-xhdpi/ic_launcher.png
diff --git a/bin/res/drawable-xxhdpi/ic_launcher.png b/bin/res/drawable-xxhdpi/ic_launcher.png
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,15 @@
+// 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:1.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/circular_progress_bar.iml b/circular_progress_bar.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/gen/com/lylc/widget/circularprogressbar/example/BuildConfig.java b/gen/com/lylc/widget/circularprogressbar/example/BuildConfig.java