Skip to content

Added new attribute to set the graph's stroke cap to square or round #12

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

Open
RacZo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added new attribute to set the graph's stroke cap to square or round #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8035c6
chore: Upgraded gradle and build tools version and support library ve…
RacZo Nov 2, 2017
98079df
feat: Added a new attribute to control the shape of the stroke cap, n…
RacZo Nov 2, 2017
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
8 changes: 4 additions & 4 deletions FitChart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.0"

defaultConfig {
minSdkVersion 14
targetSdkVersion 23
versionCode 1
targetSdkVersion 27
versionCode 2
versionName version
}
buildTypes {
Expand Down
10 changes: 9 additions & 1 deletion FitChart/src/main/java/com/txusballesteros/widgets/FitChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,15 @@ public class FitChart extends View {
static final float INITIAL_ANIMATION_PROGRESS = 0.0f;
static final float MAXIMUM_SWEEP_ANGLE = 360f;
static final int DESIGN_MODE_SWEEP_ANGLE = 216;
static final int STROKE_CAP_ROUND = 0;
static final int STROKE_CAP_SQUARE = 1;
private RectF drawingArea;
private Paint backStrokePaint;
private Paint valueDesignPaint;
private int backStrokeColor;
private int valueStrokeColor;
private float strokeSize;
private int strokeCap;
private float minValue = DEFAULT_MIN_VALUE;
private float maxValue = DEFAULT_MAX_VALUE;
private List<FitChartValue> chartValues;
Expand Down Expand Up @@ -121,7 +124,11 @@ private Paint buildPaintForValue() {
Paint paint = getPaint();
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(strokeSize);
paint.setStrokeCap(Paint.Cap.ROUND);
if (strokeCap == STROKE_CAP_SQUARE) {
paint.setStrokeCap(Paint.Cap.SQUARE);
} else {
paint.setStrokeCap(Paint.Cap.ROUND);
}
return paint;
}

Expand Down Expand Up @@ -176,6 +183,7 @@ private void readAttributes(AttributeSet attrs) {
.getTheme().obtainStyledAttributes(attrs, R.styleable.FitChart, 0, 0);
strokeSize = attributes
.getDimensionPixelSize(R.styleable.FitChart_strokeSize, (int) strokeSize);
strokeCap = attributes.getInt(R.styleable.FitChart_strokeCap, strokeCap);
valueStrokeColor = attributes
.getColor(R.styleable.FitChart_valueStrokeColor, valueStrokeColor);
backStrokeColor = attributes
Expand Down
4 changes: 4 additions & 0 deletions FitChart/src/main/res/values/attributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<resources>
<declare-styleable name="FitChart">
<attr name="strokeSize" format="dimension|reference" />
<attr name="strokeCap" >
<enum name="round" value="0" />
<enum name="square" value="1" />
</attr>
<attr name="valueStrokeColor" format="color|reference" />
<attr name="backStrokeColor" format="color|reference" />
<attr name="animationMode">
Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.0"

defaultConfig {
applicationId "com.txusballesteros.widgets.app"
minSdkVersion 14
targetSdkVersion 23
versionCode 1
versionName "1.0"
targetSdkVersion 27
versionCode 2
versionName "1.1"
}
buildTypes {
release {
Expand Down
30 changes: 15 additions & 15 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
* Copyright Txus Ballesteros 2015 (@txusballesteros)
*
* This file is part of some open source application.
Expand Down Expand Up @@ -27,46 +26,47 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#fafafa"
android:padding="8dp"
android:gravity="center">
android:gravity="center"
android:orientation="vertical"
android:padding="8dp">

<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<com.txusballesteros.widgets.FitChart
android:id="@+id/fitChart"
style="@style/chart_style"
android:layout_gravity="center"
app:animationMode="overdraw"
android:id="@+id/fitChart" />
app:strokeCap="square" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:maxWidth="200dp"
android:textSize="20sp"
android:textStyle="bold"
android:text="2.500 steps today"
android:textColor="#212121"
android:gravity="center"
android:text="2.500 steps today"/>
android:textSize="20sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:maxWidth="200dp"
android:textSize="15sp"
android:text="Your goal is 10.000 steps."
android:textColor="#757575"
android:gravity="center"
android:text="Your goal is 10.000 steps." />
android:textSize="15sp" />

</LinearLayout>
</FrameLayout>
Expand All @@ -76,6 +76,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Add Values"/>
android:text="Add Values" />

</LinearLayout>
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

allprojects {
ext {
libraryVersion = '1.0'
libraryVersion = '1.1'
mavenGroupId = 'com.txusballesteros'
siteUrl = 'https://github.com/txusballesteros/fit-chart'
gitUrl = 'https://github.com/txusballesteros/fit-chart.git'
Expand Down