Merge pull request #15 from PatrickDattilio/master

Added "motion" prefix to attributes, to prevent naming conflicts.
nvanbenschoten · Aug 16, 2015 · bd3b9f9 · bd3b9f9
2 parents 873e817 + 08cf0ce
commit bd3b9f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -85,13 +85,13 @@ Configurations
 There are three attributes that can be changed to adjust the parallax effect of the ImageView.
 Each can be accessed either through XML attributes or through Java functions.
 
-* parallaxIntensity (float) - adjusts the strength of the parallax effect, giving control over the
+* motionIntensity (float) - adjusts the strength of the parallax effect, giving control over the
 perceived depth of the view.
 
-* tiltSensitivity (float) - adjusts the sensitivity of the view towards tilting, changing how quickly
+* motionTiltSensitivity (float) - adjusts the sensitivity of the view towards tilting, changing how quickly
 the parallax's bounds are reached.
 
-* scaledIntensity (boolean) - adjusts whether the ImageView's x and y axis' parallax intensities
+* motionScaledIntensity (boolean) - adjusts whether the ImageView's x and y axis' parallax intensities
 are scaled to the image's aspect ratio or equal to each other and to the smaller of the axis'
 intensities (false by default).
 

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:motionTiltSensitivity="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_motionIntensity)) {
+                    setParallaxIntensity(customAttrs.getFloat(R.styleable.ParallaxImageView_motionIntensity, mParallaxIntensity));
                 }
 
-                if (customAttrs.hasValue(R.styleable.ParallaxImageView_scaledIntensity)) {
-                    setScaledIntensities(customAttrs.getBoolean(R.styleable.ParallaxImageView_scaledIntensity, mScaledIntensities));
+                if (customAttrs.hasValue(R.styleable.ParallaxImageView_motionScaledIntensity)) {
+                    setScaledIntensities(customAttrs.getBoolean(R.styleable.ParallaxImageView_motionScaledIntensity, mScaledIntensities));
                 }
 
-                if (customAttrs.hasValue(R.styleable.ParallaxImageView_tiltSensitivity)) {
-                    setTiltSensitivity(customAttrs.getFloat(R.styleable.ParallaxImageView_tiltSensitivity,
+                if (customAttrs.hasValue(R.styleable.ParallaxImageView_motionTiltSensitivity)) {
+                    setTiltSensitivity(customAttrs.getFloat(R.styleable.ParallaxImageView_motionTiltSensitivity,
                             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="motionIntensity" format="float"/>
+        <attr name="motionTiltSensitivity" format="float"/>
+        <attr name="motionScaledIntensity" format="boolean"/>
     </declare-styleable>
 </resources>