First round of fixes for geftimov#12 .

geftimov · geftimov · commit 56a2858209e5 · 2015-11-06T14:53:34.000Z
diff --git a/android-pathview/build.gradle b/android-pathview/build.gradle
@@ -29,46 +29,46 @@ signing {
     sign configurations.archives
 }
 
-uploadArchives {
-    configuration = configurations.archives
-    repositories.mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        repository(url: sonatypeRepo) {
-            authentication(userName: sonatypeUsername,
-                    password: sonatypePassword)
-        }
-
-        pom.project {
-            name 'Android Path View Library'
-            packaging 'aar'
-            description 'Android view that animate the both path from constructed path or from svg'
-            url 'https://github.com/geftimov/android-pathview'
-
-            scm {
-                url 'scm:git@github.com:geftimov/android-pathview.git'
-                connection 'scm:git@github.com:geftimov/android-pathview.git'
-                developerConnection 'scm:git@github.com:geftimov/android-pathview.git'
-            }
-
-            licenses {
-                license {
-                    name 'The Apache Software License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    distribution 'repo'
-                }
-            }
-
-            developers {
-                developer {
-                    id 'geftimov'
-                    name 'Georgi Eftimov'
-                    email 'jokatavr@gmail.com'
-                }
-            }
-        }
-    }
-}
+//uploadArchives {
+//    configuration = configurations.archives
+//    repositories.mavenDeployer {
+//        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+//
+//        repository(url: sonatypeRepo) {
+//            authentication(userName: sonatypeUsername,
+//                    password: sonatypePassword)
+//        }
+//
+//        pom.project {
+//            name 'Android Path View Library'
+//            packaging 'aar'
+//            description 'Android view that animate the both path from constructed path or from svg'
+//            url 'https://github.com/geftimov/android-pathview'
+//
+//            scm {
+//                url 'scm:git@github.com:geftimov/android-pathview.git'
+//                connection 'scm:git@github.com:geftimov/android-pathview.git'
+//                developerConnection 'scm:git@github.com:geftimov/android-pathview.git'
+//            }
+//
+//            licenses {
+//                license {
+//                    name 'The Apache Software License, Version 2.0'
+//                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+//                    distribution 'repo'
+//                }
+//            }
+//
+//            developers {
+//                developer {
+//                    id 'geftimov'
+//                    name 'Georgi Eftimov'
+//                    email 'jokatavr@gmail.com'
+//                }
+//            }
+//        }
+//    }
+//}
 
 dependencies {
     compile files('libs/androidsvg-1.2.1.jar')
diff --git a/android-pathview/src/main/java/com/eftimoff/androipathview/SvgUtils.java b/android-pathview/src/main/java/com/eftimoff/androipathview/SvgUtils.java
@@ -126,6 +126,7 @@ public void drawPath(Path path, Paint paint) {
      * @param canvas      The canvas to be drawn.
      */
     private void rescaleCanvas(int width, int height, float strokeWidth, Canvas canvas) {
+        if (mSvg == null) return;
         final RectF viewBox = mSvg.getDocumentViewBox();
 
         final float scale = Math.min(width
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.0.0'
+    classpath 'com.android.tools.build:gradle:1.3.0'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
diff --git a/sample/src/main/java/com/eftimoff/empty/SecondActivity.java b/sample/src/main/java/com/eftimoff/empty/SecondActivity.java
@@ -18,8 +18,8 @@ protected void onCreate(Bundle savedInstanceState) {
         final PathView pathView = (PathView) findViewById(R.id.pathView);
 //        final Path path = makeConvexArrow(50, 100);
 //        pathView.setPath(path);
-        pathView.setFillAfter(true);
-        pathView.useNaturalColors();
+        //       pathView.setFillAfter(true);
+      //  pathView.useNaturalColors();
         pathView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:1.0.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:1.3.0'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`