Merge pull request #99 from hannesa2/CodeFormat

Common code format

.gitignore

@@ -28,15 +28,8 @@ proguard/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
 ## Directory-based project format
-.idea/
-# if you remove the above rule, at least ignore user-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# and these sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
+.idea/*
+!.idea/codeStyles/
 
 ## File-based project format
 *.ipr

library/src/main/AndroidManifest.xml

@@ -1,3 +1,4 @@
 <manifest package="com.dd.circular.progress.button">
-    <application/>
+
+    <application />
 </manifest>

library/src/main/java/com/dd/CircularAnimatedDrawable.java

@@ -91,18 +91,18 @@ protected void onBoundsChange(Rect bounds) {
         fBounds.bottom = bounds.bottom - mBorderWidth / 2f - .5f;
     }
 
-    private Property<CircularAnimatedDrawable, Float> mAngleProperty  =
+    private Property<CircularAnimatedDrawable, Float> mAngleProperty =
             new Property<CircularAnimatedDrawable, Float>(Float.class, "angle") {
-        @Override
-        public Float get(CircularAnimatedDrawable object) {
-            return object.getCurrentGlobalAngle();
-        }
-
-        @Override
-        public void set(CircularAnimatedDrawable object, Float value) {
-            object.setCurrentGlobalAngle(value);
-        }
-    };
+                @Override
+                public Float get(CircularAnimatedDrawable object) {
+                    return object.getCurrentGlobalAngle();
+                }
+
+                @Override
+                public void set(CircularAnimatedDrawable object, Float value) {
+                    object.setCurrentGlobalAngle(value);
+                }
+            };
 
     private Property<CircularAnimatedDrawable, Float> mSweepProperty
             = new Property<CircularAnimatedDrawable, Float>(Float.class, "arc") {

library/src/main/java/com/dd/CircularProgressButton.java

@@ -1,7 +1,5 @@
 package com.dd;
 
-import com.dd.circular.progress.button.R;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -17,6 +15,8 @@
 import android.util.StateSet;
 import android.widget.Button;
 
+import com.dd.circular.progress.button.R;
+
 public class CircularProgressButton extends Button {
 
     public static final int IDLE_STATE_PROGRESS = 0;

library/src/main/java/com/dd/StateManager.java

@@ -25,7 +25,7 @@ public int getProgress() {
     public void checkState(CircularProgressButton progressButton) {
         if (progressButton.getProgress() != getProgress()) {
             progressButton.setProgress(progressButton.getProgress());
-        } else if(progressButton.isEnabled() != isEnabled()) {
+        } else if (progressButton.isEnabled() != isEnabled()) {
             progressButton.setEnabled(progressButton.isEnabled());
         }
     }

library/src/main/res/color/cpb_complete_state_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:color="@color/cpb_green_dark"/>
-    <item android:state_focused="true"
-          android:color="@color/cpb_green_dark"/>
-    <item android:state_enabled="false"
-          android:color="@color/cpb_grey"/>
-    <item android:state_enabled="true"
-          android:color="@color/cpb_green"/>
+    <item android:state_pressed="true" android:color="@color/cpb_green_dark" />
+    <item android:state_focused="true" android:color="@color/cpb_green_dark" />
+    <item android:state_enabled="false" android:color="@color/cpb_grey" />
+    <item android:state_enabled="true" android:color="@color/cpb_green" />
 </selector>

library/src/main/res/color/cpb_error_state_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:color="@color/cpb_red_dark"/>
-    <item android:state_focused="true"
-          android:color="@color/cpb_red_dark"/>
-    <item android:state_enabled="false"
-          android:color="@color/cpb_grey"/>
-    <item android:state_enabled="true"
-          android:color="@color/cpb_red"/>
+    <item android:state_pressed="true" android:color="@color/cpb_red_dark" />
+    <item android:state_focused="true" android:color="@color/cpb_red_dark" />
+    <item android:state_enabled="false" android:color="@color/cpb_grey" />
+    <item android:state_enabled="true" android:color="@color/cpb_red" />
 </selector>

library/src/main/res/color/cpb_idle_state_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:color="@color/cpb_blue_dark"/>
-    <item android:state_focused="true"
-          android:color="@color/cpb_blue_dark"/>
-    <item android:state_enabled="false"
-          android:color="@color/cpb_grey"/>
-    <item android:state_enabled="true"
-          android:color="@color/cpb_blue"/>
+    <item android:state_pressed="true" android:color="@color/cpb_blue_dark" />
+    <item android:state_focused="true" android:color="@color/cpb_blue_dark" />
+    <item android:state_enabled="false" android:color="@color/cpb_grey" />
+    <item android:state_enabled="true" android:color="@color/cpb_blue" />
 </selector>

library/src/main/res/drawable/cpb_background.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
+    android:shape="rectangle">
     <stroke
-            android:width="@dimen/cpb_stroke_width"
-            android:color="@color/cpb_blue"/>
-    <solid android:color="@color/cpb_blue"/>
+        android:width="@dimen/cpb_stroke_width"
+        android:color="@color/cpb_blue" />
+    <solid android:color="@color/cpb_blue" />
 </shape>