- customizable corner radius

Author: dimkinware

app/src/main/java/io/gresse/hugo/vumeter/MainActivity.java

@@ -1,7 +1,7 @@
 package io.gresse.hugo.vumeter;
 
+import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.CompoundButton;
@@ -10,7 +10,7 @@
 
 import io.gresse.hugo.vumeterlibrary.VuMeterView;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Activity {
 
     private VuMeterView mVuMeterView;
 

app/src/main/res/layout/activity_main.xml

@@ -20,7 +20,8 @@
         vumeter:vumeter_blockNumber="5"
         vumeter:vumeter_blockSpacing="20dp"
         vumeter:vumeter_speed="10"
-        vumeter:vumeter_stopSize="5dp"/>
+        vumeter:vumeter_stopSize="5dp"
+        vumeter:vumeter_cornerRadius="8dp"/>
 
     <Switch
         android:id="@+id/barNumberSwitch"

vumeterlibrary/src/main/java/io/gresse/hugo/vumeterlibrary/VuMeterView.java

@@ -6,6 +6,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -26,6 +27,7 @@ public class VuMeterView extends View {
     public static final int DEFAULT_BLOCK_SPACING = 20;
     public static final int DEFAULT_SPEED = 10;
     public static final int DEFAULT_STOP_SIZE = 30;
+    public static final int DEFAULT_RADIUS = 0;
     public static final boolean DEFAULT_START_OFF = false;
     public static final int FPS = 60;
 
@@ -38,6 +40,7 @@ public class VuMeterView extends View {
     private float mBlockSpacing;
     private int mSpeed;
     private float mStopSize;
+    private float mCornerRadius;
 
     private Paint mPaint = new Paint();
     private Random mRandom = new Random();
@@ -83,14 +86,15 @@ private void init(AttributeSet attrs, int defStyle) {
         mBlockSpacing = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_blockSpacing, DEFAULT_BLOCK_SPACING);
         mSpeed = a.getInt(R.styleable.vumeter_VuMeterView_vumeter_speed, DEFAULT_SPEED);
         mStopSize = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_stopSize, DEFAULT_STOP_SIZE);
+        mCornerRadius = a.getDimension(R.styleable.vumeter_VuMeterView_vumeter_cornerRadius, DEFAULT_RADIUS);
         boolean startOff = a.getBoolean(R.styleable.vumeter_VuMeterView_vumeter_startOff, DEFAULT_START_OFF);
         a.recycle();
 
         // Init
         initialiseCollections();
         mPaint.setColor(mColor);
 
-        if(startOff){
+        if (startOff) {
             mState = STATE_PAUSE;
         } else {
             mState = STATE_PLAYING;
@@ -117,7 +121,7 @@ protected void onDraw(Canvas canvas) {
             mBlockWidth = (int) ((mContentWidth - (mBlockNumber - 1) * mBlockSpacing) / mBlockNumber);
 
             // called if startOff is true
-            if(mState == STATE_PAUSE){
+            if (mState == STATE_PAUSE) {
                 int stopSize = (int) (mContentHeight - mStopSize);
                 for (int i = 0; i < mBlockNumber; i++) {
                     mDestinationValues[i] = new Dynamics(mSpeed, stopSize);
@@ -143,18 +147,13 @@ protected void onDraw(Canvas canvas) {
 
             if (mDestinationValues[mBlockPass].isAtRest() && mState == STATE_PLAYING) {
                 changeDynamicsTarget(mBlockPass, mContentHeight * mBlockValues[mBlockPass][mDrawPass]);
-            } else if(mState != STATE_PAUSE){
+            } else if (mState != STATE_PAUSE) {
                 mDestinationValues[mBlockPass].update();
             }
 
             mTop = mPaddingTop + (int) (mDestinationValues[mBlockPass].getPosition());
-
-            canvas.drawRect(
-                    mLeft,
-                    mTop,
-                    mRight,
-                    mContentHeight,
-                    mPaint);
+            RectF rect = new RectF(mLeft, mTop, mRight, mContentHeight);
+            canvas.drawRoundRect(rect, mCornerRadius, mCornerRadius, mPaint);
         }
 
         this.postInvalidateDelayed(1000 / FPS);
@@ -209,7 +208,7 @@ private int incrementAndGetDrawPass() {
         return mDrawPass;
     }
 
-    private void initialiseCollections(){
+    private void initialiseCollections() {
         mBlockValues = new float[mBlockNumber][DEFAULT_NUMBER_RANDOM_VALUES];
         mDestinationValues = new Dynamics[mBlockNumber];
 
@@ -299,10 +298,10 @@ public void setSpeed(int speed) {
 
     /**
      * Pause the player.
-     *
+     * <p>
      * Call {@link #resume(boolean)} to replay the VuMeter
      */
-    public void pause(){
+    public void pause() {
         mState = STATE_PAUSE;
     }
 
@@ -311,23 +310,23 @@ public void pause(){
      *
      * @param withAnimation if you want to have an animation from current state to stop state
      */
-    public void stop(boolean withAnimation){
-        if(mDestinationValues == null){
+    public void stop(boolean withAnimation) {
+        if (mDestinationValues == null) {
             initialiseCollections();
         }
         mState = STATE_STOP;
         int collapseSize = (int) (mContentHeight - mStopSize);
 
         // Prevent NPE in the destinations table is empty
-        if(mDestinationValues.length <= 0){
+        if (mDestinationValues.length <= 0) {
             return;
         }
 
-        for(int i = 0; i < mBlockNumber; i++){
-            if(mDestinationValues[i] == null){
+        for (int i = 0; i < mBlockNumber; i++) {
+            if (mDestinationValues[i] == null) {
                 continue;
             }
-            if(withAnimation){
+            if (withAnimation) {
                 mDestinationValues[i].setTargetPosition(collapseSize);
             } else {
                 mDestinationValues[i].setPosition(collapseSize);
@@ -340,19 +339,37 @@ public void stop(boolean withAnimation){
      *
      * @param withAnimation if you want to have transition from stop to resume state, set to true
      */
-    public void resume(boolean withAnimation){
-        if(mState == STATE_PAUSE){
+    public void resume(boolean withAnimation) {
+        if (mState == STATE_PAUSE) {
             mState = STATE_PLAYING;
             return;
         }
 
         mState = STATE_PLAYING;
 
-        if(!withAnimation){
-            for(int i = 0; i < mBlockNumber; i++){
+        if (!withAnimation) {
+            for (int i = 0; i < mBlockNumber; i++) {
                 mDestinationValues[i].setPosition(mContentHeight * mBlockValues[i][mDrawPass]);
                 changeDynamicsTarget(i, mContentHeight * mBlockValues[i][mDrawPass]);
             }
         }
     }
+
+    /**
+     * Get the current corner radius
+     *
+     * @return the corner radius
+     */
+    public float getCornerRadius() {
+        return mCornerRadius;
+    }
+
+    /**
+     * Set the current corner radius
+     *
+     * @param radius The desired corner radius
+     */
+    public void setSpeed(float radius) {
+        mCornerRadius = radius;
+    }
 }

vumeterlibrary/src/main/res/values/attrs_vu_meter_view.xml

@@ -6,5 +6,6 @@
         <attr name="vumeter_speed" format="integer"/>
         <attr name="vumeter_stopSize" format="dimension"/>
         <attr name="vumeter_startOff" format="boolean"/>
+        <attr name="vumeter_cornerRadius" format="dimension"/>
     </declare-styleable>
 </resources>