Release 1.5.10 Changes (#117)

halfhp · web-flow · commit b46fd30f0789 · 2022-07-31T19:22:07.000-05:00
* uprev to 1.5.10 * remove circleci, add github actions build script * #114 fix setLinesPerRangeLabel & setLinesPerDomainLabel * fix barchart documentation
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,53 @@
+name: build androidplot
+on:
+  push:
+    branches:
+      - v1.5.10b # TODO change to master
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Build and Test
+        run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport
+
+      - name: Build Release
+        env:
+          ENCODED: ${{ secrets.DEMOAPP_KEYSTORE }}
+          KEYSTORE: keystore.jks
+          KEY_ALIAS: Key0
+          KEYSTORE_PASSWORD: ${{ secrets.DEMOAPP_KEYSTORE_PASSWORD }}
+          KEY_PASSWORD: ${{ secrets.DEMOAPP_KEY_PASSWORD }}
+        run: |
+          echo $ENCODED | base64 -di > "${GITHUB_WORKSPACE}/demoapp/keystore.jks"
+          ./gradlew assembleRelease
+
+      - name: Javadoc
+        run: ./gradlew javadoc
+
+      - name: Code Coverage
+        run: bash <(curl -s https://codecov.io/bash)
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Core Library
+          path: androidplot-core/build/outputs/aar/*.aar
+          retention-days: 30
+
+      - uses: actions/upload-artifact@v3
+        if: github.ref_name == 'master'
+        with:
+          name: Demoapp APK
+          path: demoapp/build/outputs/apk/release/*.apk
+          retention-days: 30
+
+      - name: Stage for Maven Central
+        if: github.ref_name == 'master'
+        env:
+          OSSRH_ACTOR: ${{ secrets.OSSRH_ACTOR }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
+        run: ./gradlew publish
diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
@@ -74,11 +74,10 @@ android {
             }
         }
     }
-
-    lintOptions {
-        // TODO: enable and address lint issues.
+    lint {
         abortOnError false
     }
+
 }
 
 group = 'com.androidplot'
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
@@ -564,7 +564,7 @@ protected void doOnDraw(Canvas canvas, RectF widgetRect) {
     }
 
     protected void drawDomainLine(Canvas canvas, float xPix, Number xVal,
-                                  Paint linePaint, boolean isOrigin) {
+                                  Paint linePaint, boolean isOrigin, boolean shouldDrawLabel) {
 
         // lines
         if (linePaint != null) {
@@ -574,22 +574,35 @@ protected void drawDomainLine(Canvas canvas, float xPix, Number xVal,
         }
 
         // labels
-        drawLineLabel(canvas, Edge.TOP, xVal, xPix, labelRect.top, isOrigin);
-        drawLineLabel(canvas, Edge.BOTTOM, xVal, xPix, labelRect.bottom, isOrigin);
+        if(shouldDrawLabel) {
+            if (isLineLabelEnabled(Edge.TOP)) {
+                drawLineLabel(canvas, Edge.TOP, xVal, xPix, labelRect.top, isOrigin);
+            }
+
+            if (isLineLabelEnabled(Edge.BOTTOM)) {
+                drawLineLabel(canvas, Edge.BOTTOM, xVal, xPix, labelRect.bottom, isOrigin);
+            }
+        }
     }
 
     protected void drawRangeLine(Canvas canvas, float yPix, Number yVal,
-                                 Paint linePaint, boolean isOrigin) {
+                                 Paint linePaint, boolean isOrigin, boolean shouldDrawLabel) {
         // lines
         if (linePaint != null) {
             canvas.drawLine(gridRect.left - lineExtensionLeft, yPix,
                     gridRect.right + lineExtensionRight, yPix, linePaint
             );
         }
 
-        // labels
-        drawLineLabel(canvas, Edge.LEFT, yVal, labelRect.left, yPix, isOrigin);
-        drawLineLabel(canvas, Edge.RIGHT, yVal, labelRect.right, yPix, isOrigin);
+        if(shouldDrawLabel) {
+            // labels
+            if (isLineLabelEnabled(Edge.LEFT)) {
+                drawLineLabel(canvas, Edge.LEFT, yVal, labelRect.left, yPix, isOrigin);
+            }
+            if (isLineLabelEnabled(Edge.RIGHT)) {
+                drawLineLabel(canvas, Edge.RIGHT, yVal, labelRect.right, yPix, isOrigin);
+            }
+        }
     }
 
     protected void drawLineLabel(Canvas canvas,
@@ -598,9 +611,7 @@ protected void drawLineLabel(Canvas canvas,
                                  float x,
                                  float y,
                                  boolean isOrigin) {
-        if (isLineLabelEnabled(edge)) {
-            getLineLabelRenderer(edge).drawLabel(canvas, getLineLabelStyle(edge), val, x, y, isOrigin);
-        }
+        getLineLabelRenderer(edge).drawLabel(canvas, getLineLabelStyle(edge), val, x, y, isOrigin);
     }
 
     /**
@@ -646,7 +657,7 @@ protected void drawGrid(Canvas canvas) {
             } else {
                 linePaint = domainSubGridLinePaint;
             }
-            drawDomainLine(canvas, (float) xPix, xVal, linePaint, isOrigin);
+            drawDomainLine(canvas, (float) xPix, xVal, linePaint, isOrigin, isMajorTick);
         }
 
         Number rangeOrigin = plot.getRangeOrigin();
@@ -684,7 +695,7 @@ protected void drawGrid(Canvas canvas) {
             } else {
                 linePaint = rangeSubGridLinePaint;
             }
-            drawRangeLine(canvas, (float) yPix, yVal, linePaint, isOrigin);
+            drawRangeLine(canvas, (float) yPix, yVal, linePaint, isOrigin, isMajorTick);
         }
     }
 
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -21,15 +21,13 @@
 
 import com.androidplot.test.*;
 import com.androidplot.ui.*;
-import com.androidplot.util.DisplayDimensions;
 
 import org.junit.*;
 import org.mockito.*;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyDouble;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;
@@ -202,7 +200,6 @@ public void drawCursorLabel_drawsText() {
 
     @Test
     public void setLineLabelEdges_setsEdges() {
-
         graphWidget.setLineLabelEdges(XYGraphWidget.Edge.LEFT, XYGraphWidget.Edge.BOTTOM);
         assertTrue(graphWidget.isLineLabelEnabled(XYGraphWidget.Edge.LEFT));
         assertTrue(graphWidget.isLineLabelEnabled(XYGraphWidget.Edge.BOTTOM));
@@ -312,10 +309,10 @@ public void setGridInsets_updatesGridRect() {
 
     private void runDrawGridTest() {
         doNothing().when(graphWidget).
-                drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
+                drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean(), anyBoolean());
 
         doNothing().when(graphWidget).
-                drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
+                drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean(), anyBoolean());
 
         xyPlot.setRangeBoundaries(0, 100, BoundaryMode.FIXED);
         xyPlot.setDomainBoundaries(0, 100, BoundaryMode.FIXED);
@@ -324,9 +321,9 @@ private void runDrawGridTest() {
 
         // expecting a 100x100 grid to be drawn:
         verify(graphWidget, times(100))
-                .drawDomainLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false));
+                .drawDomainLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false), anyBoolean());
 
         verify(graphWidget, times(100))
-                .drawRangeLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false));
+                .drawRangeLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false), anyBoolean());
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -18,21 +18,22 @@ ext {
     theCompileSdkVersion = 30
     theTargetSdkVersion = 30
     theMinSdkVersion = 5
-    theVersionName = '1.5.9'
+    theVersionName = '1.5.10'
     theVersionCode = 1
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
 
 buildscript {
     repositories {
         mavenCentral()
+        maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5'
     }
 }
 
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -80,11 +80,10 @@ android {
             debuggable true
         }
     }
-
-    lintOptions {
-        // TODO: set to true and address all the lint issues.
+    lint {
         abortOnError false
     }
+
 }
 
 play {
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
@@ -88,6 +88,8 @@ public void onCreate(Bundle savedInstanceState)
         // add a new series' to the xyplot:
         plot.addSeries(series1, series1Format);
         plot.addSeries(series2, series2Format);
+        plot.setLinesPerRangeLabel(3);
+        plot.setLinesPerDomainLabel(2);
 
         plot.getGraph().getLineLabelStyle(XYGraphWidget.Edge.BOTTOM).setFormat(new Format() {
             @Override
diff --git a/docs/barchart.md b/docs/barchart.md
@@ -118,14 +118,14 @@ The exact size of the `BarGroup` is specified in pixels and the space between ea
 is dynamically calculated based on that size.
 
 ```java
-barRenderer.setBarWidth(BarRenderer.BarGroupWidthMode.FIXED_WIDTH, PixelUtils.dpToPix(25));
+barRenderer.setBarGroupWidth(BarRenderer.BarGroupWidthMode.FIXED_WIDTH, PixelUtils.dpToPix(25));
 ```
 ##### FIXED_GAP
 The exact size of the "gap" between each `BarGroup` is specified in pixels and the size of each `BarGroup`
 is dynamically calculated based on that spacing.
 
 ```java
-barRenderer.setBarWidth(BarRenderer.BarGroupWidthMode.FIXED_GAP, PixelUtils.dpToPix(5));
+barRenderer.setBarGroupWidth(BarRenderer.BarGroupWidthMode.FIXED_GAP, PixelUtils.dpToPix(5));
 ```
 
 # Example
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -14,7 +14,7 @@ To use the library in your gradle project add the following to your build.gradle
 
 ```groovy
 dependencies {
-    implementation "com.androidplot:androidplot-core:1.5.9"
+    implementation "com.androidplot:androidplot-core:1.5.10"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
@@ -2,6 +2,10 @@
 For details on what to expect in general when updating to a new version of Androiplot, check out the
 [versioning doc](versioning.md).
 
+# 1.5.10
+* Update project to use latest gradle / build tools
+* (#114) fix `setLinesPerRangeLabel` & `setLinesPerDomainLabel`
+
 # 1.5.9
 * (#107) Fix ambiguous ordinal for render mode attributes
 * (#104) Fix issue with background rendering in RecyclerView.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/misc/download_keystore.sh b/misc/download_keystore.sh

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,10 @@ android {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`-`
`78`		`- lintOptions {`
`79`		`- // TODO: enable and address lint issues.`
	`77`	`+ lint {`
`80`	`78`	`abortOnError false`
`81`	`79`	`}`
	`80`	`+`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`group = 'com.androidplot'`
Original file line number	Diff line number	Diff line change
`@@ -18,21 +18,22 @@ ext {`
`18`	`18`	`theCompileSdkVersion = 30`
`19`	`19`	`theTargetSdkVersion = 30`
`20`	`20`	`theMinSdkVersion = 5`
`21`		`- theVersionName = '1.5.9'`
	`21`	`+ theVersionName = '1.5.10'`
`22`	`22`	`theVersionCode = 1`
`23`	`23`	`gitUrl = 'https://github.com/halfhp/androidplot.git'`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`buildscript {`
`27`	`27`	`repositories {`
`28`	`28`	`mavenCentral()`
	`29`	`+ maven { url "https://plugins.gradle.org/m2/" }`
`29`	`30`	`maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }`
`30`	`31`	`google()`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`dependencies {`
`34`		`- classpath 'com.android.tools.build:gradle:7.0.2'`
`35`		`- classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5-SNAPSHOT'`
	`35`	`+ classpath 'com.android.tools.build:gradle:7.2.1'`
	`36`	`+ classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5'`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,10 @@ android {`
`80`	`80`	`debuggable true`
`81`	`81`	`}`
`82`	`82`	`}`
`83`		`-`
`84`		`- lintOptions {`
`85`		`- // TODO: set to true and address all the lint issues.`
	`83`	`+ lint {`
`86`	`84`	`abortOnError false`
`87`	`85`	`}`
	`86`	`+`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`play {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ To use the library in your gradle project add the following to your build.gradle`
`14`	`14`
`15`	`15`	```groovy
`16`	`16`	`dependencies {`
`17`		`- implementation "com.androidplot:androidplot-core:1.5.9"`
	`17`	`+ implementation "com.androidplot:androidplot-core:1.5.10"`
`18`	`18`	`}`
`19`	`19`	```
`20`	`20`