Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #380 #382

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #380 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
362 changes: 207 additions & 155 deletions ...ialDesign/src/main/java/com/gc/materialdesign/views/ProgressBarCircularIndeterminate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.gc.materialdesign.views;

import com.gc.materialdesign.R;
import com.gc.materialdesign.utils.Utils;

import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
Expand All @@ -12,160 +14,210 @@
import android.graphics.RectF;
import android.util.AttributeSet;

public class ProgressBarCircularIndeterminate extends CustomView {


final static String ANDROIDXML = "http://schemas.android.com/apk/res/android";

int backgroundColor = Color.parseColor("#1E88E5");


public ProgressBarCircularIndeterminate(Context context, AttributeSet attrs) {
super(context, attrs);
setAttributes(attrs);

}

// Set atributtes of XML to View
protected void setAttributes(AttributeSet attrs){

setMinimumHeight(Utils.dpToPx(32, getResources()));
setMinimumWidth(Utils.dpToPx(32, getResources()));

//Set background Color
// Color by resource
int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML,"background",-1);
if(bacgroundColor != -1){
setBackgroundColor(getResources().getColor(bacgroundColor));
}else{
// Color by hexadecimal
int background = attrs.getAttributeIntValue(ANDROIDXML, "background", -1);
if (background != -1)
setBackgroundColor(background);
else
setBackgroundColor(Color.parseColor("#1E88E5"));
}

setMinimumHeight(Utils.dpToPx(3, getResources()));


}

/**
* Make a dark color to ripple effect
* @return
*/
protected int makePressColor(){
int r = (this.backgroundColor >> 16) & 0xFF;
int g = (this.backgroundColor >> 8) & 0xFF;
int b = (this.backgroundColor >> 0) & 0xFF;
// r = (r+90 > 245) ? 245 : r+90;
// g = (g+90 > 245) ? 245 : g+90;
// b = (b+90 > 245) ? 245 : b+90;
return Color.argb(128,r, g, b);
}


@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if(firstAnimationOver == false)
drawFirstAnimation(canvas);
if(cont > 0)
drawSecondAnimation(canvas);
invalidate();

}

float radius1 = 0;
float radius2 = 0;
int cont = 0;
boolean firstAnimationOver = false;
/**
* Draw first animation of view
* @param canvas
*/
private void drawFirstAnimation(Canvas canvas){
if(radius1 < getWidth()/2){
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(makePressColor());
radius1 = (radius1 >= getWidth()/2)? (float)getWidth()/2 : radius1+1;
canvas.drawCircle(getWidth()/2, getHeight()/2, radius1, paint);
}else{
Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
Canvas temp = new Canvas(bitmap);
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(makePressColor());
temp.drawCircle(getWidth()/2, getHeight()/2, getHeight()/2, paint);
Paint transparentPaint = new Paint();
transparentPaint.setAntiAlias(true);
transparentPaint.setColor(getResources().getColor(android.R.color.transparent));
transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
if(cont >= 50){
radius2 = (radius2 >= getWidth()/2)? (float)getWidth()/2 : radius2+1;
}else{
radius2 = (radius2 >= getWidth()/2-Utils.dpToPx(4, getResources()))? (float)getWidth()/2-Utils.dpToPx(4, getResources()) : radius2+1;
}
temp.drawCircle(getWidth()/2, getHeight()/2, radius2, transparentPaint);
canvas.drawBitmap(bitmap, 0, 0, new Paint());
if(radius2 >= getWidth()/2-Utils.dpToPx(4, getResources()))
cont++;
if(radius2 >= getWidth()/2)
firstAnimationOver = true;
}
}

int arcD = 1;
int arcO = 0;
float rotateAngle = 0;
int limite = 0;
/**
* Draw second animation of view
* @param canvas
*/
private void drawSecondAnimation(Canvas canvas){
if(arcO == limite)
arcD+=6;
if(arcD >= 290 || arcO > limite){
arcO+=6;
arcD-=6;
}
if(arcO > limite + 290){
limite = arcO;
arcO = limite;
arcD = 1;
}
rotateAngle += 4;
canvas.rotate(rotateAngle,getWidth()/2, getHeight()/2);

Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
Canvas temp = new Canvas(bitmap);
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(backgroundColor);
// temp.drawARGB(0, 0, 0, 255);
temp.drawArc(new RectF(0, 0, getWidth(), getHeight()), arcO, arcD, true, paint);
Paint transparentPaint = new Paint();
transparentPaint.setAntiAlias(true);
transparentPaint.setColor(getResources().getColor(android.R.color.transparent));
transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
temp.drawCircle(getWidth()/2, getHeight()/2, (getWidth()/2)-Utils.dpToPx(4, getResources()), transparentPaint);

canvas.drawBitmap(bitmap, 0, 0, new Paint());
}





