Restructured models

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.sdsmdg.harjot.vectormasterdemo"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile project(":vectormaster")
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation project(":vectormaster")
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Nov 17 02:03:24 IST 2017
+#Tue Mar 26 22:16:32 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

vectormaster/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/harjot-oberai/VectorMaster/'
     gitUrl = 'https://github.com/harjot-oberai/VectorMaster/.git'
 
-    libraryVersion = '1.1.3'
+    libraryVersion = '1.2.0'
 
     developerId = 'harjot-oberai'
     developerName = 'Harjot Singh Oberai'
@@ -25,12 +25,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -46,8 +46,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

vectormaster/src/main/java/com/sdsmdg/harjot/vectormaster/ModelParser.java

@@ -0,0 +1,222 @@
+package com.sdsmdg.harjot.vectormaster;
+
+import android.content.res.Resources;
+import com.sdsmdg.harjot.vectormaster.models.ClipPathModel;
+import com.sdsmdg.harjot.vectormaster.models.GroupModel;
+import com.sdsmdg.harjot.vectormaster.models.ParentModel;
+import com.sdsmdg.harjot.vectormaster.models.PathModel;
+import com.sdsmdg.harjot.vectormaster.models.VectorModel;
+import com.sdsmdg.harjot.vectormaster.utilities.Utils;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.Stack;
+
+public class ModelParser {
+
+  int getAttrPosition(XmlPullParser xpp, String attrName) {
+    for (int i = 0; i < xpp.getAttributeCount(); i++) {
+      if (xpp.getAttributeName(i).equals(attrName)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
+  public VectorModel buildVectorModel(Resources resources, int resID, boolean useLegacyParser) {
+
+    if (resID == -1) {
+      return null;
+    }
+
+    XmlPullParser xpp = resources.getXml(resID);
+
+    int tempPosition;
+    VectorModel vectorModel = new VectorModel();
+    PathModel pathModel = new PathModel();
+    GroupModel groupModel = new GroupModel();
+    ClipPathModel clipPathModel = new ClipPathModel();
+    Stack<ParentModel> parentModelStack = new Stack<>();
+    parentModelStack.push(vectorModel);
+
+    try {
+      int event = xpp.getEventType();
+      while (event != XmlPullParser.END_DOCUMENT) {
+        String name = xpp.getName();
+        switch (event) {
+        case XmlPullParser.START_TAG:
+          if (name.equals("vector")) {
+            tempPosition = getAttrPosition(xpp, "viewportWidth");
+            vectorModel.setViewportWidth((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.VECTOR_VIEWPORT_WIDTH);
+
+            tempPosition = getAttrPosition(xpp, "viewportHeight");
+            vectorModel.setViewportHeight((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.VECTOR_VIEWPORT_HEIGHT);
+
+            tempPosition = getAttrPosition(xpp, "alpha");
+            vectorModel.setAlpha((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.VECTOR_ALPHA);
+
+            tempPosition = getAttrPosition(xpp, "name");
+            vectorModel.setName((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null);
+
+            tempPosition = getAttrPosition(xpp, "width");
+            vectorModel.setWidth((tempPosition != -1) ?
+                Utils.getFloatFromDimensionString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.VECTOR_WIDTH);
+
+            tempPosition = getAttrPosition(xpp, "height");
+            vectorModel.setHeight((tempPosition != -1) ?
+                Utils.getFloatFromDimensionString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.VECTOR_HEIGHT);
+          } else if (name.equals("path")) {
+            pathModel = new PathModel();
+
+            tempPosition = getAttrPosition(xpp, "name");
+            pathModel.setName((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null);
+
+            tempPosition = getAttrPosition(xpp, "fillAlpha");
+            pathModel.setFillAlpha((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_FILL_ALPHA);
+
+            tempPosition = getAttrPosition(xpp, "fillColor");
+            pathModel.setFillColor((tempPosition != -1) ?
+                Utils.getColorFromString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_FILL_COLOR);
+
+            tempPosition = getAttrPosition(xpp, "fillType");
+            pathModel.setFillType((tempPosition != -1) ?
+                Utils.getFillTypeFromString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_FILL_TYPE);
+
+            tempPosition = getAttrPosition(xpp, "pathData");
+            pathModel.setPathData((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null, useLegacyParser);
+
+            tempPosition = getAttrPosition(xpp, "strokeAlpha");
+            pathModel.setStrokeAlpha((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_ALPHA);
+
+            tempPosition = getAttrPosition(xpp, "strokeColor");
+            pathModel.setStrokeColor((tempPosition != -1) ?
+                Utils.getColorFromString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_COLOR);
+
+            tempPosition = getAttrPosition(xpp, "strokeLineCap");
+            pathModel.setStrokeLineCap((tempPosition != -1) ?
+                Utils.getLineCapFromString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_LINE_CAP);
+
+            tempPosition = getAttrPosition(xpp, "strokeLineJoin");
+            pathModel.setStrokeLineJoin((tempPosition != -1) ?
+                Utils.getLineJoinFromString(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_LINE_JOIN);
+
+            tempPosition = getAttrPosition(xpp, "strokeMiterLimit");
+            pathModel.setStrokeMiterLimit((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_MITER_LIMIT);
+
+            tempPosition = getAttrPosition(xpp, "strokeWidth");
+            pathModel.setStrokeWidth((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_STROKE_WIDTH);
+
+            tempPosition = getAttrPosition(xpp, "trimPathEnd");
+            pathModel.setTrimPathEnd((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_TRIM_PATH_END);
+
+            tempPosition = getAttrPosition(xpp, "trimPathOffset");
+            pathModel.setTrimPathOffset((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_TRIM_PATH_OFFSET);
+
+            tempPosition = getAttrPosition(xpp, "trimPathStart");
+            pathModel.setTrimPathStart((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.PATH_TRIM_PATH_START);
+
+          } else if (name.equals("group")) {
+            groupModel = new GroupModel();
+
+            tempPosition = getAttrPosition(xpp, "name");
+            groupModel.setName((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null);
+
+            tempPosition = getAttrPosition(xpp, "pivotX");
+            groupModel.setPivotX((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_PIVOT_X);
+
+            tempPosition = getAttrPosition(xpp, "pivotY");
+            groupModel.setPivotY((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_PIVOT_Y);
+
+            tempPosition = getAttrPosition(xpp, "rotation");
+            groupModel.setRotation((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_ROTATION);
+
+            tempPosition = getAttrPosition(xpp, "scaleX");
+            groupModel.setScaleX((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_SCALE_X);
+
+            tempPosition = getAttrPosition(xpp, "scaleY");
+            groupModel.setScaleY((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_SCALE_Y);
+
+            tempPosition = getAttrPosition(xpp, "translateX");
+            groupModel.setTranslateX((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_TRANSLATE_X);
+
+            tempPosition = getAttrPosition(xpp, "translateY");
+            groupModel.setTranslateY((tempPosition != -1) ?
+                Float.parseFloat(xpp.getAttributeValue(tempPosition)) :
+                DefaultValues.GROUP_TRANSLATE_Y);
+
+            parentModelStack.push(groupModel);
+          } else if (name.equals("clip-path")) {
+            clipPathModel = new ClipPathModel();
+
+            tempPosition = getAttrPosition(xpp, "name");
+            clipPathModel.setName((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null);
+
+            tempPosition = getAttrPosition(xpp, "pathData");
+            clipPathModel.setPathData((tempPosition != -1) ? xpp.getAttributeValue(tempPosition) : null, useLegacyParser);
+          }
+          break;
+
+        case XmlPullParser.END_TAG:
+          if (name.equals("path")) {
+            parentModelStack.peek().addChild(pathModel);
+          } else if (name.equals("clip-path")) {
+            parentModelStack.peek().addChild(clipPathModel);
+          } else if (name.equals("group")) {
+            ParentModel topGroupModel = parentModelStack.pop();
+            parentModelStack.peek().addChild(topGroupModel);
+          } else if (name.equals("vector")) {
+            //we are done with parsing
+          }
+          break;
+        }
+        event = xpp.next();
+      }
+    } catch (XmlPullParserException | IOException e) {
+      e.printStackTrace();
+    }
+
+    return vectorModel;
+
+  }
+
+}