Added "mtn" prefix to attributes, to prevent naming conflicts.

nvanbenschoten · Aug 10, 2015 · d89b677 · d89b677
1 parent 36f814c
commit d89b677
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/motion-sample/src/main/res/layout/fragment_parallax.xml b/motion-sample/src/main/res/layout/fragment_parallax.xml
@@ -9,7 +9,7 @@
         android:id="@android:id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        parallax:tiltSensitivity="2.5"
+        parallax:mtn_tiltSensitivity="2.5"
         />
 
     <LinearLayout

diff --git a/motion/src/main/java/com/nvanbenschoten/motion/ParallaxImageView.java b/motion/src/main/java/com/nvanbenschoten/motion/ParallaxImageView.java
@@ -81,16 +81,16 @@ public ParallaxImageView(Context context, AttributeSet attrs, int defStyle) {
             final TypedArray customAttrs = context.obtainStyledAttributes(attrs, R.styleable.ParallaxImageView);
 
             if (customAttrs != null) {
-                if (customAttrs.hasValue(R.styleable.ParallaxImageView_intensity)) {
-                    setParallaxIntensity(customAttrs.getFloat(R.styleable.ParallaxImageView_intensity, mParallaxIntensity));
+                if (customAttrs.hasValue(R.styleable.ParallaxImageView_mtn_intensity)) {
+                    setParallaxIntensity(customAttrs.getFloat(R.styleable.ParallaxImageView_mtn_intensity, mParallaxIntensity));
                 }
 
-                if (customAttrs.hasValue(R.styleable.ParallaxImageView_scaledIntensity)) {
-                    setScaledIntensities(customAttrs.getBoolean(R.styleable.ParallaxImageView_scaledIntensity, mScaledIntensities));
+                if (customAttrs.hasValue(R.styleable.ParallaxImageView_mtn_scaledIntensity)) {
+                    setScaledIntensities(customAttrs.getBoolean(R.styleable.ParallaxImageView_mtn_scaledIntensity, mScaledIntensities));
                 }
 
-                if (customAttrs.hasValue(R.styleable.ParallaxImageView_tiltSensitivity)) {
-                    setTiltSensitivity(customAttrs.getFloat(R.styleable.ParallaxImageView_tiltSensitivity,
+                if (customAttrs.hasValue(R.styleable.ParallaxImageView_mtn_tiltSensitivity)) {
+                    setTiltSensitivity(customAttrs.getFloat(R.styleable.ParallaxImageView_mtn_tiltSensitivity,
                             mSensorInterpreter.getTiltSensitivity()));
                 }
 

diff --git a/motion/src/main/res/values/attrs.xml b/motion/src/main/res/values/attrs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="ParallaxImageView">
-        <attr name="intensity" format="float"/>
-        <attr name="tiltSensitivity" format="float"/>
-        <attr name="scaledIntensity" format="boolean"/>
+        <attr name="mtn_intensity" format="float"/>
+        <attr name="mtn_tiltSensitivity" format="float"/>
+        <attr name="mtn_scaledIntensity" format="boolean"/>
     </declare-styleable>
 </resources>