rename floatactionbutton

Author: cymcsg

UltimateAndroid/res/values/attrs.xml

@@ -165,7 +165,7 @@
     </declare-styleable>
 
 
-    <declare-styleable name="FloatingActionButton">
+    <declare-styleable name="FloatActionButton">
         <attr name="colorPressed" format="color"/>
         <attr name="colorNormal" format="color"/>
         <attr name="icon" />

UltimateAndroid/src/com/marshalchen/common/ui/FloatingActionButton.java renamed to UltimateAndroid/src/com/marshalchen/common/ui/FloatActionButton.java

@@ -25,7 +25,7 @@
 /**
  * Created by cym on 14-8-2.
  */
-public class FloatingActionButton extends View {
+public class FloatActionButton extends View {
 
     final static OvershootInterpolator overshootInterpolator = new OvershootInterpolator();
     final static AccelerateInterpolator accelerateInterpolator = new AccelerateInterpolator();
@@ -36,7 +36,7 @@ public class FloatingActionButton extends View {
     Bitmap mBitmap;
     boolean mHidden = false;
 
-    public FloatingActionButton(Context context) {
+    public FloatActionButton(Context context) {
         super(context);
         this.context = context;
         init(Color.WHITE);
@@ -47,7 +47,18 @@ public void setFloatingActionButtonColor(int FloatingActionButtonColor) {
     }
 
     public void setFloatingActionButtonDrawable(Drawable FloatingActionButtonDrawable) {
-        mBitmap = ((BitmapDrawable) FloatingActionButtonDrawable).getBitmap();
+//        mBitmap = ((BitmapDrawable) FloatingActionButtonDrawable).getBitmap();
+
+
+        if(FloatingActionButtonDrawable instanceof BitmapDrawable) {
+            mBitmap  = ((BitmapDrawable)FloatingActionButtonDrawable).getBitmap();
+        }else{
+            Bitmap bitmap = Bitmap.createBitmap(FloatingActionButtonDrawable.getIntrinsicWidth(),FloatingActionButtonDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(bitmap);
+            FloatingActionButtonDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+            FloatingActionButtonDrawable.draw(canvas);
+            mBitmap = bitmap;
+        }
         invalidate();
     }
 
@@ -175,8 +186,8 @@ public Builder withButtonSize(int size) {
             return this;
         }
 
-        public FloatingActionButton create() {
-            final FloatingActionButton button = new FloatingActionButton(activity);
+        public FloatActionButton create() {
+            final FloatActionButton button = new FloatActionButton(activity);
             button.setFloatingActionButtonColor(this.color);
             button.setFloatingActionButtonDrawable(this.drawable);
             params.gravity = this.gravity;

UltimateAndroid/src/com/marshalchen/common/ui/floatingactionbutton/FloatingActionButton.java

@@ -85,13 +85,13 @@ float getDimension(@DimenRes int id) {
   }
 
   private void initAttributes(Context context, AttributeSet attributeSet) {
-    TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.FloatingActionButton, 0, 0);
+    TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.FloatActionButton, 0, 0);
     if (attr != null) {
       try {
-        mColorNormal = attr.getColor(R.styleable.FloatingActionButton_colorNormal, getColor(android.R.color.holo_blue_dark));
-        mColorPressed = attr.getColor(R.styleable.FloatingActionButton_colorPressed, getColor(android.R.color.holo_blue_light));
-        mSize = attr.getInt(R.styleable.FloatingActionButton_size, SIZE_NORMAL);
-        mIcon = attr.getResourceId(R.styleable.FloatingActionButton_icon, 0);
+        mColorNormal = attr.getColor(R.styleable.FloatActionButton_colorNormal, getColor(android.R.color.holo_blue_dark));
+        mColorPressed = attr.getColor(R.styleable.FloatActionButton_colorPressed, getColor(android.R.color.holo_blue_light));
+        mSize = attr.getInt(R.styleable.FloatActionButton_size, SIZE_NORMAL);
+        mIcon = attr.getResourceId(R.styleable.FloatActionButton_icon, 0);
       } finally {
         attr.recycle();
       }