// Set color of background
public void setBackgroundColor(int color){
super.setBackgroundColor(getResources().getColor(android.R.color.transparent));
if(isEnabled())
beforeBackground = backgroundColor;
this.backgroundColor = color;
}
public class ProgressBarCircularIndeterminate extends CustomView
{
final static String ANDROIDXML = "http://schemas.android.com/apk/res/android";

int backgroundColor = Color.parseColor("#1E88E5");
float ringWidth = 4;

public ProgressBarCircularIndeterminate(Context context, AttributeSet attrs)
{
super(context, attrs);
setAttributes(attrs);

}

// Set atributtes of XML to View
protected void setAttributes(AttributeSet attrs)
{
TypedArray a = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.CustomAttributes, 0, 0);

try
{
ringWidth = a.getDimension(R.styleable.CustomAttributes_ringWidth, 4);
}
finally
{
a.recycle();
}

setMinimumHeight(Utils.dpToPx(32, getResources()));
setMinimumWidth(Utils.dpToPx(32, getResources()));

//Set background Color
// Color by resource
int bacgroundColor = attrs.getAttributeResourceValue(ANDROIDXML, "background", -1);
if(bacgroundColor != -1)
{
setBackgroundColor(getResources().getColor(bacgroundColor));
}
else
{
// Color by hexadecimal
int background = attrs.getAttributeIntValue(ANDROIDXML, "background", -1);
if(background != -1)
{
setBackgroundColor(background);
}
else
{
setBackgroundColor(Color.parseColor("#1E88E5"));
}
}

setMinimumHeight(Utils.dpToPx(3, getResources()));
}

/**
* Make a dark color to ripple effect
*
* @return
*/
protected int makePressColor()
{
int r = (this.backgroundColor >> 16) & 0xFF;
int g = (this.backgroundColor >> 8) & 0xFF;
int b = (this.backgroundColor >> 0) & 0xFF;
// r = (r+90 > 245) ? 245 : r+90;
// g = (g+90 > 245) ? 245 : g+90;
// b = (b+90 > 245) ? 245 : b+90;
return Color.argb(128, r, g, b);
}


@Override
protected void onDraw(Canvas canvas)
{
super.onDraw(canvas);

if((getWidth() / 2) - Utils.dpToPx(ringWidth, getResources()) < 0)
{
ringWidth = 4;
}

if(firstAnimationOver == false)
{
drawFirstAnimation(canvas);
}
if(cont > 0)
{
drawSecondAnimation(canvas);
}
invalidate();

}

float radius1 = 0;
float radius2 = 0;
int cont = 0;
boolean firstAnimationOver = false;

/**
* Draw first animation of view
*
* @param canvas
*/
private void drawFirstAnimation(Canvas canvas)
{
if(radius1 < getWidth() / 2)
{
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(makePressColor());
radius1 = (radius1 >= getWidth() / 2) ? (float) getWidth() / 2 : radius1 + 1;
canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius1, paint);
}
else
{
Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
Canvas temp = new Canvas(bitmap);
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(makePressColor());
temp.drawCircle(getWidth() / 2, getHeight() / 2, getHeight() / 2, paint);
Paint transparentPaint = new Paint();
transparentPaint.setAntiAlias(true);
transparentPaint.setColor(getResources().getColor(android.R.color.transparent));
transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
if(cont >= 50)
{
radius2 = (radius2 >= getWidth() / 2) ? (float) getWidth() / 2 : radius2 + 1;
}
else
{
radius2 = (radius2 >= getWidth() / 2 - Utils.dpToPx(ringWidth, getResources())) ?
(float) getWidth() / 2 - Utils.dpToPx(ringWidth, getResources()) : radius2 + 1;
}
temp.drawCircle(getWidth() / 2, getHeight() / 2, radius2, transparentPaint);
canvas.drawBitmap(bitmap, 0, 0, new Paint());
if(radius2 >= getWidth() / 2 - Utils.dpToPx(ringWidth, getResources()))
{
cont++;
}
if(radius2 >= getWidth() / 2)
{
firstAnimationOver = true;
}
}
}

int arcD = 1;
int arcO = 0;
float rotateAngle = 0;
int limite = 0;

/**
* Draw second animation of view
*
* @param canvas
*/
private void drawSecondAnimation(Canvas canvas)
{
if(arcO == limite)
{
arcD += 6;
}
if(arcD >= 290 || arcO > limite)
{
arcO += 6;
arcD -= 6;
}
if(arcO > limite + 290)
{
limite = arcO;
arcO = limite;
arcD = 1;
}
rotateAngle += 4;
canvas.rotate(rotateAngle, getWidth() / 2, getHeight() / 2);

Bitmap bitmap = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
Canvas temp = new Canvas(bitmap);
Paint paint = new Paint();
paint.setAntiAlias(true);
paint.setColor(backgroundColor);
// temp.drawARGB(0, 0, 0, 255);
temp.drawArc(new RectF(0, 0, getWidth(), getHeight()), arcO, arcD, true, paint);
Paint transparentPaint = new Paint();
transparentPaint.setAntiAlias(true);
transparentPaint.setColor(getResources().getColor(android.R.color.transparent));
transparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
temp.drawCircle(getWidth() / 2, getHeight() / 2, (getWidth() / 2) - Utils.dpToPx(ringWidth, getResources()), transparentPaint);

canvas.drawBitmap(bitmap, 0, 0, new Paint());
}


// Set color of background
public void setBackgroundColor(int color)
{
super.setBackgroundColor(getResources().getColor(android.R.color.transparent));
if(isEnabled())
{
beforeBackground = backgroundColor;
}
this.backgroundColor = color;
}

}
6 changes: 3 additions & 3 deletions MaterialDesignLibrary/MaterialDesignDemo/src/main/res/layout/activity_progress.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
</RelativeLayout>

<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="48dp" >
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<com.gc.materialdesign.views.ProgressBarCircularIndeterminate
android:id="@+id/progressBarCircularIndetermininate"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerInParent="true"
android:background="#1E88E5" />
materialdesign:ringWidth="1dp"/>
</RelativeLayout>
<!-- PROGRESS BAR INDETERMINATE -->

Expand Down