-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated Release Notes and SDK version - v5.1.1
- Loading branch information
Showing
8 changed files
with
350 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // Project properties | ||
| version = "5.1" | ||
| version = "5.1.1" | ||
| group='com.appnexus.opensdk' | ||
|
|
||
| // Android build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package com.appnexus.opensdk; | ||
|
|
||
| import android.content.Context; | ||
| import android.graphics.Canvas; | ||
| import android.graphics.Color; | ||
| import android.graphics.Paint; | ||
| import android.graphics.Paint.Style; | ||
| import android.graphics.RectF; | ||
| import android.graphics.Typeface; | ||
| import android.os.Build; | ||
| import android.text.Html; | ||
| import android.text.TextUtils; | ||
| import android.util.AttributeSet; | ||
| import android.view.View; | ||
| import android.widget.ProgressBar; | ||
|
|
||
| import com.appnexus.opensdk.utils.ViewUtil; | ||
|
|
||
| public class CircularProgressBar extends ProgressBar{ | ||
|
|
||
| private static final double DEFAULT_STROKE_WIDTH = 2.5; | ||
| private static final int TITLE_FONT_SIZE = 14; | ||
| private static final String CLOSE_X = "×"; | ||
| private int GRAY = Color.parseColor("#787878"); | ||
| private int WHITE = Color.parseColor("#ffffff"); | ||
| private static final int CROSS_X_FONT_SIZE = 24; | ||
|
|
||
| private String title = ""; | ||
|
|
||
| private int strokeWidth = 0; | ||
|
|
||
| private final RectF circleBounds = new RectF(); | ||
| private final Paint progressColorPaint = new Paint(); | ||
| private final Paint strokeColorPaint = new Paint(); | ||
| private final Paint backgroundColorPaint = new Paint(); | ||
| private final Paint titlePaint = new Paint(); | ||
|
|
||
| public CircularProgressBar(Context context) { | ||
| super(context); | ||
| initializeCountdownView(null, 0); | ||
| } | ||
|
|
||
| public CircularProgressBar(Context context, AttributeSet attrs) { | ||
| super(context, attrs); | ||
| initializeCountdownView(attrs, 0); | ||
| } | ||
|
|
||
| public CircularProgressBar(Context context, AttributeSet attrs, int defStyle) { | ||
| super(context, attrs, defStyle); | ||
| initializeCountdownView(attrs, defStyle); | ||
| } | ||
|
|
||
| public void initializeCountdownView(AttributeSet attrs, int style){ | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { | ||
| setLayerType(View.LAYER_TYPE_SOFTWARE, null); | ||
| } | ||
|
|
||
| strokeWidth = ViewUtil.getValueInPixel(this.getContext(), DEFAULT_STROKE_WIDTH) + 1; | ||
|
|
||
| progressColorPaint.setColor(WHITE); | ||
| strokeColorPaint.setColor(GRAY); | ||
| backgroundColorPaint.setColor(WHITE); | ||
| titlePaint.setColor(GRAY); | ||
|
|
||
| progressColorPaint.setAntiAlias(true); | ||
| progressColorPaint.setStyle(Style.STROKE); | ||
| progressColorPaint.setStrokeWidth(strokeWidth); | ||
|
|
||
| strokeColorPaint.setAntiAlias(true); | ||
| strokeColorPaint.setStyle(Style.STROKE); | ||
| strokeColorPaint.setStrokeWidth(strokeWidth); | ||
|
|
||
| backgroundColorPaint.setAntiAlias(true); | ||
| backgroundColorPaint.setStyle(Style.FILL); | ||
| backgroundColorPaint.setStrokeWidth(strokeWidth); | ||
|
|
||
| titlePaint.setTextSize(TITLE_FONT_SIZE); | ||
| titlePaint.setStyle(Style.FILL); | ||
| titlePaint.setAntiAlias(true); | ||
| titlePaint.setTypeface(Typeface.create(Typeface.MONOSPACE, Typeface.BOLD)); | ||
| } | ||
|
|
||
| @Override | ||
| protected synchronized void onDraw(Canvas canvas) { | ||
| canvas.drawArc(circleBounds, 0, 360, false, backgroundColorPaint); | ||
| canvas.drawArc(circleBounds, 0, 360, false, strokeColorPaint); | ||
| float scale = getMax() > 0 ? (float)getProgress()/getMax() * 360: 0; | ||
| canvas.drawArc(circleBounds, 270, -scale, false, progressColorPaint); | ||
|
|
||
| if (!TextUtils.isEmpty(title)){ | ||
| int x = (int)(getMeasuredWidth()/2 - titlePaint.measureText(title) / 2); | ||
| int y = getMeasuredHeight()/2; | ||
|
|
||
| float titleHeight = Math.abs(titlePaint.descent() + titlePaint.ascent()); | ||
| y += titleHeight/ 2; | ||
| canvas.drawText(title, x, y, titlePaint); | ||
| } | ||
| super.onDraw(canvas); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) { | ||
| final int height = getDefaultSize(getSuggestedMinimumHeight(), heightMeasureSpec); | ||
| final int width = getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec); | ||
| final int min = Math.min(width, height); | ||
| setMeasuredDimension(min + 2 * strokeWidth, min + 2 * strokeWidth); | ||
|
|
||
| circleBounds.set(strokeWidth, strokeWidth, min + strokeWidth, min + strokeWidth); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized void setProgress(int progress) { | ||
| super.setProgress(progress); | ||
| invalidate(); | ||
| } | ||
|
|
||
| public synchronized void setTitle(String title){ | ||
| if(title.equalsIgnoreCase("X")){ | ||
| this.title = Html.fromHtml(CLOSE_X).toString(); | ||
| titlePaint.setTextSize(ViewUtil.getValueInPixel(this.getContext(), CROSS_X_FONT_SIZE)); | ||
| }else{ | ||
| this.title = title; | ||
| titlePaint.setTextSize(ViewUtil.getValueInPixel(this.getContext(), TITLE_FONT_SIZE)); | ||
| } | ||
| invalidate(); | ||
| } | ||
|
|
||
|
|
||
| public String getTitle(){ | ||
| return title; | ||
| } | ||
|
|
||
| public void setTransparent() { | ||
| GRAY = Color.parseColor("#00000000"); | ||
| WHITE = Color.parseColor("#00000000"); | ||
| initializeCountdownView(null, 0); | ||
| invalidate(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.