diff --git a/demo/src/main/res/drawable/logo.xml b/demo/src/main/res/drawable/logo.xml index 3a133ae..aea7a29 100644 --- a/demo/src/main/res/drawable/logo.xml +++ b/demo/src/main/res/drawable/logo.xml @@ -4,10 +4,10 @@ xmlns:auto="http://schemas.android.com/apk/res-auto" tools:targetApi="21" - auto:mvWidth="@dimen/logo_side" - auto:mvHeight="@dimen/logo_side" - auto:mvViewportWidth="@integer/logo_viewport_side" - auto:mvViewportHeight="@integer/logo_viewport_side" + auto:mv_width="@dimen/logo_side" + auto:mv_height="@dimen/logo_side" + auto:mv_viewportWidth="@integer/logo_viewport_side" + auto:mv_viewportHeight="@integer/logo_viewport_side" android:width="@dimen/logo_side" android:height="@dimen/logo_side" @@ -17,15 +17,15 @@ tag requires height > 0"); } - final float alphaInFloat = a.getFloat(R.styleable.VectorDrawable_mvAlpha, + final float alphaInFloat = a.getFloat(R.styleable.VectorDrawable_mv_alpha, pathRenderer.getAlpha()); pathRenderer.setAlpha(alphaInFloat); - final String name = a.getString(R.styleable.VectorDrawable_mvName); + final String name = a.getString(R.styleable.VectorDrawable_mv_name); if (name != null) { pathRenderer.mRootName = name; pathRenderer.mVGTargetsMap.put(name, pathRenderer); @@ -1134,15 +1134,15 @@ private void updateStateFromTypedArray(TypedArray a) { // Extract the theme attributes, if any. mThemeAttrs = null; // TODO TINT THEME Not supported yet a.extractThemeAttrs(); - mRotate = a.getFloat(R.styleable.VectorDrawableGroup_mvRotation, mRotate); - mPivotX = a.getFloat(R.styleable.VectorDrawableGroup_mvPivotX, mPivotX); - mPivotY = a.getFloat(R.styleable.VectorDrawableGroup_mvPivotY, mPivotY); - mScaleX = a.getFloat(R.styleable.VectorDrawableGroup_mvScaleX, mScaleX); - mScaleY = a.getFloat(R.styleable.VectorDrawableGroup_mvScaleY, mScaleY); - mTranslateX = a.getFloat(R.styleable.VectorDrawableGroup_mvTranslateX, mTranslateX); - mTranslateY = a.getFloat(R.styleable.VectorDrawableGroup_mvTranslateY, mTranslateY); + mRotate = a.getFloat(R.styleable.VectorDrawableGroup_mv_rotation, mRotate); + mPivotX = a.getFloat(R.styleable.VectorDrawableGroup_mv_pivotX, mPivotX); + mPivotY = a.getFloat(R.styleable.VectorDrawableGroup_mv_pivotY, mPivotY); + mScaleX = a.getFloat(R.styleable.VectorDrawableGroup_mv_scaleX, mScaleX); + mScaleY = a.getFloat(R.styleable.VectorDrawableGroup_mv_scaleY, mScaleY); + mTranslateX = a.getFloat(R.styleable.VectorDrawableGroup_mv_translateX, mTranslateX); + mTranslateY = a.getFloat(R.styleable.VectorDrawableGroup_mv_translateY, mTranslateY); - final String groupName = a.getString(R.styleable.VectorDrawableGroup_mvName); + final String groupName = a.getString(R.styleable.VectorDrawableGroup_mv_name); if (groupName != null) { mGroupName = groupName; } @@ -1349,12 +1349,12 @@ private void updateStateFromTypedArray(TypedArray a) { // Account for any configuration changes. mChangingConfigurations |= Utils.getChangingConfigurations(a);; - final String pathName = a.getString(R.styleable.VectorDrawableClipPath_mvName); + final String pathName = a.getString(R.styleable.VectorDrawableClipPath_mv_name); if (pathName != null) { mPathName = pathName; } - final String pathData = a.getString(R.styleable.VectorDrawableClipPath_mvPathData); + final String pathData = a.getString(R.styleable.VectorDrawableClipPath_mv_pathData); if (pathData != null) { mNodes = PathParser.createNodesFromPathData(pathData); } @@ -1457,38 +1457,38 @@ private void updateStateFromTypedArray(TypedArray a) { // Extract the theme attributes, if any. mThemeAttrs = null; // TODO TINT THEME Not supported yet a.extractThemeAttrs(); - final String pathName = a.getString(R.styleable.VectorDrawablePath_mvName); + final String pathName = a.getString(R.styleable.VectorDrawablePath_mv_name); if (pathName != null) { mPathName = pathName; } - final String pathData = a.getString(R.styleable.VectorDrawablePath_mvPathData); + final String pathData = a.getString(R.styleable.VectorDrawablePath_mv_pathData); if (pathData != null) { mNodes = PathParser.createNodesFromPathData(pathData); } - mFillColor = a.getColor(R.styleable.VectorDrawablePath_mvFillColor, + mFillColor = a.getColor(R.styleable.VectorDrawablePath_mv_fillColor, mFillColor); - mFillAlpha = a.getFloat(R.styleable.VectorDrawablePath_mvFillAlpha, + mFillAlpha = a.getFloat(R.styleable.VectorDrawablePath_mv_fillAlpha, mFillAlpha); mStrokeLineCap = getStrokeLineCap(a.getInt( - R.styleable.VectorDrawablePath_mvStrokeLineCap, -1), mStrokeLineCap); + R.styleable.VectorDrawablePath_mv_strokeLineCap, -1), mStrokeLineCap); mStrokeLineJoin = getStrokeLineJoin(a.getInt( - R.styleable.VectorDrawablePath_mvStrokeLineJoin, -1), mStrokeLineJoin); + R.styleable.VectorDrawablePath_mv_strokeLineJoin, -1), mStrokeLineJoin); mStrokeMiterlimit = a.getFloat( - R.styleable.VectorDrawablePath_mvStrokeMiterLimit, mStrokeMiterlimit); - mStrokeColor = a.getColor(R.styleable.VectorDrawablePath_mvStrokeColor, + R.styleable.VectorDrawablePath_mv_strokeMiterLimit, mStrokeMiterlimit); + mStrokeColor = a.getColor(R.styleable.VectorDrawablePath_mv_strokeColor, mStrokeColor); - mStrokeAlpha = a.getFloat(R.styleable.VectorDrawablePath_mvStrokeAlpha, + mStrokeAlpha = a.getFloat(R.styleable.VectorDrawablePath_mv_strokeAlpha, mStrokeAlpha); - mStrokeWidth = a.getFloat(R.styleable.VectorDrawablePath_mvStrokeWidth, + mStrokeWidth = a.getFloat(R.styleable.VectorDrawablePath_mv_strokeWidth, mStrokeWidth); - mTrimPathEnd = a.getFloat(R.styleable.VectorDrawablePath_mvTrimPathEnd, + mTrimPathEnd = a.getFloat(R.styleable.VectorDrawablePath_mv_trimPathEnd, mTrimPathEnd); mTrimPathOffset = a.getFloat( - R.styleable.VectorDrawablePath_mvTrimPathOffset, mTrimPathOffset); + R.styleable.VectorDrawablePath_mv_trimPathOffset, mTrimPathOffset); mTrimPathStart = a.getFloat( - R.styleable.VectorDrawablePath_mvTrimPathStart, mTrimPathStart); + R.styleable.VectorDrawablePath_mv_trimPathStart, mTrimPathStart); } @Override diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index ca4873e..9f64d91 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -13,55 +13,55 @@ - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + @@ -72,94 +72,94 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - + + + + - + - + - + @@ -170,14 +170,14 @@ - + - + - +