From 7893160306fcba7baacd8db46745ede00b35bc0a Mon Sep 17 00:00:00 2001
From: hannesa2 <hannes.achleitner@googlemail.com>
Date: Sun, 22 Apr 2018 18:24:06 +0200
Subject: [PATCH 01/38] update to Android Studio 3.1.1 (#77)

---
 build.gradle                             | 6 +++---
 demoapp-wearable/build.gradle            | 5 +++--
 demoapp/build.gradle                     | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index d9bdfbfc..a7aa9c13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,9 +38,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.6.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
     }
diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle
index b4afad27..22e5186d 100644
--- a/demoapp-wearable/build.gradle
+++ b/demoapp-wearable/build.gradle
@@ -17,9 +17,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.1'
     }
 }
 apply plugin: 'com.android.application'
@@ -54,6 +55,6 @@ android {
 
 dependencies {
     compile project(':androidplot-core')
-    compile 'com.google.android.support:wearable:1.3.0'
+    compile 'com.google.android.support:wearable:2.3.0'
     compile 'com.google.android.gms:play-services-wearable:8.3.0'
 }
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index c501ed33..36a7c800 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -21,9 +21,9 @@ dependencies {
 	compile project(':androidplot-core')
     compile 'com.crittercism:crittercism-android-agent:5.4.0'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 }
 
 buildscript {
@@ -32,7 +32,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
+        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6bd840a3..42a64d0b 100644
--- 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-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

From c53ac24397e25032c444304951c50152ff5a39ad Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Fri, 4 May 2018 13:47:45 -0500
Subject: [PATCH 02/38] include full apache 2.0 license in LICENSE.md

---
 LICENSE.md | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 198 insertions(+), 10 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 3fbf0a78..f49a4e16 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,13 +1,201 @@
-    Copyright 2018 Androidplot.com
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-        http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
\ No newline at end of file
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

From f58cd6b43859886a7141d8294c16069d85baf768 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@users.noreply.github.com>
Date: Wed, 23 May 2018 11:18:38 -0500
Subject: [PATCH 03/38] 1.5.5 changes (#79)

* remove unused button from simple xy plot

* #78 Fixes issue where setting XYGraphWidget insets has no effect.

* XYGraphWidget.drawMarkerText is now protected instead of private.

* 1.5.5 documentation updates
---
 .../com/androidplot/xy/XYGraphWidget.java     | 54 +++++-----
 .../com/androidplot/xy/XYGraphWidgetTest.java | 98 ++++++++++---------
 .../demos/SimpleXYPlotActivity.java           | 17 +++-
 .../res/layout/simple_xy_plot_example.xml     |  6 --
 docs/quickstart.md                            |  2 +-
 docs/release_notes.md                         |  6 ++
 6 files changed, 107 insertions(+), 76 deletions(-)

diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
index 23506f64..1ca3de77 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
@@ -530,8 +530,15 @@ protected float seriesToScreenY(Number y) {
 
     @Override
     protected void onResize(@Nullable RectF oldRect, @NonNull RectF newRect) {
-        gridRect = RectFUtils.applyInsets(newRect, gridInsets);
-        labelRect = RectFUtils.applyInsets(newRect, lineLabelInsets);
+        recalculateSizes(newRect);
+    }
+
+    protected void recalculateSizes(@Nullable RectF rect) {
+        if(rect == null) {
+            rect = getWidgetDimensions().paddedRect;
+        }
+        gridRect = RectFUtils.applyInsets(rect, gridInsets);
+        labelRect = RectFUtils.applyInsets(rect, lineLabelInsets);
     }
 
     @Override
@@ -694,27 +701,29 @@ protected void drawGrid(Canvas canvas) {
      * @param x
      * @param y
      */
-    private void drawMarkerText(Canvas canvas, String text, ValueMarker marker,
+    protected void drawMarkerText(Canvas canvas, String text, ValueMarker marker,
                                 float x, float y) {
-        x += MARKER_LABEL_SPACING;
-        y -= MARKER_LABEL_SPACING;
-        RectF textRect = new RectF(FontUtils.getStringDimensions(
-                text,
-                marker.getTextPaint()
-        ));
-        textRect.offsetTo(x, y - textRect.height());
+        if (marker.getText() != null) {
+            x += MARKER_LABEL_SPACING;
+            y -= MARKER_LABEL_SPACING;
+            RectF textRect = new RectF(FontUtils.getStringDimensions(
+                    text,
+                    marker.getTextPaint()
+            ));
+            textRect.offsetTo(x, y - textRect.height());
+
+            if (textRect.right > gridRect.right) {
+                textRect.offset(-(textRect.right - gridRect.right), ZERO);
+            }
 
-        if (textRect.right > gridRect.right) {
-            textRect.offset(-(textRect.right - gridRect.right), ZERO);
-        }
+            if (textRect.top < gridRect.top) {
+                textRect.offset(0, gridRect.top - textRect.top);
+            }
 
-        if (textRect.top < gridRect.top) {
-            textRect.offset(0, gridRect.top - textRect.top);
+            canvas.drawText(text, textRect.left, textRect.bottom,
+                    marker.getTextPaint()
+            );
         }
-
-        canvas.drawText(text, textRect.left, textRect.bottom,
-                marker.getTextPaint()
-        );
     }
 
     protected void drawMarkers(Canvas canvas) {
@@ -731,10 +740,7 @@ protected void drawMarkers(Canvas canvas) {
                     float xPix = marker.getTextPosition().getPixelValue(
                             gridRect.width());
                     xPix += gridRect.left;
-
-                    if (marker.getText() != null) {
-                        drawMarkerText(canvas, marker.getText(), marker, xPix, yPix);
-                    }
+                    drawMarkerText(canvas, marker.getText(), marker, xPix, yPix);
                 }
             }
         }
@@ -1149,6 +1155,7 @@ public Insets getGridInsets() {
 
     public void setGridInsets(Insets gridInsets) {
         this.gridInsets = gridInsets;
+        recalculateSizes(null);
     }
 
     /**
@@ -1160,6 +1167,7 @@ public Insets getLineLabelInsets() {
 
     public void setLineLabelInsets(Insets lineLabelInsets) {
         this.lineLabelInsets = lineLabelInsets;
+        recalculateSizes(null);
     }
 
     public RectF getGridRect() {
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
index 9f92afa8..65d3898a 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -21,6 +21,7 @@
 
 import com.androidplot.test.*;
 import com.androidplot.ui.*;
+import com.androidplot.util.DisplayDimensions;
 
 import org.junit.*;
 import org.mockito.*;
@@ -67,7 +68,7 @@ public class XYGraphWidgetTest extends AndroidplotTest {
 
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         size = spy(new Size(100, SizeMode.ABSOLUTE, 100, SizeMode.ABSOLUTE));
         xyPlot = spy(new XYPlot(getContext(), "XYPlot"));
         when(xyPlot.getRegistry()).thenReturn(seriesRegistry);
@@ -83,13 +84,8 @@ public void setUp() throws Exception {
         graphWidget.setLabelRect(new RectF(0, 0, 100, 100));
     }
 
-    @After
-    public void tearDown() throws Exception {
-
-    }
-
     @Test
-    public void testProcessAttrs() throws Exception {
+    public void processAttrs_withDefaults_disablesGridClipping() {
         XYGraphWidget graphWidget = spy(new XYGraphWidget(layoutManager, xyPlot, size));
 
         graphWidget.processAttrs(typedArray);
@@ -97,7 +93,7 @@ public void testProcessAttrs() throws Exception {
     }
 
     @Test
-    public void testDoOnDraw_drawGridOnTopFalse() throws Exception {
+    public void doOnDraw_drawGridOnTopFalse_drawsGridAfterData() throws Exception {
         XYGraphWidget graphWidget = spy(new XYGraphWidget(layoutManager, xyPlot, size));
         graphWidget.setDrawGridOnTop(false);
         doNothing().when(graphWidget).drawGrid(canvas);
@@ -113,7 +109,7 @@ public void testDoOnDraw_drawGridOnTopFalse() throws Exception {
     }
 
     @Test
-    public void testDoOnDraw_drawGridOnTopTrue() throws Exception {
+    public void doOnDraw_drawGridOnTopTrue_drawsGridBeforeData() throws Exception {
         XYGraphWidget graphWidget = spy(new XYGraphWidget(layoutManager, xyPlot, size));
         graphWidget.setDrawGridOnTop(true);
         doNothing().when(graphWidget).drawGrid(canvas);
@@ -129,7 +125,7 @@ public void testDoOnDraw_drawGridOnTopTrue() throws Exception {
     }
 
     @Test
-    public void testDrawMarkers() throws Exception {
+    public void drawMarkers_drawsLineForEachMarker() {
         xyPlot.addMarker(new XValueMarker(1, "x"));
         xyPlot.addMarker(new YValueMarker(-1, "y"));
 
@@ -140,42 +136,22 @@ public void testDrawMarkers() throws Exception {
                 .drawLine(anyFloat(), anyFloat(), anyFloat(), anyFloat(), any(Paint.class));
     }
 
-    protected void runDrawGridTest() {
-        doNothing().when(graphWidget).
-                drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
-
-        doNothing().when(graphWidget).
-                drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
-
-        xyPlot.setRangeBoundaries(0, 100, BoundaryMode.FIXED);
-        xyPlot.setDomainBoundaries(0, 100, BoundaryMode.FIXED);
-
-        graphWidget.drawGrid(canvas);
-
-        // expecting a 100x100 grid to be drawn:
-        verify(graphWidget, times(100))
-                .drawDomainLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
-
-        verify(graphWidget, times(100))
-                .drawRangeLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
-    }
-
     @Test
-    public void testDrawGrid_nullOrigin() throws Exception {
+    public void drawGrid_nullOrigin_drawsGrid() {
         when(xyPlot.getDomainOrigin()).thenReturn(null);
         when(xyPlot.getRangeOrigin()).thenReturn(null);
         runDrawGridTest();
     }
 
     @Test
-    public void testDrawGrid_zeroOrigin() throws Exception {
+    public void drawGrid_zeroOrigin_drawsGrid() {
         when(xyPlot.getDomainOrigin()).thenReturn(0);
         when(xyPlot.getRangeOrigin()).thenReturn(0);
         runDrawGridTest();
     }
 
     @Test
-    public void testDrawGrid_centeredOrigin() throws Exception {
+    public void drawGrid_centeredOrigin_drawsGrid() {
 
         // set origin to midpoint so we exercise
         // code to draw lines on both sides of the origin:
@@ -185,7 +161,7 @@ public void testDrawGrid_centeredOrigin() throws Exception {
     }
 
     @Test
-    public void testDrawCursors_ifCursorPaintAndPositionAreSet() throws Exception {
+    public void drawCursors_withCursorPaintAndPosition_drawsCursorLines() {
         final Paint domainCursorPaint = new Paint();
         graphWidget.setDomainCursorPaint(domainCursorPaint);
 
@@ -201,7 +177,7 @@ public void testDrawCursors_ifCursorPaintAndPositionAreSet() throws Exception {
     }
 
     @Test
-    public void testDrawCursors_ifCursorPaintAndPositionAreNotSet() throws Exception {
+    public void testDrawCursors_noCursorPaintOrPosition_drawsNoCursorLines() {
         graphWidget.setDomainCursorPaint(null);
         graphWidget.setRangeCursorPaint(null);
 
@@ -212,7 +188,7 @@ public void testDrawCursors_ifCursorPaintAndPositionAreNotSet() throws Exception
     }
 
     @Test
-    public void testDrawCursorLabel() throws Exception {
+    public void drawCursorLabel_drawsText() {
         graphWidget.setDomainCursorPosition(0f);
         graphWidget.setRangeCursorPosition(0f);
         XYGraphWidget.CursorLabelFormatter clf = mock(XYGraphWidget.CursorLabelFormatter.class);
@@ -224,7 +200,7 @@ public void testDrawCursorLabel() throws Exception {
     }
 
     @Test
-    public void testSetLineLabelEdges() throws Exception {
+    public void setLineLabelEdges_setsEdges() {
 
         graphWidget.setLineLabelEdges(XYGraphWidget.Edge.LEFT, XYGraphWidget.Edge.BOTTOM);
         assertTrue(graphWidget.isLineLabelEnabled(XYGraphWidget.Edge.LEFT));
@@ -238,7 +214,7 @@ public void testSetLineLabelEdges() throws Exception {
     }
 
     @Test
-    public void testSetLineLabelEdges_bitfield() throws Exception {
+    public void setLineLabelEdges_bitfield_setsEdges() {
 
         graphWidget.setLineLabelEdges(
                 XYGraphWidget.Edge.TOP.getValue() | XYGraphWidget.Edge.RIGHT.getValue());
@@ -250,7 +226,7 @@ public void testSetLineLabelEdges_bitfield() throws Exception {
     }
 
     @Test
-    public void testScreenToSeries() throws Exception {
+    public void screenToSeries_returnsSeriesCoords() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         XYCoords coords = graphWidget.screenToSeries(new PointF(0, 0));
@@ -267,7 +243,7 @@ public void testScreenToSeries() throws Exception {
     }
 
     @Test
-    public void testSeriesToScreen() throws Exception {
+    public void seriesToScreen_returnsScreenPoint() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         PointF point = graphWidget.seriesToScreen(new XYCoords(-100, 100));
@@ -284,7 +260,7 @@ public void testSeriesToScreen() throws Exception {
     }
 
     @Test
-    public void testScreenToSeriesX() throws Exception {
+    public void screenToSeriesX_returnsSeriesValue() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         assertEquals(-100, graphWidget.screenToSeriesX(new PointF(0, 0)).intValue());
@@ -293,7 +269,7 @@ public void testScreenToSeriesX() throws Exception {
     }
 
     @Test
-    public void testScreenToSeriesY() throws Exception {
+    public void screenToSeriesY_returnsSeriesValue() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         assertEquals(100, graphWidget.screenToSeriesY(new PointF(0, 0)).intValue());
@@ -302,7 +278,7 @@ public void testScreenToSeriesY() throws Exception {
     }
 
     @Test
-    public void testSeriesToScreenX() throws Exception {
+    public void seriesToScreenX_returnsScreenValue() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         assertEquals(0f, graphWidget.seriesToScreenX(-100));
@@ -311,11 +287,45 @@ public void testSeriesToScreenX() throws Exception {
     }
 
     @Test
-    public void testSeriesToScreenY() throws Exception {
+    public void seriesToScreenY_returnsScreenValue() {
         when(xyPlot.getBounds()).thenReturn(new RectRegion(-100, 100, -100, 100));
 
         assertEquals(100f, graphWidget.seriesToScreenY(100));
         assertEquals(0f, graphWidget.seriesToScreenY(-100));
         assertEquals(50f, graphWidget.seriesToScreenY(0));
     }
+
+    @Test
+    public void setGridInsets_updatesGridRect() {
+        graphWidget.setGridInsets(new Insets(0, 0, 0, 0));
+        final RectF oldRect = graphWidget.getGridRect();
+
+        graphWidget.setGridInsets(new Insets(2, 2, 2, 2));
+        final RectF newRect = graphWidget.getGridRect();
+
+        assertEquals(oldRect.left + 2, newRect.left);
+        assertEquals(oldRect.top + 2, newRect.top);
+        assertEquals(oldRect.right - 2, newRect.right);
+        assertEquals(oldRect.bottom -2, newRect.bottom);
+    }
+
+    private void runDrawGridTest() {
+        doNothing().when(graphWidget).
+                drawDomainLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
+
+        doNothing().when(graphWidget).
+                drawRangeLine(any(Canvas.class), anyFloat(), any(Number.class), any(Paint.class), anyBoolean());
+
+        xyPlot.setRangeBoundaries(0, 100, BoundaryMode.FIXED);
+        xyPlot.setDomainBoundaries(0, 100, BoundaryMode.FIXED);
+
+        graphWidget.drawGrid(canvas);
+
+        // expecting a 100x100 grid to be drawn:
+        verify(graphWidget, times(100))
+                .drawDomainLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
+
+        verify(graphWidget, times(100))
+                .drawRangeLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
+    }
 }
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
index b673f512..6238e4df 100644
--- a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
@@ -21,8 +21,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.androidplot.ui.Size;
-import com.androidplot.ui.SizeMode;
+import com.androidplot.ui.Insets;
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.CatmullRomInterpolator;
 import com.androidplot.xy.LineAndPointFormatter;
@@ -102,5 +101,19 @@ public Object parseObject(String source, @NonNull ParsePosition pos) {
                 return null;
             }
         });
+
+        new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                plot.getGraph().setGridInsets(new Insets(120, 120, 120, 120));
+                plot.redraw();
+            }
+        }).start();
     }
 }
diff --git a/demoapp/src/main/res/layout/simple_xy_plot_example.xml b/demoapp/src/main/res/layout/simple_xy_plot_example.xml
index 48aeb5cb..08a2c5af 100644
--- a/demoapp/src/main/res/layout/simple_xy_plot_example.xml
+++ b/demoapp/src/main/res/layout/simple_xy_plot_example.xml
@@ -33,10 +33,4 @@
         ap:lineLabelRotationBottom="-45"
         android:layout_weight="1"/>
 
-    <Button
-        android:id="@+id/hide_button"
-        android:layout_width="match_parent"
-        android:layout_height="300dp"
-        android:text="HIDE"/>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 5b1ae96c..e6ae7ff5 100644
--- 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 {
-    compile "com.androidplot:androidplot-core:1.5.4"
+    compile "com.androidplot:androidplot-core:1.5.5"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
index a4c834f5..762ac5a6 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -2,6 +2,12 @@
 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.5
+
+* (#76) Fixed a bug that could cause a deadlock when grid steps are much larger than actual plot range.
+* (#78) Fixed a bug where setting insets on XYGraphWidget would have no effect after the plot was drawn.
+* XYGraphWidget.drawMarkerText is now marked `protected`.
+
 # 1.5.4
 
 * (#69) Fixed a bug in `SimpleXYPlot` preventing the resizing of `Y_VALS_ONLY` formatted series.

From d7019ab9ffc5688ca76da916dc68a798fe6b509e Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sat, 18 Aug 2018 14:30:33 -0500
Subject: [PATCH 04/38] 1.5.6 Changes (#81)

* adds convenience methods for saving and restoring pan / zoom state
* #80 Target SDK 28
* readme updates
---
 .circleci/config.yml                          |  2 +-
 .../java/com/androidplot/pie/PieRenderer.java |  2 +-
 .../com/androidplot/ui/LayoutManager.java     |  4 +-
 .../com/androidplot/ui/SeriesRenderer.java    |  2 +-
 .../ui/widget/TextLabelWidget.java            |  2 +-
 .../androidplot/xy/LineAndPointRenderer.java  |  2 +-
 .../main/java/com/androidplot/xy/PanZoom.java | 82 ++++++++++++++++---
 .../com/androidplot/xy/XYGraphWidget.java     |  2 +-
 build.gradle                                  |  6 +-
 .../demos/SimpleXYPlotActivity.java           | 19 +----
 .../demos/TouchZoomExampleActivity.java       | 15 ++++
 docs/quickstart.md                            |  2 +-
 docs/release_notes.md                         |  5 ++
 docs/xyplot.md                                | 19 +++++
 14 files changed, 122 insertions(+), 42 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a3cd7bfe..c5579475 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
 
       # CircleCI maintains a library of pre-built images
             # documented at https://circleci.com/docs/2.0/circleci-images/
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-28-alpha
 
     working_directory: ~/repo
 
diff --git a/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java b/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
index dc83e620..caaddc06 100644
--- a/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
@@ -170,7 +170,7 @@ protected void drawSegment(Canvas canvas, RectF bounds, Segment seg, SegmentForm
             canvas.drawLine(r1Inner.x, r1Inner.y, r1Outer.x, r1Outer.y, f.getRadialEdgePaint());
             canvas.drawLine(r2Inner.x, r2Inner.y, r2Outer.x, r2Outer.y, f.getRadialEdgePaint());
         } else {
-            canvas.save(Canvas.CLIP_SAVE_FLAG);
+            canvas.save();
             Path chart = new Path();
             chart.addCircle(cx, cy, outerRad, Path.Direction.CW);
             Path inside = new Path();
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java b/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
index e4c5cce5..0fb1a04c 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
@@ -92,7 +92,7 @@ public void draw(Canvas canvas) throws PlotRenderException {
         }
         for (Widget widget : elements()) {
             try {
-                canvas.save(Canvas.ALL_SAVE_FLAG);
+                canvas.save();
                 PositionMetrics metrics = widget.getPositionMetrics();
                 float elementWidth = widget.getWidthPix(displayDims.paddedRect.width());
                 float elementHeight = widget.getHeightPix(displayDims.paddedRect.height());
@@ -140,7 +140,7 @@ public void draw(Canvas canvas) throws PlotRenderException {
 
     private static void drawSpacing(Canvas canvas, RectF outer, RectF inner, Paint paint) {
         try {
-            canvas.save(Canvas.ALL_SAVE_FLAG);
+            canvas.save();
             canvas.clipRect(inner, Region.Op.DIFFERENCE);
             canvas.drawRect(outer, paint);
         } finally {
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java b/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
index 882bdcfc..afc1b142 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
@@ -81,7 +81,7 @@ protected abstract void onRender(Canvas canvas, RectF plotArea, SeriesType serie
 
     public void drawSeriesLegendIcon(Canvas canvas, RectF rect, SeriesFormatterType formatter) {
         try {
-            canvas.save(Canvas.ALL_SAVE_FLAG);
+            canvas.save();
             canvas.clipRect(rect, Region.Op.INTERSECT);
             doDrawLegendIcon(canvas, rect, formatter);
         } finally {
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java b/androidplot-core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java
index 8c6e84cd..06bf54ff 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/widget/TextLabelWidget.java
@@ -101,7 +101,7 @@ public void doOnDraw(Canvas canvas, RectF widgetRect) {
                 Anchor.CENTER);
 
         try {
-            canvas.save(Canvas.ALL_SAVE_FLAG);
+            canvas.save();
             canvas.translate(start.x, start.y);
             switch (orientation) {
                 case HORIZONTAL:
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
index e8c0c23b..53e80dca 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
@@ -309,7 +309,7 @@ protected void renderPath(Canvas canvas, RectF plotArea, Path path, PointF first
                 RectF thisRegionRectF = thisRegionTransformed.asRectF();
                 if (thisRegionRectF != null) {
                     try {
-                        canvas.save(Canvas.ALL_SAVE_FLAG);
+                        canvas.save();
                         canvas.clipPath(path);
                         canvas.drawRect(thisRegionRectF, regionFormatter.getPaint());
                     } finally {
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java b/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
index a8793264..33d61369 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
@@ -2,11 +2,13 @@
 
 import android.graphics.RectF;
 import android.graphics.PointF;
+import android.support.annotation.NonNull;
 import android.view.*;
 
 import com.androidplot.*;
 import com.androidplot.util.*;
 
+import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -35,6 +37,7 @@ public class PanZoom implements View.OnTouchListener {
     // rectangle created by the space between two fingers
     protected RectF fingersRect;
     private View.OnTouchListener delegate;
+    private State state = new State();
 
     // Definition of the touch states
     protected enum DragState {
@@ -95,7 +98,42 @@ public enum ZoomLimit {
         MIN_TICKS
     }
 
-    protected PanZoom(XYPlot plot, Pan pan, Zoom zoom) {
+    // TODO: consider making this immutable / threadsafe
+    public static class State implements Serializable {
+        private Number domainLowerBoundary;
+        private Number domainUpperBoundary;
+        private Number rangeLowerBoundary;
+        private Number rangeUpperBoundary;
+        private BoundaryMode domainBoundaryMode;
+        private BoundaryMode rangeBoundaryMode;
+
+        public void setDomainBoundaries(Number lowerBoundary, Number upperBoundary, BoundaryMode mode) {
+            this.domainLowerBoundary = lowerBoundary;
+            this.domainUpperBoundary = upperBoundary;
+            this.domainBoundaryMode = mode;
+        }
+
+        public void setRangeBoundaries(Number lowerBoundary, Number upperBoundary, BoundaryMode mode) {
+            this.rangeLowerBoundary = lowerBoundary;
+            this.rangeUpperBoundary = upperBoundary;
+            this.rangeBoundaryMode = mode;
+        }
+
+        public void applyDomainBoundaries(@NonNull XYPlot plot) {
+            plot.setDomainBoundaries(domainLowerBoundary, domainUpperBoundary, domainBoundaryMode);
+        }
+
+        public void applyRangeBoundaries(@NonNull XYPlot plot) {
+            plot.setRangeBoundaries(rangeLowerBoundary, rangeUpperBoundary, rangeBoundaryMode);
+        }
+
+        public void apply(@NonNull XYPlot plot) {
+            applyDomainBoundaries(plot);
+            applyRangeBoundaries(plot);
+        }
+    }
+
+    protected PanZoom(@NonNull XYPlot plot, Pan pan, Zoom zoom) {
         this.plot = plot;
         this.pan = pan;
         this.zoom = zoom;
@@ -103,13 +141,32 @@ protected PanZoom(XYPlot plot, Pan pan, Zoom zoom) {
     }
 
     // additional constructor not to break api
-    protected PanZoom(XYPlot plot, Pan pan, Zoom zoom, ZoomLimit limit) {
+    protected PanZoom(@NonNull XYPlot plot, Pan pan, Zoom zoom, ZoomLimit limit) {
         this.plot = plot;
         this.pan = pan;
         this.zoom = zoom;
         this.zoomLimit = limit;
     }
 
+    public State getState() {
+        return this.state;
+    }
+
+    public void setState(@NonNull State state) {
+        this.state = state;
+        state.apply(plot);
+    }
+
+    protected void adjustRangeBoundary(Number lower, Number upper,  BoundaryMode mode) {
+        state.setRangeBoundaries(lower, upper, mode);
+        state.applyRangeBoundaries(plot);
+    }
+
+    protected void adjustDomainBoundary(Number lower, Number upper, BoundaryMode mode) {
+        state.setDomainBoundaries(lower, upper, mode);
+        state.applyDomainBoundaries(plot);
+    }
+
     /**
      * Convenience method for enabling pan/zoom behavior on an instance of {@link XYPlot}, using
      * a default behavior of {@link Pan#BOTH} and {@link Zoom#SCALE}.
@@ -117,7 +174,7 @@ protected PanZoom(XYPlot plot, Pan pan, Zoom zoom, ZoomLimit limit) {
      * @param plot
      * @return
      */
-    public static PanZoom attach(XYPlot plot) {
+    public static PanZoom attach(@NonNull XYPlot plot) {
         return attach(plot, Pan.BOTH, Zoom.SCALE);
     }
 
@@ -130,7 +187,7 @@ public static PanZoom attach(XYPlot plot) {
      * @param zoom
      * @return
      */
-    public static PanZoom attach(XYPlot plot, Pan pan, Zoom zoom) {
+    public static PanZoom attach(@NonNull XYPlot plot, @NonNull Pan pan, @NonNull Zoom zoom) {
         return attach(plot,pan,zoom, ZoomLimit.OUTER);
     }
 
@@ -142,7 +199,7 @@ public static PanZoom attach(XYPlot plot, Pan pan, Zoom zoom) {
      * @param limit
      * @return
      */
-    public static PanZoom attach(XYPlot plot, Pan pan, Zoom zoom, ZoomLimit limit) {
+    public static PanZoom attach(@NonNull XYPlot plot, @NonNull Pan pan, @NonNull Zoom zoom, @NonNull ZoomLimit limit) {
         PanZoom pz = new PanZoom(plot, pan, zoom, limit);
         plot.setOnTouchListener(pz);
         return pz;
@@ -237,12 +294,12 @@ protected void pan(final MotionEvent motionEvent) {
         if (EnumSet.of(Pan.HORIZONTAL, Pan.BOTH).contains(pan)) {
             Region newBounds = new Region();
             calculatePan(oldFirstFinger, newBounds, true);
-            plot.setDomainBoundaries(newBounds.getMin(), newBounds.getMax(), BoundaryMode.FIXED);
+            adjustDomainBoundary(newBounds.getMin(), newBounds.getMax(), BoundaryMode.FIXED);
         }
         if (EnumSet.of(Pan.VERTICAL, Pan.BOTH).contains(pan)) {
             Region newBounds = new Region();
             calculatePan(oldFirstFinger, newBounds, false);
-            plot.setRangeBoundaries(newBounds.getMin(), newBounds.getMax(), BoundaryMode.FIXED);
+            adjustRangeBoundary(newBounds.getMin(), newBounds.getMax(), BoundaryMode.FIXED);
         }
 
         plot.redraw();
@@ -291,10 +348,9 @@ protected void calculatePan(final PointF oldFirstFinger, Region bounds, final bo
     }
 
     protected boolean isValidScale(float scale) {
-        if (Float.isInfinite(scale) || Float.isNaN(scale) || scale > -0.001 && scale < 0.001) {
-            return false;
-        }
-        return true;
+        return !Float.isInfinite(scale)
+                && !Float.isNaN(scale)
+                && (!(scale > -0.001) || !(scale < 0.001));
     }
 
     protected void zoom(final MotionEvent motionEvent) {
@@ -349,14 +405,14 @@ protected void zoom(final MotionEvent motionEvent) {
                 Zoom.STRETCH_BOTH,
                 Zoom.SCALE).contains(zoom)) {
             calculateZoom(newRect, scaleX, true);
-            plot.setDomainBoundaries(newRect.left, newRect.right, BoundaryMode.FIXED);
+            adjustDomainBoundary(newRect.left, newRect.right, BoundaryMode.FIXED);
         }
         if (EnumSet.of(
                 Zoom.STRETCH_VERTICAL,
                 Zoom.STRETCH_BOTH,
                 Zoom.SCALE).contains(zoom)) {
             calculateZoom(newRect, scaleY, false);
-            plot.setRangeBoundaries(newRect.top, newRect.bottom, BoundaryMode.FIXED);
+            adjustRangeBoundary(newRect.top, newRect.bottom, BoundaryMode.FIXED);
         }
         plot.redraw();
     }
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
index 1ca3de77..22c551e9 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
@@ -847,7 +847,7 @@ protected void drawData(Canvas canvas) throws PlotRenderException {
         }
         try {
             if (isGridClippingEnabled) {
-                canvas.save(Canvas.ALL_SAVE_FLAG);
+                canvas.save();
                 canvas.clipRect(gridRect, android.graphics.Region.Op.INTERSECT);
             }
 
diff --git a/build.gradle b/build.gradle
index a7aa9c13..d45fb28b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,10 @@ allprojects {
 }
 
 ext {
-    theCompileSdkVersion = 26
-    theTargetSdkVersion = 26
+    theCompileSdkVersion = 28
+    theTargetSdkVersion = 28
     theMinSdkVersion = 5
-    theVersionName = '1.5.5'
+    theVersionName = '1.5.6'
     theVersionCode = 0
 }
 
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
index 6238e4df..46118949 100644
--- a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 AndroidPlot.com
+ * Copyright 2018 AndroidPlot.com
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.androidplot.ui.Insets;
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.CatmullRomInterpolator;
 import com.androidplot.xy.LineAndPointFormatter;
@@ -49,7 +48,7 @@ public void onCreate(Bundle savedInstanceState)
         setContentView(R.layout.simple_xy_plot_example);
 
         // initialize our XYPlot reference:
-        plot = (XYPlot) findViewById(R.id.plot);
+        plot = findViewById(R.id.plot);
 
         // create a couple arrays of y-values to plot:
         final Number[] domainLabels = {1, 2, 3, 6, 7, 8, 9, 10, 13, 14};
@@ -101,19 +100,5 @@ public Object parseObject(String source, @NonNull ParsePosition pos) {
                 return null;
             }
         });
-
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-                plot.getGraph().setGridInsets(new Insets(120, 120, 120, 120));
-                plot.redraw();
-            }
-        }).start();
     }
 }
diff --git a/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java b/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java
index c4105cde..dfae19d9 100644
--- a/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java
@@ -152,6 +152,7 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
 
+
         zoomSpinner.setAdapter(
                 new ArrayAdapter<>(this, R.layout.spinner_item, PanZoom.Zoom.values()));
         zoomSpinner.setSelection(panZoom.getZoom().ordinal());
@@ -167,5 +168,19 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
     }
+
+    // (optional) save the current pan/zoom state
+    @Override
+    public void onSaveInstanceState(Bundle bundle) {
+         bundle.putSerializable("pan-zoom-state", panZoom.getState());
+    }
+
+    // (optional) restore the previously saved pan/zoom state
+    @Override
+    public void onRestoreInstanceState(Bundle bundle) {
+        PanZoom.State state = (PanZoom.State) bundle.getSerializable("pan-zoom-state");
+        panZoom.setState(state);
+        plot.redraw();
+    }
 }
 
diff --git a/docs/quickstart.md b/docs/quickstart.md
index e6ae7ff5..ffc3827d 100644
--- 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 {
-    compile "com.androidplot:androidplot-core:1.5.5"
+    compile "com.androidplot:androidplot-core:1.5.6"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
index 762ac5a6..6bebeb8c 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -2,6 +2,11 @@
 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.6
+
+* Adds convenience methods for saving / restoring `PanZoom` state.
+* (#80) Targets SDK 28, fixing compatibility issues.
+
 # 1.5.5
 
 * (#76) Fixed a bug that could cause a deadlock when grid steps are much larger than actual plot range.
diff --git a/docs/xyplot.md b/docs/xyplot.md
index 2dab08db..99128178 100644
--- a/docs/xyplot.md
+++ b/docs/xyplot.md
@@ -217,6 +217,25 @@ then the plot will pan and zoom on both axes infinitely.  To set the plot's oute
 plot.getOuterLimits().set(0, 100, 0, 100);
 ```
 
+# Saving & Restoring PanZoom State
+The `PanZoom` class provides convenience methods for saving and restoring state from your `Activity`:
+
+```java
+// save the current pan/zoom state
+@Override
+public void onSaveInstanceState(Bundle bundle) {
+     bundle.putSerializable("pan-zoom-state", panZoom.getState());
+}
+
+// restore the previously saved pan/zoom state
+@Override
+public void onRestoreInstanceState(Bundle bundle) {
+    PanZoom.State state = (PanZoom.State) bundle.getSerializable("pan-zoom-state");
+    panZoom.setState(state);
+    plot.redraw();
+}
+```
+
 For a more detailed look at pan & zoom behavior, check out the [Touch Zoom Example source code](../demoapp/src/main/java/com/androidplot/demos/TouchZoomExampleActivity.java).
 
 # Series Renderers

From f04f2b945a579da20f1ec725bac3ab2a003b439b Mon Sep 17 00:00:00 2001
From: Chukwuemeka Nwagu <c_nwagu@yahoo.com>
Date: Mon, 10 Sep 2018 16:36:34 +0100
Subject: [PATCH 05/38] Update attrs.md (#85)

change rangeTitleColor to rangeTitleTextColor
---
 docs/attrs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/attrs.md b/docs/attrs.md
index 256852d7..afda917c 100644
--- a/docs/attrs.md
+++ b/docs/attrs.md
@@ -162,7 +162,7 @@ __boolean__
 ### rangeTitle
 __string__
 
-### rangeTitleColor
+### rangeTitleTextColor
 __color__
 
 ### rangeTitleTextSize

From ef6dd8b1bd48175cffafa20153ae54ac5842aef6 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 10 Sep 2018 10:37:48 -0500
Subject: [PATCH 06/38] uprev to 1.5.7

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d45fb28b..1e1d8c9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ ext {
     theCompileSdkVersion = 28
     theTargetSdkVersion = 28
     theMinSdkVersion = 5
-    theVersionName = '1.5.6'
+    theVersionName = '1.5.7'
     theVersionCode = 0
 }
 

From a4d350a3a0e228d1206507f708154cc1a262d721 Mon Sep 17 00:00:00 2001
From: Tim Hepner <tim@hepners.net>
Date: Fri, 21 Sep 2018 18:29:14 -0700
Subject: [PATCH 07/38] fix docs

---
 docs/custom_renderer.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/custom_renderer.md b/docs/custom_renderer.md
index e82f3ecf..73cac354 100644
--- a/docs/custom_renderer.md
+++ b/docs/custom_renderer.md
@@ -27,7 +27,7 @@ class RoundedBarFormatter extends BarFormatter {
 
     @Override
     public RoundedBarRenderer doGetRendererInstance(XYPlot xyPlot) {
-        return new RoundedBarRenderer(plot);
+        return new RoundedBarRenderer(xyPlot);
     }
 }
 ```
@@ -98,4 +98,4 @@ plot.addSeries(series2, new RoundedBarFormatter(Color.BLUE));
 
 Here's what this would look like used in the demo app's `SimpleXYPlotActivity`:
 
-![image](images/screens/rounded_bar_renderer.png)
\ No newline at end of file
+![image](images/screens/rounded_bar_renderer.png)

From c960518cf7b024eda576b41bb2dbf9f5acdcbaee Mon Sep 17 00:00:00 2001
From: Tim Hepner <tim@hepners.net>
Date: Sat, 22 Sep 2018 12:57:16 -0700
Subject: [PATCH 08/38] should be StepMode not BoundryMode

---
 docs/xyplot.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/xyplot.md b/docs/xyplot.md
index 99128178..ce7e1526 100644
--- a/docs/xyplot.md
+++ b/docs/xyplot.md
@@ -87,14 +87,14 @@ These are the horizontal lines drawn on a graph.  These lines are configured via
 Androidplot provides these step modes:
 
 ### Subdivide
-When using `BoundaryMode.SUBDIVIDE`, the graph is subdivided into the specified number of sections.
+When using `StepMode.SUBDIVIDE`, the graph is subdivided into the specified number of sections.
 
 ### IncrementByValue
-`BoundaryMode.INCREMENT_BY_VALUE` instructs Androidplot draw grid lines at the specified interval.  This
+`StepMode.INCREMENT_BY_VALUE` instructs Androidplot draw grid lines at the specified interval.  This
 is the most commonly used modes as is produces an easy to read result.
 
 ### IncrementByPixels
-`BoundaryMode.INCREMENT_BY_PIXELS` behaves identically to `BoundaryMode.INCREMENT_BY_VALUE` except that 
+`StepMode.INCREMENT_BY_PIXELS` behaves identically to `StepMode.INCREMENT_BY_VALUE` except that 
 the increment quantity is expressed in pixels.
 
 ## Domain & Range Labels

From 3e4c0bcc2b70848f5d02eac3d3c4eb09a05c5d09 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sat, 20 Jul 2019 11:36:28 -0500
Subject: [PATCH 09/38] v1.5.7 Changes (#95)

* adds convenience methods for saving and restoring pan / zoom state

* adds IN_ORDER mode to BarRenderer

* remove unused PlotRenderException

* valuemarkers now contain their own draw logic, making it easier to customize

* update project / dependencies

* #94 update createBitmap to use ARGB_8888 to address ARGB_4444 deprecation warning.  adds better error message on failure.

* #83 Perform a null check before recycling buffered canvas instances

* update app version / release notes
---
 .circleci/config.yml                          |    2 +-
 androidplot-core/build.gradle                 |   23 +-
 .../src/main/java/com/androidplot/Plot.java   | 2078 +++++++++--------
 .../exception/PlotRenderException.java        |   23 -
 .../java/com/androidplot/pie/PieRenderer.java |    3 +-
 .../java/com/androidplot/pie/PieWidget.java   |    3 +-
 .../com/androidplot/ui/LayoutManager.java     |    3 +-
 .../com/androidplot/ui/SeriesRenderer.java    |    7 +-
 .../androidplot/ui/widget/LegendWidget.java   |    5 +-
 .../com/androidplot/ui/widget/Widget.java     |    5 +-
 .../xy/AdvancedLineAndPointRenderer.java      |    3 +-
 .../java/com/androidplot/xy/BarRenderer.java  |   10 +-
 .../com/androidplot/xy/BubbleRenderer.java    |    3 +-
 .../xy/FastLineAndPointRenderer.java          |    3 +-
 .../com/androidplot/xy/GroupRenderer.java     |    3 +-
 .../androidplot/xy/LineAndPointRenderer.java  |    3 +-
 .../java/com/androidplot/xy/ValueMarker.java  |   39 +
 .../java/com/androidplot/xy/XValueMarker.java |   18 +
 .../com/androidplot/xy/XYGraphWidget.java     |   71 +-
 .../java/com/androidplot/xy/YValueMarker.java |   20 +
 .../test/java/com/androidplot/PlotTest.java   |   24 +-
 .../java/com/androidplot/test/TestUtils.java  |    6 +-
 .../com/androidplot/ui/widget/WidgetTest.java |   11 +-
 .../com/androidplot/xy/BarRendererTest.java   |   45 +-
 .../com/androidplot/xy/XYGraphWidgetTest.java |    5 +-
 build.gradle                                  |   11 +-
 demoapp/build.gradle                          |   10 +-
 docs/quickstart.md                            |    2 +-
 docs/release_notes.md                         |    9 +-
 gradle/wrapper/gradle-wrapper.properties      |    4 +-
 30 files changed, 1240 insertions(+), 1212 deletions(-)
 delete mode 100644 androidplot-core/src/main/java/com/androidplot/exception/PlotRenderException.java

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c5579475..f333b5c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
           key: v1-dependencies-{{ checksum "build.gradle" }}
 
       # run tests & code coc!
-      - run: ./gradlew testDebug jacocoTestReportDebug
+      - run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport
 
       # build release
       - run: ./gradlew assembleRelease
diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index a814a4c1..0592389b 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -17,8 +17,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
-apply plugin: 'com.vanniktech.android.junit.jacoco'
-apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'jacoco-android'
 
 class AttrMarkdown extends DefaultTask {
 
@@ -67,6 +66,14 @@ android {
         testApplicationId "com.androidplot.test"
     }
 
+    testOptions {
+        unitTests.all {
+            jacoco {
+                includeNoLocationClasses = true
+            }
+        }
+    }
+
     /**
      * TODO: enable and address lint issues.
      */
@@ -83,15 +90,15 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git'
 
 dependencies {
 
-    compile 'com.halfhp.fig:figlib:1.0.7'
-    compile 'com.android.support:support-annotations:27.0.2'
-    testCompile "org.mockito:mockito-core:1.10.19"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile "org.robolectric:robolectric:3.1"
+    implementation 'com.halfhp.fig:figlib:1.0.7'
+    implementation 'com.android.support:support-annotations:28.0.0'
+    testImplementation "org.mockito:mockito-core:2.13.0"
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation "org.robolectric:robolectric:4.0.1"
 
     // temp fix for:
     // https://github.com/robolectric/robolectric/issues/1932
-    testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+    testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }
 
 task javadoc(type: Javadoc) {
diff --git a/androidplot-core/src/main/java/com/androidplot/Plot.java b/androidplot-core/src/main/java/com/androidplot/Plot.java
index 5e009635..47ef0fd6 100644
--- a/androidplot-core/src/main/java/com/androidplot/Plot.java
+++ b/androidplot-core/src/main/java/com/androidplot/Plot.java
@@ -1,1034 +1,1044 @@
-/*
- * Copyright 2015 AndroidPlot.com
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.androidplot;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.RectF;
-import android.os.Build;
-import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-
-import com.androidplot.exception.PlotRenderException;
-import com.androidplot.ui.Anchor;
-import com.androidplot.ui.BoxModel;
-import com.androidplot.ui.Formatter;
-import com.androidplot.ui.HorizontalPositioning;
-import com.androidplot.ui.LayoutManager;
-import com.androidplot.ui.Resizable;
-import com.androidplot.ui.SeriesBundle;
-import com.androidplot.ui.SeriesRenderer;
-import com.androidplot.ui.Size;
-import com.androidplot.ui.SizeMode;
-import com.androidplot.ui.TextOrientation;
-import com.androidplot.ui.VerticalPositioning;
-import com.androidplot.ui.widget.TextLabelWidget;
-import com.androidplot.util.AttrUtils;
-import com.androidplot.util.DisplayDimensions;
-import com.androidplot.util.PixelUtils;
-import com.halfhp.fig.Fig;
-import com.halfhp.fig.FigException;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Base class for all Plot implementations.
- */
-public abstract class Plot<SeriesType extends Series, FormatterType extends Formatter,
-        RendererType extends SeriesRenderer, BundleType extends SeriesBundle<SeriesType, FormatterType>,
-        RegistryType extends SeriesRegistry<BundleType, SeriesType, FormatterType>>
-        extends View implements Resizable {
-    private static final String TAG = Plot.class.getName();
-    private static final String XML_ATTR_PREFIX      = "androidplot";
-    private static final String BASE_PACKAGE = "com.androidplot.";
-
-    private static final int DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP = 10;
-
-    public DisplayDimensions getDisplayDimensions() {
-        return displayDims;
-    }
-
-    /**
-     * Used for caching renderer instances.  Note that once a renderer is initialized it remains initialized
-     * for the life of the application; does not and should not be destroyed until the application exits.
-     */
-    public HashMap<Class<? extends RendererType>, RendererType> getRenderers() {
-        return renderers;
-    }
-
-    /**
-     * Associates lists series and getFormatter pairs with the class of the Renderer used to render them.
-     */
-    public RegistryType getRegistry() {
-        return registry;
-    }
-
-    public void setRegistry(RegistryType registry) {
-        this.registry = registry;
-        for(BundleType bundle : registry.getSeriesAndFormatterList()) {
-            attachSeries(bundle.getSeries(), bundle.getFormatter());
-        }
-    }
-
-    /**
-     *
-     * @return A new instance of RegistryType
-     */
-    protected abstract RegistryType getRegistryInstance();
-
-    public TextLabelWidget getTitle() {
-        return title;
-    }
-
-    public void setTitle(TextLabelWidget title) {
-        this.title = title;
-    }
-
-    public void setTitle(String title) {
-        getTitle().setText(title);
-    }
-
-    public enum BorderStyle {
-        ROUNDED,
-        SQUARE,
-        NONE
-    }
-
-    /**
-     * The RenderMode used by a Plot to draw it's self onto the screen.  The RenderMode can be set
-     * in two ways.
-     *
-     * In an xml layout:
-     *
-     * <code>
-     * <com.androidplot.xy.XYPlot
-     * android:id="@+id/mySimpleXYPlot"
-     * android:layout_width="fill_parent"
-     * android:layout_height="fill_parent"
-     * title="@string/sxy_title"
-     * renderMode="useBackgroundThread"/>
-     * </code>
-     *
-     * Programatically:
-     *
-     * <code>
-     * XYPlot myPlot = new XYPlot(context "MyPlot", Plot.RenderMode.USE_MAIN_THREAD);
-     * </code>
-     *
-     * A Plot's  RenderMode cannot be changed after the plot has been initialized.
-     * @since 0.5.1
-     */
-    public enum RenderMode {
-        /**
-         * Use a second thread and an off-screen buffer to do drawing.  This is the preferred method
-         * of drawing dynamic data and static data that consists of a large number of points.  This mode
-         * provides more efficient CPU utilization at the cost of increased memory usage.  As of
-         * version 0.5.1 this is the default RenderMode.
-         *
-         * XML value: use_background_thread
-         * @since 0.5.1
-         */
-        USE_BACKGROUND_THREAD,
-
-        /**
-         * Do everything in the primary thread.  This is the preferred method of drawing static charts
-         * and dynamic data that consists of a small number of points. This mode uses less memory at
-         * the cost of poor CPU utilization.
-         *
-         * XML value: use_main_thread
-         * @since 0.5.1
-         */
-        USE_MAIN_THREAD
-    }
-    private BoxModel boxModel = new BoxModel();
-
-    // no border by default:
-    private BorderStyle borderStyle = Plot.BorderStyle.NONE;
-    private float borderRadiusX = 15;
-    private float borderRadiusY = 15;
-    private Paint borderPaint;
-    private Paint backgroundPaint;
-    private LayoutManager layoutManager;
-    private TextLabelWidget title;
-    private DisplayDimensions displayDims = new DisplayDimensions();
-    private RenderMode renderMode = RenderMode.USE_MAIN_THREAD;
-    private final BufferedCanvas pingPong = new BufferedCanvas();
-
-    // used to get rid of flickering when drawing offScreenBitmap to the visible Canvas.
-    private final Object renderSync = new Object();
-
-    private HashMap<Class<? extends RendererType>, RendererType> renderers;
-
-    private RegistryType registry;
-    private final ArrayList<PlotListener> listeners;
-
-    private Thread renderThread;
-    private boolean keepRunning = false;
-    private boolean isIdle = true;
-
-    {
-        listeners = new ArrayList<>();
-        registry = getRegistryInstance();
-        renderers = new HashMap<>();
-
-        borderPaint = new Paint();
-        borderPaint.setColor(Color.rgb(150, 150, 150));
-        borderPaint.setStyle(Paint.Style.STROKE);
-        borderPaint.setStrokeWidth(1.0f);
-        borderPaint.setAntiAlias(true);
-        backgroundPaint = new Paint();
-        backgroundPaint.setColor(Color.DKGRAY);
-        backgroundPaint.setStyle(Paint.Style.FILL);
-    }
-
-
-    /**
-     *  Any rendering that utilizes a buffer from this class should synchronize rendering on the instance of this class
-     *  that is being used.
-     */
-    private static class BufferedCanvas {
-        private volatile Bitmap bgBuffer;  // all drawing is done on this buffer.
-        private volatile Bitmap fgBuffer;
-        private Canvas canvas = new Canvas();
-
-        /**
-         * Call this method once drawing on a Canvas retrieved by {@link #getCanvas()} to mark
-         * the buffer as fully rendered.  Failure to call this method will result in nothing being drawn.
-         */
-        public synchronized void swap() {
-            Bitmap tmp = bgBuffer;
-            bgBuffer = fgBuffer;
-            fgBuffer = tmp;
-        }
-
-        public synchronized void resize(int h, int w) {
-            if (w <= 0 || h <= 0) {
-                bgBuffer = null;
-                fgBuffer = null;
-            } else {
-                bgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_4444);
-                fgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_4444);
-            }
-        }
-
-        public void recycle() {
-            bgBuffer.recycle();
-            bgBuffer = null;
-
-            fgBuffer.recycle();
-            fgBuffer = null;
-            System.gc();
-        }
-
-        /**
-         * Get a Canvas for drawing.  Actual drawing should be synchronized on the instance
-         * of BufferedCanvas being used.
-         * @return The Canvas instance to draw onto.  Returns null if drawing buffers have not
-         *         been initialized a la {@link #resize(int, int)}.
-         */
-        public synchronized Canvas getCanvas() {
-            if(bgBuffer != null) {
-                canvas.setBitmap(bgBuffer);
-                return canvas;
-            } else {
-                return null;
-            }
-        }
-
-        /**
-         * @return The most recent fully rendered Bitmsp
-         */
-        public Bitmap getBitmap() {
-            return fgBuffer;
-        }
-    }
-
-    /**
-     * Convenience constructor - wraps {@link #Plot(android.content.Context, String, com.androidplot.Plot.RenderMode)}.
-     * RenderMode is set to {@link RenderMode#USE_BACKGROUND_THREAD}.
-     * @param context
-     * @param title The display title of this Plot.
-     */
-    public Plot(Context context, String title) {
-        this(context, title, RenderMode.USE_MAIN_THREAD);
-    }
-
-    /**
-     * Used for programmatic instantiation.
-     * @param context
-     * @param title The display title of this Plot.
-     */
-    public Plot(Context context, String title, RenderMode mode) {
-        super(context);
-        this.renderMode = mode;
-        init(context, null, 0);
-        getTitle().setText(title);
-    }
-
-
-    /**
-     * Required by super-class. Extending class' implementations should add
-     * the following code immediately before exiting to ensure that loadAttrs
-     * is called only once by the derived class:
-     * <code>
-     * if(getClass().equals(DerivedPlot.class) {
-     *     loadAttrs(context, attrs);
-     * }
-     * </code>
-     *
-     * See {@link com.androidplot.xy.XYPlot#XYPlot(android.content.Context, android.util.AttributeSet)}
-     * for an example.
-     * @param context
-     * @param attrs
-     */
-    public Plot(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs, 0);
-    }
-
-    /**
-     * Required by super-class. Extending class' implementations should add
-     * the following code immediately before exiting to ensure that loadAttrs
-     * is called only once by the derived class:
-     * <code>
-     * if(getClass().equals(DerivedPlot.class) {
-     *     loadAttrs(context, attrs);
-     * }
-     * </code>
-     *
-     * See {@link com.androidplot.xy.XYPlot#XYPlot(android.content.Context, android.util.AttributeSet, int)}
-     * for an example.
-     * @param context
-     * @param attrs
-     * @param defStyle
-     */
-    public Plot(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(context, attrs, defStyle);
-    }
-
-    /**
-     * Can be overridden by derived classes to control hardware acceleration state.
-     * Note that this setting is only used on Honeycomb and later environments.
-     * @return True if hardware acceleration is allowed, false otherwise.
-     * @since 0.5.1
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    protected boolean isHwAccelerationSupported() {
-        return false;
-    }
-
-    /**
-     * Sets the render mode used by the Plot.
-     * WARNING: This method is not currently designed for general use outside of Configurator.
-     * Attempting to reassign the render mode at runtime will result in unexpected behavior.
-     * @param mode
-     */
-    public void setRenderMode(RenderMode mode) {
-        this.renderMode = mode;
-    }
-
-    /**
-     * Concrete implementations may do any final setup / initialization
-     * here.  Immediately following this method's invocation, AndroidPlot assumes
-     * that the Plot instance is ready for final configuration via the Configurator.
-     */
-    protected void onPreInit() {
-        // nothing to do by default
-    }
-
-    /**
-     * Invoked immediately following configurator / styleable attr application.
-     */
-    protected void onAfterConfig() {
-        // nothing to do by default
-    }
-
-    protected final void init(Context context, AttributeSet attrs, int defStyle) {
-        PixelUtils.init(context);
-        layoutManager = new LayoutManager();
-        title = new TextLabelWidget(layoutManager, new Size(25,
-                SizeMode.ABSOLUTE, 100,
-                SizeMode.ABSOLUTE),
-                TextOrientation.HORIZONTAL);
-        title.position(0, HorizontalPositioning.RELATIVE_TO_CENTER, 0,
-                VerticalPositioning.ABSOLUTE_FROM_TOP, Anchor.TOP_MIDDLE);
-
-        // initialize attr defaults:
-        title.getLabelPaint().setTextSize(
-                PixelUtils.spToPix(DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP));
-
-        onPreInit();
-        // make sure the title widget is always the topmost widget:
-        layoutManager.moveToTop(title);
-        if(context != null && attrs != null) {
-            loadAttrs(attrs, defStyle);
-        }
-
-        onAfterConfig();
-
-        layoutManager.onPostInit();
-        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
-            renderThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-
-                    keepRunning = true;
-                    while (keepRunning) {
-                        isIdle = false;
-                        synchronized (pingPong) {
-                            Canvas c = pingPong.getCanvas();
-                            renderOnCanvas(c);
-                            pingPong.swap();
-                        }
-                        synchronized (renderSync) {
-                            postInvalidate();
-                            // prevent this thread from becoming an orphan
-                            // after the view is destroyed
-                            if (keepRunning) {
-                                try {
-                                    renderSync.wait();
-                                } catch (InterruptedException e) {
-                                    keepRunning = false;
-                                }
-                            }
-                        }
-                    }
-                    pingPong.recycle();
-                }
-            }, "Androidplot renderThread");
-        }
-    }
-
-    /**
-     * If a styleable is available for the derived class, this method will be invoked with those attrs.
-     * The derived implementation is only responsible for setting derived class attributes, ie. it should
-     * not attempt to apply the Plot.title styleable attribute etc.  Do not invoke recycle() on attrs.
-     * @param attrs Attrs for the derived class.
-     */
-    protected abstract void processAttrs(TypedArray attrs);
-
-    /**
-     * Apply base class attrs.
-     * @param attrs
-     */
-    private void processBaseAttrs(TypedArray attrs) {
-
-        // markup mode
-        boolean markupEnabled = attrs.getBoolean(R.styleable.Plot_markupEnabled, false);
-        setMarkupEnabled(markupEnabled);
-
-        // renderMode
-        RenderMode renderMode = RenderMode.values()
-                [attrs.getInt(R.styleable.Plot_renderMode, getRenderMode().ordinal())];
-        if(renderMode != getRenderMode()) {
-            setRenderMode(renderMode);
-        }
-
-        // margins & padding
-        AttrUtils.configureBoxModelable(attrs, boxModel, R.styleable.Plot_marginTop, R.styleable.Plot_marginBottom,
-                R.styleable.Plot_marginLeft, R.styleable.Plot_marginRight, R.styleable.Plot_paddingTop,
-                R.styleable.Plot_paddingBottom, R.styleable.Plot_paddingLeft, R.styleable.Plot_paddingRight);
-
-        // title
-        getTitle().setText(attrs.getString(R.styleable.Plot_title));
-        getTitle().getLabelPaint().setTextSize(
-                attrs.getDimension(R.styleable.Plot_titleTextSize,
-                        PixelUtils.spToPix(DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP)));
-
-        getTitle().getLabelPaint().setColor(attrs.getColor(
-                R.styleable.Plot_titleTextColor, getTitle().getLabelPaint().getColor()));
-
-        getBackgroundPaint().setColor(
-                attrs.getColor(R.styleable.Plot_backgroundColor, getBackgroundPaint().getColor()));
-
-        AttrUtils.configureLinePaint(attrs, getBorderPaint(),
-                R.styleable.Plot_borderColor, R.styleable.Plot_borderThickness);
-    }
-
-    /**
-     * Parse XML Attributes.  Should only be called once and at the end of the base class constructor.
-     * The first-pass attempts to locate styleable attributes and apply those first.  After that,
-     * configurator-style attributes are applied, overriding any styleable attrs that may have
-     * been previously applied.
-     *
-     * @param attrs
-     */
-    private void loadAttrs(AttributeSet attrs, int defStyle) {
-
-        if (attrs != null) {
-
-            Field styleableFieldInR = null;
-            TypedArray typedAttrs = null;
-            
-            Class styleableClass = R.styleable.class;
-            String styleableName = getClass().getName().substring(BASE_PACKAGE.length());
-            styleableName = styleableName.replace('.', '_');
-            try {
-                /**
-                 * Use reflection to safely run for the existence of styleable defs for Plot
-                 * and it's derivatives.  This safety run is necessary to avoid runtime exceptions
-                 * in apps that don't include Androidplot as a .aar and won't have access to
-                 * the resources defined in the core library.
-                 */
-                styleableFieldInR = styleableClass.getField(styleableName);
-            } catch (NoSuchFieldException e) {
-                Log.d(TAG, "Styleable definition not found for: " + styleableName);
-            }
-            if (styleableFieldInR != null) {
-                try {
-                    int[] resIds = (int[]) styleableFieldInR.get(null);
-                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
-                } catch (IllegalAccessException e) {
-                    // nothing to do
-                } finally {
-                    if (typedAttrs != null) {
-                        // apply derived class' attrs:
-                        processAttrs(typedAttrs);
-                        typedAttrs.recycle();
-                    }
-                }
-            }
-
-            try {
-                styleableFieldInR = styleableClass.getField(Plot.class.getSimpleName());
-                if (styleableFieldInR != null) {
-                    int[] resIds = (int[]) styleableFieldInR.get(null);
-                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
-                }
-            } catch (IllegalAccessException e) {
-                // nothing to do
-            } catch (NoSuchFieldException e) {
-                Log.d(TAG, "Styleable definition not found for: " + Plot.class.getSimpleName());
-            } finally {
-                if (typedAttrs != null) {
-                    // apply base attrs:
-                    processBaseAttrs(typedAttrs);
-                    typedAttrs.recycle();
-                }
-            }
-
-            // apply "configurator" attrs: (overrides any previously applied styleable attrs)
-            // filter out androidplot prefixed attrs:
-            HashMap<String, String> attrHash = new HashMap<>();
-            for (int i = 0; i < attrs.getAttributeCount(); i++) {
-                String attrName = attrs.getAttributeName(i);
-
-                // case insensitive run to see if this attr begins with our prefix:
-                if (attrName != null && attrName.toUpperCase().startsWith(XML_ATTR_PREFIX.toUpperCase())) {
-                    attrHash.put(attrName.substring(XML_ATTR_PREFIX.length() + 1), attrs.getAttributeValue(i));
-                }
-            }
-            try {
-                Fig.configure(getContext(), this, attrHash);
-            } catch (FigException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public RenderMode getRenderMode() {
-        return renderMode;
-    }
-
-    public synchronized boolean addListener(PlotListener listener) {
-        return !listeners.contains(listener) && listeners.add(listener);
-    }
-
-    public synchronized boolean removeListener(PlotListener listener) {
-        return listeners.remove(listener);
-    }
-
-    protected ArrayList<PlotListener> getListeners() {
-        return listeners;
-    }
-
-    protected void notifyListenersBeforeDraw(Canvas canvas) {
-        for (PlotListener listener : listeners) {
-            listener.onBeforeDraw(this, canvas);
-        }
-    }
-
-    protected void notifyListenersAfterDraw(Canvas canvas) {
-        for (PlotListener listener : listeners) {
-            listener.onAfterDraw(this, canvas);
-        }
-    }
-
-    /**
-     * Convenience method to add a multiple series at once using the same formatter.
-     * If a problem is encountered, the method immediately returns false and the plot
-     * will contain whatever series were added before the failure.
-     * @param formatter
-     * @param series
-     * @return True if all series were successfully added, false otherwise.
-     * @since 0.9.7
-     */
-    public synchronized boolean addSeries(FormatterType formatter, SeriesType... series) {
-        for(SeriesType s : series) {
-            if(!addSeries(s, formatter)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Add a new Series to the Plot.
-     * @param series
-     * @param formatter
-     * @return True if the series was added or false if the series / formatter pair already exists in the registry.
-     */
-    public synchronized boolean addSeries(SeriesType series, FormatterType formatter) {
-        final boolean result = getRegistry().add(series, formatter);
-        attachSeries(series, formatter);
-        return result;
-    }
-
-    protected void attachSeries(SeriesType series, FormatterType formatter) {
-
-        Class rendererClass = formatter.getRendererClass();
-
-        // initialize the Renderer if necessary:
-        if(!getRenderers().containsKey(rendererClass)) {
-            getRenderers().put(rendererClass, (RendererType) formatter.getRendererInstance(this));
-        }
-
-        // if this series implements PlotListener, add it as a listener:
-        if(series instanceof PlotListener) {
-            addListener((PlotListener)series);
-        }
-    }
-
-    /**
-     *
-     * @param series
-     * @param rendererClass
-     * @return The {@link SeriesBundle} that matches the series and rendererClass params, or null if one is not found.
-     */
-    protected SeriesBundle<SeriesType, FormatterType> getSeries(SeriesType series, Class<? extends RendererType> rendererClass) {
-        for(SeriesBundle<SeriesType, FormatterType> thisPair : getSeries(series)) {
-            if(thisPair.getFormatter().getRendererClass() == rendererClass) {
-                return thisPair;
-            }
-        }
-        return null;
-    }
-
-    /**
-     *
-     * @param series
-     * @return A List of {@link SeriesBundle} instances that reference series.
-     */
-    protected List<SeriesBundle<SeriesType, FormatterType>> getSeries(SeriesType series) {
-        return getRegistry().get(series);
-    }
-
-    /**
-     *
-     * Remove a series for a specific Renderer only.  Use {@link #removeSeries(Series)} to remove the series
-     * from the plot completely.
-     * @param series
-     * @param rendererClass
-     * @return True if anything was removed, false otherwise
-     */
-    public synchronized boolean removeSeries(SeriesType series, Class<? extends RendererType> rendererClass) {
-
-        List removedItems = getRegistry().remove(series, rendererClass);
-
-        // if series implements PlotListener and is not assigned to any other renderers remove it as a listener:
-        if (removedItems.size() == 1 && series instanceof PlotListener) {
-            removeListener((PlotListener) series);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Remove all occurrences of series regardless of the associated Renderer.
-     * @param series
-     */
-    public synchronized void removeSeries(SeriesType series) {
-        // if series implements PlotListener, remove it from listeners:
-        if (series instanceof PlotListener) {
-            removeListener((PlotListener) series);
-        }
-
-        getRegistry().remove(series);
-    }
-
-    /**
-     * Remove all series from the plot.
-     */
-    public void clear() {
-        for(SeriesType series : getRegistry().getSeriesList()) {
-            if(series instanceof  PlotListener) {
-                removeListener((PlotListener) series);
-            }
-        }
-        getRegistry().clear();
-    }
-
-    public boolean isEmpty() {
-        return getRegistry().isEmpty();
-    }
-
-    /**
-     *
-     * @param series
-     * @param rendererClass
-     * @return The Formatter instance corresponding to the specified  series / renderer pair.
-     */
-    public FormatterType getFormatter(SeriesType series, Class<? extends RendererType> rendererClass) {
-        return getSeries(series, rendererClass).getFormatter();
-    }
-
-    public <T extends RendererType> T getRenderer(Class<T> rendererClass) {
-        return (T) getRenderers().get(rendererClass);
-    }
-
-    public List<RendererType> getRendererList() {
-        return new ArrayList<>(getRenderers().values());
-    }
-
-    public void setMarkupEnabled(boolean enabled) {
-        this.layoutManager.setMarkupEnabled(enabled);
-    }
-
-    /**
-     * Causes the plot to be redrawn.
-     * @since 0.5.1
-     */
-    public void redraw() {
-
-        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
-
-            // only enter synchronized block if the call is expected to block OR
-            // if the render thread is idle, so we know that we won't have to wait to
-            // obtain a lock.
-            if (isIdle) {
-                synchronized (renderSync) {
-                    renderSync.notify();
-                }
-            }
-        } else if(renderMode == RenderMode.USE_MAIN_THREAD) {
-
-            // are we on the UI thread?
-            if (Looper.myLooper() == Looper.getMainLooper()) {
-                invalidate();
-            } else {
-                postInvalidate();
-            }
-        } else {
-            throw new IllegalArgumentException("Unsupported Render Mode: " + renderMode);
-        }
-    }
-
-    @Override
-    public synchronized void layout(final DisplayDimensions dims) {
-        this.displayDims = dims;
-        layoutManager.layout(displayDims);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        synchronized(renderSync) {
-            keepRunning = false;
-            renderSync.notify();
-        }
-    }
-
-
-    @Override
-    protected synchronized void onSizeChanged (int w, int h, int oldw, int oldh) {
-
-        // update pixel conversion values
-        PixelUtils.init(getContext());
-
-        // disable hardware acceleration if it's not explicitly supported
-        // by the current Plot implementation. this run only applies to
-        // honeycomb and later environments.
-        if (Build.VERSION.SDK_INT >= 11) {
-            if (!isHwAccelerationSupported() && isHardwareAccelerated()) {
-                setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-            }
-        }
-
-        // pingPong is only used in background rendering mode.
-        if(renderMode == RenderMode.USE_BACKGROUND_THREAD) {
-            pingPong.resize(h, w);
-        }
-
-        RectF cRect = new RectF(0, 0, w, h);
-        RectF mRect = boxModel.getMarginatedRect(cRect);
-        RectF pRect = boxModel.getPaddedRect(mRect);
-
-        layout(new DisplayDimensions(cRect, mRect, pRect));
-        super.onSizeChanged(w, h, oldw, oldh);
-        if(renderThread != null && !renderThread.isAlive()) {
-            renderThread.start();
-        }
-    }
-
-    /**
-     * Called whenever the plot needs to be drawn via the Handler, which invokes invalidate().
-     * Should never be called directly; use {@link #redraw()} instead.
-     * @param canvas
-     */
-    @Override
-    protected void onDraw(Canvas canvas) {
-        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
-            synchronized(pingPong) {
-                Bitmap bmp = pingPong.getBitmap();
-                if(bmp != null) {
-                    canvas.drawBitmap(bmp, 0, 0, null);
-                }
-            }
-        } else if (renderMode == RenderMode.USE_MAIN_THREAD) {
-            renderOnCanvas(canvas);
-        } else {
-            throw new IllegalArgumentException("Unsupported Render Mode: " + renderMode);
-        }
-    }
-
-    /**
-     * Renders the plot onto a canvas.  Used by both main thread to draw directly
-     * onto the View's canvas as well as by background draw to render onto a
-     * Bitmap buffer.  At the end of the day this is the main entry for a plot's
-     * "heavy lifting".
-     * @param canvas
-     */
-    protected synchronized void renderOnCanvas(@Nullable Canvas canvas) {
-        if(canvas == null) {
-            return;
-        }
-        try {
-            // any series interested in synchronizing with plot should
-            // implement PlotListener.onBeforeDraw(...) and do a read lock from within its
-            // invocation.  This is the entry point into that call:
-            notifyListenersBeforeDraw(canvas);
-            try {
-                // need to completely erase what was on the canvas before redrawing, otherwise
-                // some odd aliasing artifacts begin to build up around the edges of aa'd entities
-                // over time.
-                canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                if (backgroundPaint != null) {
-                    drawBackground(canvas, displayDims.marginatedRect);
-                }
-
-                layoutManager.draw(canvas);
-
-                if (getBorderPaint() != null) {
-                    drawBorder(canvas, displayDims.marginatedRect);
-                }
-            } catch (PlotRenderException e) {
-                Log.e(TAG, "Exception while rendering Plot.", e);
-            } catch (Exception e) {
-                Log.e(TAG, "Exception while rendering Plot.", e);
-            }
-
-            isIdle = true;
-            // any series interested in synchronizing with plot should
-            // implement PlotListener.onAfterDraw(...) and do a read unlock from within that
-            // invocation. This is the entry point for that invocation.
-            notifyListenersAfterDraw(canvas);
-        } finally {
-        }
-    }
-
-
-    /**
-     * Sets the visual style of the plot's border.
-     * @param style
-     * @param radiusX Sets the X radius for BorderStyle.ROUNDED.  Use null for all other styles.
-     * @param radiusY Sets the Y radius for BorderStyle.ROUNDED.  Use null for all other styles.
-     */
-    public void setBorderStyle(BorderStyle style, Float radiusX, Float radiusY) {
-        if (style == Plot.BorderStyle.ROUNDED) {
-            if (radiusX == null || radiusY == null){
-                throw new IllegalArgumentException("radiusX and radiusY cannot be null when using BorderStyle.ROUNDED");
-            }
-            this.borderRadiusX = radiusX;
-            this.borderRadiusY = radiusY;
-        }
-        this.borderStyle = style;
-    }
-
-    /**
-     * Draws the plot's outer border.
-     * @param canvas
-     * @throws PlotRenderException
-     */
-    protected void drawBorder(Canvas canvas, RectF dims) {
-        drawRect(canvas, dims, borderPaint);
-    }
-
-    protected void drawBackground(Canvas canvas, RectF dims) {
-        drawRect(canvas, dims, backgroundPaint);
-    }
-
-    protected void drawRect(Canvas canvas, RectF dims, Paint paint) {
-        switch (borderStyle) {
-            case ROUNDED:
-                canvas.drawRoundRect(dims, borderRadiusX, borderRadiusY, paint);
-                break;
-            case SQUARE:
-            default:
-                canvas.drawRect(dims, paint);
-                break;
-        }
-    }
-
-    public LayoutManager getLayoutManager() {
-        return layoutManager;
-    }
-
-    public void setLayoutManager(LayoutManager layoutManager) {
-        this.layoutManager = layoutManager;
-    }
-
-    public Paint getBackgroundPaint() {
-        return backgroundPaint;
-    }
-
-    public void setBackgroundPaint(Paint backgroundPaint) {
-        this.backgroundPaint = backgroundPaint;
-    }
-
-    /**
-     * Convenience method - wraps the individual setMarginXXX methods into a single method.
-     * @param left
-     * @param top
-     * @param right
-     * @param bottom
-     */
-    public void setPlotMargins(float left, float top, float right, float bottom) {
-        setPlotMarginLeft(left);
-        setPlotMarginTop(top);
-        setPlotMarginRight(right);
-        setPlotMarginBottom(bottom);
-    }
-
-    /**
-     * Convenience method - wraps the individual setPaddingXXX methods into a single method.
-     * @param left
-     * @param top
-     * @param right
-     * @param bottom
-     */
-    public void setPlotPadding(float left, float top, float right, float bottom) {
-        setPlotPaddingLeft(left);
-        setPlotPaddingTop(top);
-        setPlotPaddingRight(right);
-        setPlotPaddingBottom(bottom);
-    }
-
-    public float getPlotMarginTop() {
-        return boxModel.getMarginTop();
-    }
-
-    public void setPlotMarginTop(float plotMarginTop) {
-        boxModel.setMarginTop(plotMarginTop);
-    }
-
-    public float getPlotMarginBottom() {
-        return boxModel.getMarginBottom();
-    }
-
-    public void setPlotMarginBottom(float plotMarginBottom) {
-        boxModel.setMarginBottom(plotMarginBottom);
-    }
-
-    public float getPlotMarginLeft() {
-        return boxModel.getMarginLeft();
-    }
-
-    public void setPlotMarginLeft(float plotMarginLeft) {
-        boxModel.setMarginLeft(plotMarginLeft);
-    }
-
-    public float getPlotMarginRight() {
-        return boxModel.getMarginRight();
-    }
-
-    public void setPlotMarginRight(float plotMarginRight) {
-        boxModel.setMarginRight(plotMarginRight);
-    }
-
-    public float getPlotPaddingTop() {
-        return boxModel.getPaddingTop();
-    }
-
-    public void setPlotPaddingTop(float plotPaddingTop) {
-        boxModel.setPaddingTop(plotPaddingTop);
-    }
-
-    public float getPlotPaddingBottom() {
-        return boxModel.getPaddingBottom();
-    }
-
-    public void setPlotPaddingBottom(float plotPaddingBottom) {
-        boxModel.setPaddingBottom(plotPaddingBottom);
-    }
-
-    public float getPlotPaddingLeft() {
-        return boxModel.getPaddingLeft();
-    }
-
-    public void setPlotPaddingLeft(float plotPaddingLeft) {
-        boxModel.setPaddingLeft(plotPaddingLeft);
-    }
-
-    public float getPlotPaddingRight() {
-        return boxModel.getPaddingRight();
-    }
-
-    public void setPlotPaddingRight(float plotPaddingRight) {
-        boxModel.setPaddingRight(plotPaddingRight);
-    }
-
-    public Paint getBorderPaint() {
-        return borderPaint;
-    }
-
-    /**
-     * Set's the paint used to draw the border.  Note that this method
-     * copies borderPaint and set's the copy's Paint.Style attribute to
-     * Paint.Style.STROKE.
-     * @param borderPaint
-     */
-    public void setBorderPaint(Paint borderPaint) {
-        if(borderPaint == null) {
-            this.borderPaint = null;
-        } else {
-            this.borderPaint = new Paint(borderPaint);
-            this.borderPaint.setStyle(Paint.Style.STROKE);
-        }
-    }
-}
+/*
+ * Copyright 2015 AndroidPlot.com
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package com.androidplot;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.RectF;
+import android.os.Build;
+import android.os.Looper;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import com.androidplot.ui.Anchor;
+import com.androidplot.ui.BoxModel;
+import com.androidplot.ui.Formatter;
+import com.androidplot.ui.HorizontalPositioning;
+import com.androidplot.ui.LayoutManager;
+import com.androidplot.ui.Resizable;
+import com.androidplot.ui.SeriesBundle;
+import com.androidplot.ui.SeriesRenderer;
+import com.androidplot.ui.Size;
+import com.androidplot.ui.SizeMode;
+import com.androidplot.ui.TextOrientation;
+import com.androidplot.ui.VerticalPositioning;
+import com.androidplot.ui.widget.TextLabelWidget;
+import com.androidplot.util.AttrUtils;
+import com.androidplot.util.DisplayDimensions;
+import com.androidplot.util.PixelUtils;
+import com.halfhp.fig.Fig;
+import com.halfhp.fig.FigException;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Base class for all Plot implementations.
+ */
+public abstract class Plot<SeriesType extends Series, FormatterType extends Formatter,
+        RendererType extends SeriesRenderer, BundleType extends SeriesBundle<SeriesType, FormatterType>,
+        RegistryType extends SeriesRegistry<BundleType, SeriesType, FormatterType>>
+        extends View implements Resizable {
+    private static final String TAG = Plot.class.getName();
+    private static final String XML_ATTR_PREFIX      = "androidplot";
+    private static final String BASE_PACKAGE = "com.androidplot.";
+
+    private static final int DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP = 10;
+
+    public DisplayDimensions getDisplayDimensions() {
+        return displayDims;
+    }
+
+    /**
+     * Used for caching renderer instances.  Note that once a renderer is initialized it remains initialized
+     * for the life of the application; does not and should not be destroyed until the application exits.
+     */
+    public HashMap<Class<? extends RendererType>, RendererType> getRenderers() {
+        return renderers;
+    }
+
+    /**
+     * Associates lists series and getFormatter pairs with the class of the Renderer used to render them.
+     */
+    public RegistryType getRegistry() {
+        return registry;
+    }
+
+    public void setRegistry(RegistryType registry) {
+        this.registry = registry;
+        for(BundleType bundle : registry.getSeriesAndFormatterList()) {
+            attachSeries(bundle.getSeries(), bundle.getFormatter());
+        }
+    }
+
+    /**
+     *
+     * @return A new instance of RegistryType
+     */
+    protected abstract RegistryType getRegistryInstance();
+
+    public TextLabelWidget getTitle() {
+        return title;
+    }
+
+    public void setTitle(TextLabelWidget title) {
+        this.title = title;
+    }
+
+    public void setTitle(String title) {
+        getTitle().setText(title);
+    }
+
+    public enum BorderStyle {
+        ROUNDED,
+        SQUARE,
+        NONE
+    }
+
+    /**
+     * The RenderMode used by a Plot to draw it's self onto the screen.  The RenderMode can be set
+     * in two ways.
+     *
+     * In an xml layout:
+     *
+     * <code>
+     * <com.androidplot.xy.XYPlot
+     * android:id="@+id/mySimpleXYPlot"
+     * android:layout_width="fill_parent"
+     * android:layout_height="fill_parent"
+     * title="@string/sxy_title"
+     * renderMode="useBackgroundThread"/>
+     * </code>
+     *
+     * Programatically:
+     *
+     * <code>
+     * XYPlot myPlot = new XYPlot(context "MyPlot", Plot.RenderMode.USE_MAIN_THREAD);
+     * </code>
+     *
+     * A Plot's  RenderMode cannot be changed after the plot has been initialized.
+     * @since 0.5.1
+     */
+    public enum RenderMode {
+        /**
+         * Use a second thread and an off-screen buffer to do drawing.  This is the preferred method
+         * of drawing dynamic data and static data that consists of a large number of points.  This mode
+         * provides more efficient CPU utilization at the cost of increased memory usage.  As of
+         * version 0.5.1 this is the default RenderMode.
+         *
+         * XML value: use_background_thread
+         * @since 0.5.1
+         */
+        USE_BACKGROUND_THREAD,
+
+        /**
+         * Do everything in the primary thread.  This is the preferred method of drawing static charts
+         * and dynamic data that consists of a small number of points. This mode uses less memory at
+         * the cost of poor CPU utilization.
+         *
+         * XML value: use_main_thread
+         * @since 0.5.1
+         */
+        USE_MAIN_THREAD
+    }
+    private BoxModel boxModel = new BoxModel();
+
+    // no border by default:
+    private BorderStyle borderStyle = Plot.BorderStyle.NONE;
+    private float borderRadiusX = 15;
+    private float borderRadiusY = 15;
+    private Paint borderPaint;
+    private Paint backgroundPaint;
+    private LayoutManager layoutManager;
+    private TextLabelWidget title;
+    private DisplayDimensions displayDims = new DisplayDimensions();
+    private RenderMode renderMode = RenderMode.USE_MAIN_THREAD;
+    private final BufferedCanvas pingPong = new BufferedCanvas();
+
+    // used to get rid of flickering when drawing offScreenBitmap to the visible Canvas.
+    private final Object renderSync = new Object();
+
+    private HashMap<Class<? extends RendererType>, RendererType> renderers;
+
+    private RegistryType registry;
+    private final ArrayList<PlotListener> listeners;
+
+    private Thread renderThread;
+    private boolean keepRunning = false;
+    private boolean isIdle = true;
+
+    {
+        listeners = new ArrayList<>();
+        registry = getRegistryInstance();
+        renderers = new HashMap<>();
+
+        borderPaint = new Paint();
+        borderPaint.setColor(Color.rgb(150, 150, 150));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(1.0f);
+        borderPaint.setAntiAlias(true);
+        backgroundPaint = new Paint();
+        backgroundPaint.setColor(Color.DKGRAY);
+        backgroundPaint.setStyle(Paint.Style.FILL);
+    }
+
+
+    /**
+     *  Any rendering that utilizes a buffer from this class should synchronize rendering on the instance of this class
+     *  that is being used.
+     */
+    private static class BufferedCanvas {
+        private volatile Bitmap bgBuffer;  // all drawing is done on this buffer.
+        private volatile Bitmap fgBuffer;
+        private Canvas canvas = new Canvas();
+
+        /**
+         * Call this method once drawing on a Canvas retrieved by {@link #getCanvas()} to mark
+         * the buffer as fully rendered.  Failure to call this method will result in nothing being drawn.
+         */
+        public synchronized void swap() {
+            Bitmap tmp = bgBuffer;
+            bgBuffer = fgBuffer;
+            fgBuffer = tmp;
+        }
+
+        public synchronized void resize(int h, int w) {
+            if (w <= 0 || h <= 0) {
+                bgBuffer = null;
+                fgBuffer = null;
+            } else {
+                try {
+                    bgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+                    fgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+                } catch(IllegalArgumentException e) {
+                    throw new IllegalArgumentException("Illegal argument passed to Bitmap.createBitmap.  width: " + w + " height: " + h);
+                }
+            }
+        }
+
+        public void recycle() {
+            /**
+             * TODO: Issue #93 There have been rare reports of NPE's originating from here.
+             * Most likely there is something deeper that is amiss, but for now we'll simply
+             * do a null check before recycling.
+             */
+            if(bgBuffer != null) {
+                bgBuffer.recycle();
+                bgBuffer = null;
+            }
+
+            if(fgBuffer != null) {
+                fgBuffer.recycle();
+                fgBuffer = null;
+            }
+
+            System.gc();
+        }
+
+        /**
+         * Get a Canvas for drawing.  Actual drawing should be synchronized on the instance
+         * of BufferedCanvas being used.
+         * @return The Canvas instance to draw onto.  Returns null if drawing buffers have not
+         *         been initialized a la {@link #resize(int, int)}.
+         */
+        public synchronized Canvas getCanvas() {
+            if(bgBuffer != null) {
+                canvas.setBitmap(bgBuffer);
+                return canvas;
+            } else {
+                return null;
+            }
+        }
+
+        /**
+         * @return The most recent fully rendered Bitmsp
+         */
+        public Bitmap getBitmap() {
+            return fgBuffer;
+        }
+    }
+
+    /**
+     * Convenience constructor - wraps {@link #Plot(android.content.Context, String, com.androidplot.Plot.RenderMode)}.
+     * RenderMode is set to {@link RenderMode#USE_BACKGROUND_THREAD}.
+     * @param context
+     * @param title The display title of this Plot.
+     */
+    public Plot(Context context, String title) {
+        this(context, title, RenderMode.USE_MAIN_THREAD);
+    }
+
+    /**
+     * Used for programmatic instantiation.
+     * @param context
+     * @param title The display title of this Plot.
+     */
+    public Plot(Context context, String title, RenderMode mode) {
+        super(context);
+        this.renderMode = mode;
+        init(context, null, 0);
+        getTitle().setText(title);
+    }
+
+
+    /**
+     * Required by super-class. Extending class' implementations should add
+     * the following code immediately before exiting to ensure that loadAttrs
+     * is called only once by the derived class:
+     * <code>
+     * if(getClass().equals(DerivedPlot.class) {
+     *     loadAttrs(context, attrs);
+     * }
+     * </code>
+     *
+     * See {@link com.androidplot.xy.XYPlot#XYPlot(android.content.Context, android.util.AttributeSet)}
+     * for an example.
+     * @param context
+     * @param attrs
+     */
+    public Plot(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs, 0);
+    }
+
+    /**
+     * Required by super-class. Extending class' implementations should add
+     * the following code immediately before exiting to ensure that loadAttrs
+     * is called only once by the derived class:
+     * <code>
+     * if(getClass().equals(DerivedPlot.class) {
+     *     loadAttrs(context, attrs);
+     * }
+     * </code>
+     *
+     * See {@link com.androidplot.xy.XYPlot#XYPlot(android.content.Context, android.util.AttributeSet, int)}
+     * for an example.
+     * @param context
+     * @param attrs
+     * @param defStyle
+     */
+    public Plot(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs, defStyle);
+    }
+
+    /**
+     * Can be overridden by derived classes to control hardware acceleration state.
+     * Note that this setting is only used on Honeycomb and later environments.
+     * @return True if hardware acceleration is allowed, false otherwise.
+     * @since 0.5.1
+     */
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    protected boolean isHwAccelerationSupported() {
+        return false;
+    }
+
+    /**
+     * Sets the render mode used by the Plot.
+     * WARNING: This method is not currently designed for general use outside of Configurator.
+     * Attempting to reassign the render mode at runtime will result in unexpected behavior.
+     * @param mode
+     */
+    public void setRenderMode(RenderMode mode) {
+        this.renderMode = mode;
+    }
+
+    /**
+     * Concrete implementations may do any final setup / initialization
+     * here.  Immediately following this method's invocation, AndroidPlot assumes
+     * that the Plot instance is ready for final configuration via the Configurator.
+     */
+    protected void onPreInit() {
+        // nothing to do by default
+    }
+
+    /**
+     * Invoked immediately following configurator / styleable attr application.
+     */
+    protected void onAfterConfig() {
+        // nothing to do by default
+    }
+
+    protected final void init(Context context, AttributeSet attrs, int defStyle) {
+        PixelUtils.init(context);
+        layoutManager = new LayoutManager();
+        title = new TextLabelWidget(layoutManager, new Size(25,
+                SizeMode.ABSOLUTE, 100,
+                SizeMode.ABSOLUTE),
+                TextOrientation.HORIZONTAL);
+        title.position(0, HorizontalPositioning.RELATIVE_TO_CENTER, 0,
+                VerticalPositioning.ABSOLUTE_FROM_TOP, Anchor.TOP_MIDDLE);
+
+        // initialize attr defaults:
+        title.getLabelPaint().setTextSize(
+                PixelUtils.spToPix(DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP));
+
+        onPreInit();
+        // make sure the title widget is always the topmost widget:
+        layoutManager.moveToTop(title);
+        if(context != null && attrs != null) {
+            loadAttrs(attrs, defStyle);
+        }
+
+        onAfterConfig();
+
+        layoutManager.onPostInit();
+        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
+            renderThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+
+                    keepRunning = true;
+                    while (keepRunning) {
+                        isIdle = false;
+                        synchronized (pingPong) {
+                            Canvas c = pingPong.getCanvas();
+                            renderOnCanvas(c);
+                            pingPong.swap();
+                        }
+                        synchronized (renderSync) {
+                            postInvalidate();
+                            // prevent this thread from becoming an orphan
+                            // after the view is destroyed
+                            if (keepRunning) {
+                                try {
+                                    renderSync.wait();
+                                } catch (InterruptedException e) {
+                                    keepRunning = false;
+                                }
+                            }
+                        }
+                    }
+                    pingPong.recycle();
+                }
+            }, "Androidplot renderThread");
+        }
+    }
+
+    /**
+     * If a styleable is available for the derived class, this method will be invoked with those attrs.
+     * The derived implementation is only responsible for setting derived class attributes, ie. it should
+     * not attempt to apply the Plot.title styleable attribute etc.  Do not invoke recycle() on attrs.
+     * @param attrs Attrs for the derived class.
+     */
+    protected abstract void processAttrs(TypedArray attrs);
+
+    /**
+     * Apply base class attrs.
+     * @param attrs
+     */
+    private void processBaseAttrs(TypedArray attrs) {
+
+        // markup mode
+        boolean markupEnabled = attrs.getBoolean(R.styleable.Plot_markupEnabled, false);
+        setMarkupEnabled(markupEnabled);
+
+        // renderMode
+        RenderMode renderMode = RenderMode.values()
+                [attrs.getInt(R.styleable.Plot_renderMode, getRenderMode().ordinal())];
+        if(renderMode != getRenderMode()) {
+            setRenderMode(renderMode);
+        }
+
+        // margins & padding
+        AttrUtils.configureBoxModelable(attrs, boxModel, R.styleable.Plot_marginTop, R.styleable.Plot_marginBottom,
+                R.styleable.Plot_marginLeft, R.styleable.Plot_marginRight, R.styleable.Plot_paddingTop,
+                R.styleable.Plot_paddingBottom, R.styleable.Plot_paddingLeft, R.styleable.Plot_paddingRight);
+
+        // title
+        getTitle().setText(attrs.getString(R.styleable.Plot_title));
+        getTitle().getLabelPaint().setTextSize(
+                attrs.getDimension(R.styleable.Plot_titleTextSize,
+                        PixelUtils.spToPix(DEFAULT_TITLE_WIDGET_TEXT_SIZE_SP)));
+
+        getTitle().getLabelPaint().setColor(attrs.getColor(
+                R.styleable.Plot_titleTextColor, getTitle().getLabelPaint().getColor()));
+
+        getBackgroundPaint().setColor(
+                attrs.getColor(R.styleable.Plot_backgroundColor, getBackgroundPaint().getColor()));
+
+        AttrUtils.configureLinePaint(attrs, getBorderPaint(),
+                R.styleable.Plot_borderColor, R.styleable.Plot_borderThickness);
+    }
+
+    /**
+     * Parse XML Attributes.  Should only be called once and at the end of the base class constructor.
+     * The first-pass attempts to locate styleable attributes and apply those first.  After that,
+     * configurator-style attributes are applied, overriding any styleable attrs that may have
+     * been previously applied.
+     *
+     * @param attrs
+     */
+    private void loadAttrs(AttributeSet attrs, int defStyle) {
+
+        if (attrs != null) {
+
+            Field styleableFieldInR = null;
+            TypedArray typedAttrs = null;
+            
+            Class styleableClass = R.styleable.class;
+            String styleableName = getClass().getName().substring(BASE_PACKAGE.length());
+            styleableName = styleableName.replace('.', '_');
+            try {
+                /**
+                 * Use reflection to safely run for the existence of styleable defs for Plot
+                 * and it's derivatives.  This safety run is necessary to avoid runtime exceptions
+                 * in apps that don't include Androidplot as a .aar and won't have access to
+                 * the resources defined in the core library.
+                 */
+                styleableFieldInR = styleableClass.getField(styleableName);
+            } catch (NoSuchFieldException e) {
+                Log.d(TAG, "Styleable definition not found for: " + styleableName);
+            }
+            if (styleableFieldInR != null) {
+                try {
+                    int[] resIds = (int[]) styleableFieldInR.get(null);
+                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
+                } catch (IllegalAccessException e) {
+                    // nothing to do
+                } finally {
+                    if (typedAttrs != null) {
+                        // apply derived class' attrs:
+                        processAttrs(typedAttrs);
+                        typedAttrs.recycle();
+                    }
+                }
+            }
+
+            try {
+                styleableFieldInR = styleableClass.getField(Plot.class.getSimpleName());
+                if (styleableFieldInR != null) {
+                    int[] resIds = (int[]) styleableFieldInR.get(null);
+                    typedAttrs = getContext().obtainStyledAttributes(attrs, resIds, defStyle, 0);
+                }
+            } catch (IllegalAccessException e) {
+                // nothing to do
+            } catch (NoSuchFieldException e) {
+                Log.d(TAG, "Styleable definition not found for: " + Plot.class.getSimpleName());
+            } finally {
+                if (typedAttrs != null) {
+                    // apply base attrs:
+                    processBaseAttrs(typedAttrs);
+                    typedAttrs.recycle();
+                }
+            }
+
+            // apply "configurator" attrs: (overrides any previously applied styleable attrs)
+            // filter out androidplot prefixed attrs:
+            HashMap<String, String> attrHash = new HashMap<>();
+            for (int i = 0; i < attrs.getAttributeCount(); i++) {
+                String attrName = attrs.getAttributeName(i);
+
+                // case insensitive run to see if this attr begins with our prefix:
+                if (attrName != null && attrName.toUpperCase().startsWith(XML_ATTR_PREFIX.toUpperCase())) {
+                    attrHash.put(attrName.substring(XML_ATTR_PREFIX.length() + 1), attrs.getAttributeValue(i));
+                }
+            }
+            try {
+                Fig.configure(getContext(), this, attrHash);
+            } catch (FigException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public RenderMode getRenderMode() {
+        return renderMode;
+    }
+
+    public synchronized boolean addListener(PlotListener listener) {
+        return !listeners.contains(listener) && listeners.add(listener);
+    }
+
+    public synchronized boolean removeListener(PlotListener listener) {
+        return listeners.remove(listener);
+    }
+
+    protected ArrayList<PlotListener> getListeners() {
+        return listeners;
+    }
+
+    protected void notifyListenersBeforeDraw(Canvas canvas) {
+        for (PlotListener listener : listeners) {
+            listener.onBeforeDraw(this, canvas);
+        }
+    }
+
+    protected void notifyListenersAfterDraw(Canvas canvas) {
+        for (PlotListener listener : listeners) {
+            listener.onAfterDraw(this, canvas);
+        }
+    }
+
+    /**
+     * Convenience method to add a multiple series at once using the same formatter.
+     * If a problem is encountered, the method immediately returns false and the plot
+     * will contain whatever series were added before the failure.
+     * @param formatter
+     * @param series
+     * @return True if all series were successfully added, false otherwise.
+     * @since 0.9.7
+     */
+    public synchronized boolean addSeries(FormatterType formatter, SeriesType... series) {
+        for(SeriesType s : series) {
+            if(!addSeries(s, formatter)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Add a new Series to the Plot.
+     * @param series
+     * @param formatter
+     * @return True if the series was added or false if the series / formatter pair already exists in the registry.
+     */
+    public synchronized boolean addSeries(SeriesType series, FormatterType formatter) {
+        final boolean result = getRegistry().add(series, formatter);
+        attachSeries(series, formatter);
+        return result;
+    }
+
+    protected void attachSeries(SeriesType series, FormatterType formatter) {
+
+        Class rendererClass = formatter.getRendererClass();
+
+        // initialize the Renderer if necessary:
+        if(!getRenderers().containsKey(rendererClass)) {
+            getRenderers().put(rendererClass, (RendererType) formatter.getRendererInstance(this));
+        }
+
+        // if this series implements PlotListener, add it as a listener:
+        if(series instanceof PlotListener) {
+            addListener((PlotListener)series);
+        }
+    }
+
+    /**
+     *
+     * @param series
+     * @param rendererClass
+     * @return The {@link SeriesBundle} that matches the series and rendererClass params, or null if one is not found.
+     */
+    protected SeriesBundle<SeriesType, FormatterType> getSeries(SeriesType series, Class<? extends RendererType> rendererClass) {
+        for(SeriesBundle<SeriesType, FormatterType> thisPair : getSeries(series)) {
+            if(thisPair.getFormatter().getRendererClass() == rendererClass) {
+                return thisPair;
+            }
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @param series
+     * @return A List of {@link SeriesBundle} instances that reference series.
+     */
+    protected List<SeriesBundle<SeriesType, FormatterType>> getSeries(SeriesType series) {
+        return getRegistry().get(series);
+    }
+
+    /**
+     *
+     * Remove a series for a specific Renderer only.  Use {@link #removeSeries(Series)} to remove the series
+     * from the plot completely.
+     * @param series
+     * @param rendererClass
+     * @return True if anything was removed, false otherwise
+     */
+    public synchronized boolean removeSeries(SeriesType series, Class<? extends RendererType> rendererClass) {
+
+        List removedItems = getRegistry().remove(series, rendererClass);
+
+        // if series implements PlotListener and is not assigned to any other renderers remove it as a listener:
+        if (removedItems.size() == 1 && series instanceof PlotListener) {
+            removeListener((PlotListener) series);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Remove all occurrences of series regardless of the associated Renderer.
+     * @param series
+     */
+    public synchronized void removeSeries(SeriesType series) {
+        // if series implements PlotListener, remove it from listeners:
+        if (series instanceof PlotListener) {
+            removeListener((PlotListener) series);
+        }
+
+        getRegistry().remove(series);
+    }
+
+    /**
+     * Remove all series from the plot.
+     */
+    public void clear() {
+        for(SeriesType series : getRegistry().getSeriesList()) {
+            if(series instanceof  PlotListener) {
+                removeListener((PlotListener) series);
+            }
+        }
+        getRegistry().clear();
+    }
+
+    public boolean isEmpty() {
+        return getRegistry().isEmpty();
+    }
+
+    /**
+     *
+     * @param series
+     * @param rendererClass
+     * @return The Formatter instance corresponding to the specified  series / renderer pair.
+     */
+    public FormatterType getFormatter(SeriesType series, Class<? extends RendererType> rendererClass) {
+        return getSeries(series, rendererClass).getFormatter();
+    }
+
+    public <T extends RendererType> T getRenderer(Class<T> rendererClass) {
+        return (T) getRenderers().get(rendererClass);
+    }
+
+    public List<RendererType> getRendererList() {
+        return new ArrayList<>(getRenderers().values());
+    }
+
+    public void setMarkupEnabled(boolean enabled) {
+        this.layoutManager.setMarkupEnabled(enabled);
+    }
+
+    /**
+     * Causes the plot to be redrawn.
+     * @since 0.5.1
+     */
+    public void redraw() {
+
+        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
+
+            // only enter synchronized block if the call is expected to block OR
+            // if the render thread is idle, so we know that we won't have to wait to
+            // obtain a lock.
+            if (isIdle) {
+                synchronized (renderSync) {
+                    renderSync.notify();
+                }
+            }
+        } else if(renderMode == RenderMode.USE_MAIN_THREAD) {
+
+            // are we on the UI thread?
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                invalidate();
+            } else {
+                postInvalidate();
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported Render Mode: " + renderMode);
+        }
+    }
+
+    @Override
+    public synchronized void layout(final DisplayDimensions dims) {
+        this.displayDims = dims;
+        layoutManager.layout(displayDims);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        synchronized(renderSync) {
+            keepRunning = false;
+            renderSync.notify();
+        }
+    }
+
+
+    @Override
+    protected synchronized void onSizeChanged (int w, int h, int oldw, int oldh) {
+
+        // update pixel conversion values
+        PixelUtils.init(getContext());
+
+        // disable hardware acceleration if it's not explicitly supported
+        // by the current Plot implementation. this run only applies to
+        // honeycomb and later environments.
+        if (Build.VERSION.SDK_INT >= 11) {
+            if (!isHwAccelerationSupported() && isHardwareAccelerated()) {
+                setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+            }
+        }
+
+        // pingPong is only used in background rendering mode.
+        if(renderMode == RenderMode.USE_BACKGROUND_THREAD) {
+            pingPong.resize(h, w);
+        }
+
+        RectF cRect = new RectF(0, 0, w, h);
+        RectF mRect = boxModel.getMarginatedRect(cRect);
+        RectF pRect = boxModel.getPaddedRect(mRect);
+
+        layout(new DisplayDimensions(cRect, mRect, pRect));
+        super.onSizeChanged(w, h, oldw, oldh);
+        if(renderThread != null && !renderThread.isAlive()) {
+            renderThread.start();
+        }
+    }
+
+    /**
+     * Called whenever the plot needs to be drawn via the Handler, which invokes invalidate().
+     * Should never be called directly; use {@link #redraw()} instead.
+     * @param canvas
+     */
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
+            synchronized(pingPong) {
+                Bitmap bmp = pingPong.getBitmap();
+                if(bmp != null) {
+                    canvas.drawBitmap(bmp, 0, 0, null);
+                }
+            }
+        } else if (renderMode == RenderMode.USE_MAIN_THREAD) {
+            renderOnCanvas(canvas);
+        } else {
+            throw new IllegalArgumentException("Unsupported Render Mode: " + renderMode);
+        }
+    }
+
+    /**
+     * Renders the plot onto a canvas.  Used by both main thread to draw directly
+     * onto the View's canvas as well as by background draw to render onto a
+     * Bitmap buffer.  At the end of the day this is the main entry for a plot's
+     * "heavy lifting".
+     * @param canvas
+     */
+    protected synchronized void renderOnCanvas(@Nullable Canvas canvas) {
+        if(canvas == null) {
+            return;
+        }
+        try {
+            // any series interested in synchronizing with plot should
+            // implement PlotListener.onBeforeDraw(...) and do a read lock from within its
+            // invocation.  This is the entry point into that call:
+            notifyListenersBeforeDraw(canvas);
+            try {
+                // need to completely erase what was on the canvas before redrawing, otherwise
+                // some odd aliasing artifacts begin to build up around the edges of aa'd entities
+                // over time.
+                canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+                if (backgroundPaint != null) {
+                    drawBackground(canvas, displayDims.marginatedRect);
+                }
+
+                layoutManager.draw(canvas);
+
+                if (getBorderPaint() != null) {
+                    drawBorder(canvas, displayDims.marginatedRect);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Exception while rendering Plot.", e);
+            }
+
+            isIdle = true;
+            // any series interested in synchronizing with plot should
+            // implement PlotListener.onAfterDraw(...) and do a read unlock from within that
+            // invocation. This is the entry point for that invocation.
+            notifyListenersAfterDraw(canvas);
+        } finally {
+        }
+    }
+
+
+    /**
+     * Sets the visual style of the plot's border.
+     * @param style
+     * @param radiusX Sets the X radius for BorderStyle.ROUNDED.  Use null for all other styles.
+     * @param radiusY Sets the Y radius for BorderStyle.ROUNDED.  Use null for all other styles.
+     */
+    public void setBorderStyle(BorderStyle style, Float radiusX, Float radiusY) {
+        if (style == Plot.BorderStyle.ROUNDED) {
+            if (radiusX == null || radiusY == null){
+                throw new IllegalArgumentException("radiusX and radiusY cannot be null when using BorderStyle.ROUNDED");
+            }
+            this.borderRadiusX = radiusX;
+            this.borderRadiusY = radiusY;
+        }
+        this.borderStyle = style;
+    }
+
+    /**
+     * Draws the plot's outer border.
+     * @param canvas
+     */
+    protected void drawBorder(Canvas canvas, RectF dims) {
+        drawRect(canvas, dims, borderPaint);
+    }
+
+    protected void drawBackground(Canvas canvas, RectF dims) {
+        drawRect(canvas, dims, backgroundPaint);
+    }
+
+    protected void drawRect(Canvas canvas, RectF dims, Paint paint) {
+        switch (borderStyle) {
+            case ROUNDED:
+                canvas.drawRoundRect(dims, borderRadiusX, borderRadiusY, paint);
+                break;
+            case SQUARE:
+            default:
+                canvas.drawRect(dims, paint);
+                break;
+        }
+    }
+
+    public LayoutManager getLayoutManager() {
+        return layoutManager;
+    }
+
+    public void setLayoutManager(LayoutManager layoutManager) {
+        this.layoutManager = layoutManager;
+    }
+
+    public Paint getBackgroundPaint() {
+        return backgroundPaint;
+    }
+
+    public void setBackgroundPaint(Paint backgroundPaint) {
+        this.backgroundPaint = backgroundPaint;
+    }
+
+    /**
+     * Convenience method - wraps the individual setMarginXXX methods into a single method.
+     * @param left
+     * @param top
+     * @param right
+     * @param bottom
+     */
+    public void setPlotMargins(float left, float top, float right, float bottom) {
+        setPlotMarginLeft(left);
+        setPlotMarginTop(top);
+        setPlotMarginRight(right);
+        setPlotMarginBottom(bottom);
+    }
+
+    /**
+     * Convenience method - wraps the individual setPaddingXXX methods into a single method.
+     * @param left
+     * @param top
+     * @param right
+     * @param bottom
+     */
+    public void setPlotPadding(float left, float top, float right, float bottom) {
+        setPlotPaddingLeft(left);
+        setPlotPaddingTop(top);
+        setPlotPaddingRight(right);
+        setPlotPaddingBottom(bottom);
+    }
+
+    public float getPlotMarginTop() {
+        return boxModel.getMarginTop();
+    }
+
+    public void setPlotMarginTop(float plotMarginTop) {
+        boxModel.setMarginTop(plotMarginTop);
+    }
+
+    public float getPlotMarginBottom() {
+        return boxModel.getMarginBottom();
+    }
+
+    public void setPlotMarginBottom(float plotMarginBottom) {
+        boxModel.setMarginBottom(plotMarginBottom);
+    }
+
+    public float getPlotMarginLeft() {
+        return boxModel.getMarginLeft();
+    }
+
+    public void setPlotMarginLeft(float plotMarginLeft) {
+        boxModel.setMarginLeft(plotMarginLeft);
+    }
+
+    public float getPlotMarginRight() {
+        return boxModel.getMarginRight();
+    }
+
+    public void setPlotMarginRight(float plotMarginRight) {
+        boxModel.setMarginRight(plotMarginRight);
+    }
+
+    public float getPlotPaddingTop() {
+        return boxModel.getPaddingTop();
+    }
+
+    public void setPlotPaddingTop(float plotPaddingTop) {
+        boxModel.setPaddingTop(plotPaddingTop);
+    }
+
+    public float getPlotPaddingBottom() {
+        return boxModel.getPaddingBottom();
+    }
+
+    public void setPlotPaddingBottom(float plotPaddingBottom) {
+        boxModel.setPaddingBottom(plotPaddingBottom);
+    }
+
+    public float getPlotPaddingLeft() {
+        return boxModel.getPaddingLeft();
+    }
+
+    public void setPlotPaddingLeft(float plotPaddingLeft) {
+        boxModel.setPaddingLeft(plotPaddingLeft);
+    }
+
+    public float getPlotPaddingRight() {
+        return boxModel.getPaddingRight();
+    }
+
+    public void setPlotPaddingRight(float plotPaddingRight) {
+        boxModel.setPaddingRight(plotPaddingRight);
+    }
+
+    public Paint getBorderPaint() {
+        return borderPaint;
+    }
+
+    /**
+     * Set's the paint used to draw the border.  Note that this method
+     * copies borderPaint and set's the copy's Paint.Style attribute to
+     * Paint.Style.STROKE.
+     * @param borderPaint
+     */
+    public void setBorderPaint(Paint borderPaint) {
+        if(borderPaint == null) {
+            this.borderPaint = null;
+        } else {
+            this.borderPaint = new Paint(borderPaint);
+            this.borderPaint.setStyle(Paint.Style.STROKE);
+        }
+    }
+}
diff --git a/androidplot-core/src/main/java/com/androidplot/exception/PlotRenderException.java b/androidplot-core/src/main/java/com/androidplot/exception/PlotRenderException.java
deleted file mode 100644
index 62a6e6d9..00000000
--- a/androidplot-core/src/main/java/com/androidplot/exception/PlotRenderException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2015 AndroidPlot.com
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.androidplot.exception;
-
-public class PlotRenderException extends Exception {
-    public PlotRenderException(String message) {
-        super(message);
-    }
-}
diff --git a/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java b/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
index caaddc06..db8921dc 100644
--- a/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/pie/PieRenderer.java
@@ -18,7 +18,6 @@
 
 import android.graphics.*;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.SeriesBundle;
 import com.androidplot.ui.SeriesRenderer;
 import com.androidplot.ui.RenderStack;
@@ -58,7 +57,7 @@ public float getRadius(RectF rect) {
 
     @Override
     public void onRender(Canvas canvas, RectF plotArea, Segment series, SegmentFormatter formatter,
-            RenderStack stack) throws PlotRenderException {
+            RenderStack stack) {
 
         // This renderer renders all series in one shot, so exclude any remaining series
         // from causing subsequent invocations of onRender:
diff --git a/androidplot-core/src/main/java/com/androidplot/pie/PieWidget.java b/androidplot-core/src/main/java/com/androidplot/pie/PieWidget.java
index 38c23b27..1b7b2a80 100644
--- a/androidplot-core/src/main/java/com/androidplot/pie/PieWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/pie/PieWidget.java
@@ -17,7 +17,6 @@
 package com.androidplot.pie;
 
 import android.graphics.*;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.Size;
 import com.androidplot.ui.widget.Widget;
@@ -38,7 +37,7 @@ public PieWidget(LayoutManager layoutManager, PieChart pieChart, Size metrics) {
     }
 
     @Override
-    protected void doOnDraw(Canvas canvas, RectF widgetRect) throws PlotRenderException {
+    protected void doOnDraw(Canvas canvas, RectF widgetRect) {
         renderStack.sync();
         for(RenderStack.StackElement thisElement : renderStack.getElements()) {
             if(thisElement.isEnabled()) {
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java b/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
index 0fb1a04c..45f79a43 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/LayoutManager.java
@@ -25,7 +25,6 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.widget.Widget;
 import com.androidplot.util.DisplayDimensions;
 import com.androidplot.util.LinkedLayerList;
@@ -83,7 +82,7 @@ public void setMarkupEnabled(boolean enabled) {
         setDrawOutlineShadowsEnabled(enabled);
     }
 
-    public void draw(Canvas canvas) throws PlotRenderException {
+    public void draw(Canvas canvas) {
         if(isDrawMarginsEnabled()) {
             drawSpacing(canvas, displayDims.canvasRect, displayDims.marginatedRect, marginPaint);
         }
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java b/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
index afc1b142..bfedeeb8 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/SeriesRenderer.java
@@ -20,7 +20,6 @@
 import android.graphics.RectF;
 import android.graphics.Region;
 import com.androidplot.Series;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.Plot;
 
 import java.util.ArrayList;
@@ -52,10 +51,9 @@ public SeriesFormatterType getFormatter(SeriesType series) {
      * @param canvas
      * @param plotArea
      * @param sfPair The series / formatter pair to be rendered
-     * @throws PlotRenderException
      */
     public void render(Canvas canvas, RectF plotArea, SeriesBundle<SeriesType,
-                SeriesFormatterType> sfPair, RenderStack stack) throws PlotRenderException {
+                SeriesFormatterType> sfPair, RenderStack stack) {
         onRender(canvas, plotArea, sfPair.getSeries(), sfPair.getFormatter(), stack);
     }
 
@@ -67,10 +65,9 @@ public void render(Canvas canvas, RectF plotArea, SeriesBundle<SeriesType,
      * @param formatter The getFormatter that should be used to render the series
      * @param stack Ordered list of all series being renderered.  May be manipulated by the Renderer
      *              to gain effect.
-     * @throws PlotRenderException
      */
     protected abstract void onRender(Canvas canvas, RectF plotArea, SeriesType series,
-                                  SeriesFormatterType formatter, RenderStack stack) throws PlotRenderException;
+                                  SeriesFormatterType formatter, RenderStack stack);
 
     /**
      * Draw the legend icon in the rect passed in.
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java b/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
index 69e41407..e9222888 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
@@ -5,9 +5,6 @@
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.Size;
 import com.androidplot.ui.TableModel;
@@ -62,7 +59,7 @@ public LegendWidget(@NonNull TableModel tableModel, @NonNull LayoutManager layou
     }
 
     @Override
-    protected void doOnDraw(Canvas canvas, RectF widgetRect) throws PlotRenderException {
+    protected void doOnDraw(Canvas canvas, RectF widgetRect) {
         final List<ItemT> items = getLegendItems();
         if(legendItemComparator != null) {
             Collections.sort(items, legendItemComparator);
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java b/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
index d66b85a8..87a43a02 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
@@ -20,7 +20,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.*;
 import com.androidplot.util.DisplayDimensions;
 import com.androidplot.ui.HorizontalPositioning;
@@ -372,7 +371,7 @@ protected void onResize(@Nullable RectF oldRect, @NonNull RectF newRect) {
         // do nothing by default
     }
 
-    public void draw(Canvas canvas) throws PlotRenderException {
+    public void draw(Canvas canvas) {
         if (isVisible()) {
             if (backgroundPaint != null) {
                 drawBackground(canvas, widgetDimensions.canvasRect);
@@ -439,7 +438,7 @@ protected void drawBackground(Canvas canvas, RectF widgetRect) {
      * @param canvas     The Canvas to draw onto
      * @param widgetRect the size and coordinates of this widget
      */
-    protected abstract void doOnDraw(Canvas canvas, RectF widgetRect) throws PlotRenderException;
+    protected abstract void doOnDraw(Canvas canvas, RectF widgetRect);
 
     public Paint getBorderPaint() {
         return borderPaint;
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/AdvancedLineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/AdvancedLineAndPointRenderer.java
index ee3e7e24..11b9e8e8 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/AdvancedLineAndPointRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/AdvancedLineAndPointRenderer.java
@@ -18,7 +18,6 @@
 
 import android.content.*;
 import android.graphics.*;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.RenderStack;
 import com.androidplot.ui.SeriesRenderer;
 
@@ -41,7 +40,7 @@ public AdvancedLineAndPointRenderer(XYPlot plot) {
     }
 
     @Override
-    protected void onRender(Canvas canvas, RectF plotArea, XYSeries series, Formatter formatter, RenderStack stack) throws PlotRenderException {
+    protected void onRender(Canvas canvas, RectF plotArea, XYSeries series, Formatter formatter, RenderStack stack) {
         PointF thisPoint;
         PointF lastPoint = null;
         for (int i = 0; i < series.size(); i++) {
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/BarRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/BarRenderer.java
index bb8c4c7f..ced83885 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/BarRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/BarRenderer.java
@@ -51,7 +51,13 @@ public class BarRenderer<FormatterType extends BarFormatter> extends GroupRender
     public enum BarOrientation {
 
         /**
-         * Bars are drawn "overlapping" one another, with taller bars being drawn behind
+         * Bars are drawn overlapping one another, in the order their respective series
+         * was added to the plot.
+         */
+        IN_ORDER,
+
+        /**
+         * Bars are drawn overlapping one another, with taller bars being drawn behind
          * the shorter ones.
          */
         OVERLAID,           // bars are overlaid in descending y-val order (largest val in back)
@@ -187,6 +193,7 @@ public void onRender(Canvas canvas, RectF plotArea, List<SeriesBundle<XYSeries,
 
             final BarComparator comparator = getBarComparator(rangeOriginPx);
             switch (barOrientation) {
+                case IN_ORDER:
                 case OVERLAID:
                     Collections.sort(barGroup.bars, comparator);
                     for (Bar bar : barGroup.bars) {
@@ -366,6 +373,7 @@ public int compare(Bar bar1, Bar bar2) {
                     } else {
                         return Float.valueOf(bar1.yPix).compareTo(bar2.yPix);
                     }
+                case IN_ORDER:
                 case SIDE_BY_SIDE:
                 case STACKED:
                 default:
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/BubbleRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/BubbleRenderer.java
index 1e0ba9c5..dcebf6cb 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/BubbleRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/BubbleRenderer.java
@@ -3,7 +3,6 @@
 import android.graphics.*;
 
 import com.androidplot.Region;
-import com.androidplot.exception.*;
 import com.androidplot.ui.*;
 import com.androidplot.util.*;
 
@@ -45,7 +44,7 @@ public BubbleRenderer(XYPlot plot) {
 
     @Override
     protected void onRender(Canvas canvas, RectF plotArea, BubbleSeries series,
-            FormatterType formatter, RenderStack stack) throws PlotRenderException {
+            FormatterType formatter, RenderStack stack) {
 
         Region magnitudeBounds = calculateBounds();
         for(int i = 0; i < series.size(); i++) {
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
index d1e3fc8e..5f469ce2 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
@@ -22,7 +22,6 @@
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.RenderStack;
 import com.androidplot.ui.SeriesRenderer;
 
@@ -51,7 +50,7 @@ public FastLineAndPointRenderer(XYPlot plot) {
     }
 
     @Override
-    protected void onRender(Canvas canvas, RectF plotArea, XYSeries series, Formatter formatter, RenderStack stack) throws PlotRenderException {
+    protected void onRender(Canvas canvas, RectF plotArea, XYSeries series, Formatter formatter, RenderStack stack) {
 
         segmentOffsets.clear();
         segmentLengths.clear();
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/GroupRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/GroupRenderer.java
index d2fe4c73..503d624d 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/GroupRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/GroupRenderer.java
@@ -19,7 +19,6 @@
 import android.graphics.Canvas;
 import android.graphics.RectF;
 import android.util.Log;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.RenderStack;
 import com.androidplot.ui.SeriesBundle;
 
@@ -42,7 +41,7 @@ public GroupRenderer(XYPlot plot) {
 
     @Override
     protected void onRender(Canvas canvas, RectF plotArea, XYSeries series,
-                         FormatterType formatter, RenderStack stack) throws PlotRenderException {
+                         FormatterType formatter, RenderStack stack) {
 
 
         // get all the data  associated with this renderer:
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
index 53e80dca..f50d6186 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
@@ -25,7 +25,6 @@
 import com.androidplot.Plot;
 import com.androidplot.PlotListener;
 import com.androidplot.Region;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.RenderStack;
 import com.androidplot.util.*;
 
@@ -63,7 +62,7 @@ public void onAfterDraw(Plot source, Canvas canvas) {
     }
 
     @Override
-    public void onRender(Canvas canvas, RectF plotArea, XYSeries series, FormatterType formatter, RenderStack stack) throws PlotRenderException {
+    public void onRender(Canvas canvas, RectF plotArea, XYSeries series, FormatterType formatter, RenderStack stack) {
         drawSeries(canvas, plotArea, series, formatter);
     }
 
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/ValueMarker.java b/androidplot-core/src/main/java/com/androidplot/xy/ValueMarker.java
index 30e9aacd..de0436b2 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/ValueMarker.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/ValueMarker.java
@@ -16,10 +16,14 @@
 
 package com.androidplot.xy;
 
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
+
 import com.androidplot.ui.PositionMetric;
 import com.androidplot.ui.TextOrientation;
+import com.androidplot.util.FontUtils;
 
 /**
  * Encapsulates a single axis line marker drawn onto an XYPlot at a specified value.
@@ -27,6 +31,8 @@
  */
 public abstract class ValueMarker<PositionMetricType extends PositionMetric> {
 
+    private static final int MARKER_LABEL_SPACING = 2;
+
     public String getText() {
         return text;
     }
@@ -135,4 +141,37 @@ public PositionMetricType getTextPosition() {
     public void setTextPosition(PositionMetricType textPosition) {
         this.textPosition = textPosition;
     }
+
+    /**
+     * Renders the text associated with user defined markers
+     *
+     * @param canvas
+     * @param text
+     * @param gridRect
+     * @param x
+     * @param y
+     */
+    protected void drawMarkerText(Canvas canvas, String text, RectF gridRect,
+                                  float x, float y) {
+        if (getText() != null) {
+            x += MARKER_LABEL_SPACING;
+            y -= MARKER_LABEL_SPACING;
+            RectF textRect = new RectF(FontUtils.getStringDimensions(text, getTextPaint()
+            ));
+            textRect.offsetTo(x, y - textRect.height());
+
+            if (textRect.right > gridRect.right) {
+                textRect.offset(-(textRect.right - gridRect.right), 0);
+            }
+
+            if (textRect.top < gridRect.top) {
+                textRect.offset(0, gridRect.top - textRect.top);
+            }
+
+            canvas.drawText(text, textRect.left, textRect.bottom, getTextPaint()
+            );
+        }
+    }
+
+    public abstract void draw(Canvas canvas, XYPlot plot, RectF gridRect);
 }
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XValueMarker.java b/androidplot-core/src/main/java/com/androidplot/xy/XValueMarker.java
index af02ca64..a4c12438 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XValueMarker.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XValueMarker.java
@@ -16,7 +16,10 @@
 
 package com.androidplot.xy;
 
+import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.RectF;
+
 import com.androidplot.ui.VerticalPositioning;
 import com.androidplot.ui.VerticalPosition;
 
@@ -55,4 +58,19 @@ public XValueMarker(Number value, String text, VerticalPosition textPosition, Pa
     public XValueMarker(Number value, String text, VerticalPosition textPosition, int linePaint, int textPaint) {
         super(value, text, textPosition, linePaint, textPaint);
     }
+
+    @Override
+    public void draw(Canvas canvas, XYPlot plot, RectF gridRect) {
+        if (getValue() != null) {
+            float xPix = (float) plot.getBounds().xRegion
+                    .transform(getValue().doubleValue(), gridRect.left, gridRect.right, false);
+            canvas.drawLine(xPix, gridRect.top, xPix, gridRect.bottom, getLinePaint()
+            );
+            float yPix = getTextPosition().getPixelValue(gridRect.height());
+            yPix += gridRect.top;
+            if (getText() != null) {
+                drawMarkerText(canvas, getText(), gridRect, xPix, yPix);
+            }
+        }
+    }
 }
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
index 22c551e9..af1f2729 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
@@ -27,7 +27,6 @@
 
 import com.androidplot.R;
 import com.androidplot.Region;
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.ui.Insets;
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.RenderStack;
@@ -63,8 +62,6 @@ public class XYGraphWidget extends Widget {
 
     private static final float DEFAULT_LINE_LABEL_TEXT_SIZE_PX = PixelUtils.spToPix(15);
 
-    private static final int MARKER_LABEL_SPACING = TWO;
-
     /**
      * Line interval per range label
      */
@@ -542,8 +539,7 @@ protected void recalculateSizes(@Nullable RectF rect) {
     }
 
     @Override
-    protected void doOnDraw(Canvas canvas, RectF widgetRect)
-            throws PlotRenderException {
+    protected void doOnDraw(Canvas canvas, RectF widgetRect) {
 
         // don't draw if we have no space to draw into
         if (gridRect.height() > ZERO && gridRect.width() > ZERO) {
@@ -692,74 +688,16 @@ protected void drawGrid(Canvas canvas) {
         }
     }
 
-    /**
-     * Renders the text associated with user defined markers
-     *
-     * @param canvas
-     * @param text
-     * @param marker
-     * @param x
-     * @param y
-     */
-    protected void drawMarkerText(Canvas canvas, String text, ValueMarker marker,
-                                float x, float y) {
-        if (marker.getText() != null) {
-            x += MARKER_LABEL_SPACING;
-            y -= MARKER_LABEL_SPACING;
-            RectF textRect = new RectF(FontUtils.getStringDimensions(
-                    text,
-                    marker.getTextPaint()
-            ));
-            textRect.offsetTo(x, y - textRect.height());
-
-            if (textRect.right > gridRect.right) {
-                textRect.offset(-(textRect.right - gridRect.right), ZERO);
-            }
-
-            if (textRect.top < gridRect.top) {
-                textRect.offset(0, gridRect.top - textRect.top);
-            }
-
-            canvas.drawText(text, textRect.left, textRect.bottom,
-                    marker.getTextPaint()
-            );
-        }
-    }
-
     protected void drawMarkers(Canvas canvas) {
         if (plot.getYValueMarkers() != null && plot.getYValueMarkers().size() > 0) {
             for (YValueMarker marker : plot.getYValueMarkers()) {
-                if (marker.getValue() != null) {
-                    float yPix = (float) plot.getBounds().yRegion
-                            .transform(marker.getValue()
-                                    .doubleValue(), gridRect.top, gridRect.bottom, true);
-                    canvas.drawLine(gridRect.left, yPix,
-                            gridRect.right, yPix, marker.getLinePaint()
-                    );
-
-                    float xPix = marker.getTextPosition().getPixelValue(
-                            gridRect.width());
-                    xPix += gridRect.left;
-                    drawMarkerText(canvas, marker.getText(), marker, xPix, yPix);
-                }
+                marker.draw(canvas, plot, gridRect);
             }
         }
 
         if (plot.getXValueMarkers() != null && plot.getXValueMarkers().size() > 0) {
             for (XValueMarker marker : plot.getXValueMarkers()) {
-                if (marker.getValue() != null) {
-                    float xPix = (float) plot.getBounds().xRegion
-                            .transform(marker.getValue()
-                                    .doubleValue(), gridRect.left, gridRect.right, false);
-                    canvas.drawLine(xPix, gridRect.top, xPix, gridRect.bottom,
-                            marker.getLinePaint()
-                    );
-                    float yPix = marker.getTextPosition().getPixelValue(gridRect.height());
-                    yPix += gridRect.top;
-                    if (marker.getText() != null) {
-                        drawMarkerText(canvas, marker.getText(), marker, xPix, yPix);
-                    }
-                }
+                marker.draw(canvas, plot, gridRect);
             }
         }
     }
@@ -839,9 +777,8 @@ protected void drawGridBackground(Canvas canvas) {
      * Draws lines and points for each element in the series.
      *
      * @param canvas
-     * @throws PlotRenderException
      */
-    protected void drawData(Canvas canvas) throws PlotRenderException {
+    protected void drawData(Canvas canvas) {
         if (drawGridOnTop) {
             drawGridBackground(canvas);
         }
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/YValueMarker.java b/androidplot-core/src/main/java/com/androidplot/xy/YValueMarker.java
index f76dadd5..0e4aa435 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/YValueMarker.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/YValueMarker.java
@@ -16,7 +16,10 @@
 
 package com.androidplot.xy;
 
+import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.RectF;
+
 import com.androidplot.ui.HorizontalPositioning;
 import com.androidplot.ui.HorizontalPosition;
 
@@ -55,4 +58,21 @@ public YValueMarker(Number value, String text, HorizontalPosition textPosition,
     public YValueMarker(Number value, String text, HorizontalPosition textPosition, int linePaint, int textPaint) {
         super(value, text, textPosition, linePaint, textPaint);
     }
+
+    @Override
+    public void draw(Canvas canvas, XYPlot plot, RectF gridRect) {
+        if (getValue() != null) {
+            float yPix = (float) plot.getBounds().yRegion
+                    .transform(getValue()
+                            .doubleValue(), gridRect.top, gridRect.bottom, true);
+            canvas.drawLine(gridRect.left, yPix,
+                    gridRect.right, yPix, getLinePaint()
+            );
+
+            float xPix = getTextPosition().getPixelValue(
+                    gridRect.width());
+            xPix += gridRect.left;
+            drawMarkerText(canvas, getText(), gridRect, xPix, yPix);
+        }
+    }
 }
diff --git a/androidplot-core/src/test/java/com/androidplot/PlotTest.java b/androidplot-core/src/test/java/com/androidplot/PlotTest.java
index dc5e5e88..5a750afd 100644
--- a/androidplot-core/src/test/java/com/androidplot/PlotTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/PlotTest.java
@@ -20,11 +20,8 @@
 import android.graphics.*;
 import android.util.*;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.test.*;
 import com.androidplot.ui.*;
-import com.androidplot.xy.LineAndPointFormatter;
-import com.androidplot.xy.SimpleXYSeries;
 import com.halfhp.fig.*;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -36,7 +33,6 @@
 import static junit.framework.Assert.assertNotSame;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -47,7 +43,7 @@ public class PlotTest extends AndroidplotTest {
     SeriesRegistry<MockSeriesBundle, MockSeries, Formatter> mockSeriesRegistry;
 
     @Test
-    public void testInit_withoutAttrs() throws Exception {
+    public void testInit_withoutAttrs() {
         Plot plot = mock(Plot.class);
         plot.init(RuntimeEnvironment.application, null, 0);
 
@@ -56,7 +52,7 @@ public void testInit_withoutAttrs() throws Exception {
     }
 
     @Test
-    public void testInit_withAttrs() throws Exception {
+    public void testInit_withAttrs() {
         Plot plot = new MockPlot("MockPlot");
         AttributeSet attrs = mock(AttributeSet.class);
         plot.init(RuntimeEnvironment.application, attrs, 0);
@@ -64,7 +60,7 @@ public void testInit_withAttrs() throws Exception {
     }
 
     @Test
-    public void testAddSeries() throws Exception {
+    public void testAddSeries() {
         Plot plot = new MockPlot("MockPlot");
 
         MockSeries m1 = new MockSeries();
@@ -97,7 +93,7 @@ public void testAddSeries() throws Exception {
     }
 
     @Test
-    public void testRemoveSeries() throws Exception {
+    public void testRemoveSeries() {
 
         Plot plot = new MockPlot("MockPlot");
 
@@ -157,7 +153,7 @@ public void testRemoveSeries() throws Exception {
 
 
     @Test
-    public void testGetFormatter() throws Exception {
+    public void testGetFormatter() {
         Plot plot = new MockPlot("MockPlot");
 
         MockSeries m1 = new MockSeries();
@@ -185,7 +181,7 @@ public void testGetFormatter() throws Exception {
     }
 
     @Test
-    public void testGetRendererList() throws Exception {
+    public void testGetRendererList() {
 
         Plot plot = new MockPlot("MockPlot");
 
@@ -206,7 +202,7 @@ public void testGetRendererList() throws Exception {
     }
 
     @Test
-    public void testAddListener() throws Exception {
+    public void testAddListener() {
         Plot plot = new MockPlot("MockPlot");
         ArrayList<PlotListener> listeners = plot.getListeners();
 
@@ -232,7 +228,7 @@ public void testAddListener() throws Exception {
     }
 
     @Test
-    public void testRemoveListener() throws Exception {
+    public void testRemoveListener() {
         Plot plot = new MockPlot("MockPlot");
         ArrayList<PlotListener> listeners = plot.getListeners();
 
@@ -379,7 +375,7 @@ public MockRenderer1(Plot plot) {
         }
 
         @Override
-        public void onRender(Canvas canvas, RectF plotArea, Series series, Formatter formatter, RenderStack stack) throws PlotRenderException {
+        public void onRender(Canvas canvas, RectF plotArea, Series series, Formatter formatter, RenderStack stack) {
 
         }
 
@@ -396,7 +392,7 @@ public MockRenderer2(Plot plot) {
         }
 
         @Override
-        public void onRender(Canvas canvas, RectF plotArea, Series series, Formatter formatter, RenderStack stack) throws PlotRenderException {
+        public void onRender(Canvas canvas, RectF plotArea, Series series, Formatter formatter, RenderStack stack) {
 
         }
 
diff --git a/androidplot-core/src/test/java/com/androidplot/test/TestUtils.java b/androidplot-core/src/test/java/com/androidplot/test/TestUtils.java
index ecb78333..1f8f1457 100644
--- a/androidplot-core/src/test/java/com/androidplot/test/TestUtils.java
+++ b/androidplot-core/src/test/java/com/androidplot/test/TestUtils.java
@@ -56,11 +56,11 @@ public static XYSeries generateXYSeriesWithNulls(String title, int size) {
      */
     @SuppressLint("NewApi")
     public static MotionEvent newPointerDownEvent(int finger1x, int finger1y, int finger2x, int finger2y) {
-        MotionEvent me = MotionEvent.obtain(0, 0, 0, 0, 0, 0);
+        MotionEvent me = MotionEvent.obtain(0, 0, MotionEvent.ACTION_POINTER_DOWN, finger1x, finger1y, 0);
         ShadowMotionEvent sme = shadowOf(me);
-        sme.setAction(MotionEvent.ACTION_POINTER_DOWN);
+        //sme.setAction(MotionEvent.ACTION_POINTER_DOWN);
         sme.setPointerIds(0, 1);
-        sme.setLocation(finger1x, finger1y);
+        //sme.setLocation(finger1x, finger1y);
         sme.setPointer2(finger2x, finger2y);
         return me;
     }
diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
index db81d57c..408edc33 100644
--- a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
@@ -4,7 +4,6 @@
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 
-import com.androidplot.exception.PlotRenderException;
 import com.androidplot.test.AndroidplotTest;
 import com.androidplot.ui.Anchor;
 import com.androidplot.ui.HorizontalPositioning;
@@ -22,6 +21,8 @@
 import org.mockito.Mockito;
 
 import static junit.framework.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
@@ -88,14 +89,14 @@ public void position_withAnchor_updatesPositionWithNewAnchor() {
     }
 
     @Test
-    public void draw_sizeChanged_invokesOnResizeBeforeDoOnDraw() throws Exception {
+    public void draw_sizeChanged_invokesOnResizeBeforeDoOnDraw() {
         InOrder inOrder = Mockito.inOrder(widget);
 
         widget.draw(canvas);
 
-        inOrder.verify(widget).onResize(any(RectF.class), any(RectF.class));
+        inOrder.verify(widget).onResize(isNull(RectF.class), any(RectF.class));
         inOrder.verify(widget).doOnDraw(eq(canvas), any(RectF.class));
-        verify(widget).onResize(any(RectF.class), any(RectF.class));
+        verify(widget).onResize(isNull(RectF.class), any(RectF.class));
     }
 
     static class TestWidget extends Widget {
@@ -105,7 +106,7 @@ public TestWidget(@NonNull LayoutManager layoutManager, @NonNull Size size) {
         }
 
         @Override
-        protected void doOnDraw(Canvas canvas, RectF widgetRect) throws PlotRenderException {
+        protected void doOnDraw(Canvas canvas, RectF widgetRect) {
             // nothing to do
         }
     }
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
index 2bb317b5..e4624d08 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
@@ -61,14 +61,14 @@ public class BarRendererTest extends AndroidplotTest {
     ArgumentCaptor<RectF> rectCaptor;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         canvas = spy(new Canvas());
         xyPlot = spy(new XYPlot(getContext(), "My Plot"));
         barFormatter = spy(new BarFormatter(Color.RED, Color.RED));
     }
 
     @Test
-    public void testOnRender_handlesNullValues() throws Exception {
+    public void onRender_handlesNullValues() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", null, 5, null);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", null, 5, null);
 
@@ -83,7 +83,7 @@ public void testOnRender_handlesNullValues() throws Exception {
     }
 
     @Test
-    public void testOnRender_stacked() throws Exception {
+    public void onRender_stacked() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 2, 5, 7);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 8, 5, 3);
 
@@ -119,7 +119,7 @@ public void testOnRender_stacked() throws Exception {
     }
 
     @Test
-    public void testOnRender_sideBySide() throws Exception {
+    public void onRender_sideBySide() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 0, 5, 10);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 1, 7.5, 10);
 
@@ -150,7 +150,35 @@ public void testOnRender_sideBySide() throws Exception {
     }
 
     @Test
-    public void testOnRender_overlaid() throws Exception {
+    public void onRender_inOrder_drawsFirstAddedSeriesFirst() {
+        XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 1, 5, 6);
+        XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 2, 4, 7);
+
+        BarRenderer renderer = setupRendererForTesting(s1, s2);
+        renderer.setBarOrientation(BarRenderer.BarOrientation.IN_ORDER);
+
+        xyPlot.setUserRangeOrigin(0);
+        xyPlot.calculateMinMaxVals();
+        renderer.onRender(canvas, plotArea, s1, barFormatter, renderStack);
+
+        verify(renderer, times(6))
+                .drawBar(eq(canvas), barCaptor.capture(), rectCaptor.capture());
+
+        // list of all bars drawn, in the exact order they were drawn.
+        List<BarRenderer.Bar> bars = barCaptor.getAllValues();
+
+        assertEquals(bars.get(0).getY(), s1.getY(0));
+        assertEquals(bars.get(1).getY(), s2.getY(0));
+
+        assertEquals(bars.get(2).getY(), s1.getY(1));
+        assertEquals(bars.get(3).getY(), s2.getY(1));
+
+        assertEquals(bars.get(4).getY(), s1.getY(2));
+        assertEquals(bars.get(5).getY(), s2.getY(2));
+    }
+
+    @Test
+    public void onRender_overlaid_drawsBarsWithExpectedHeight() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 0, 5, 10);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 1, 7.5, 10);
 
@@ -183,10 +211,9 @@ public void testOnRender_overlaid() throws Exception {
     /**
      * Verify that positive values are drawn in order of highest yVal, while negative values are
      * drawn in order of lowest yVal.
-     * @throws Exception
      */
     @Test
-    public void testOnRender_overlaid_drawsBarsInOrder() throws Exception {
+    public void onRender_overlaid_drawsSmallestBarsLast() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", -1, -2, 1, 2);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", -2, -1, 2, 1);
 
@@ -211,7 +238,7 @@ public void testOnRender_overlaid_drawsBarsInOrder() throws Exception {
     }
 
     @Test
-    public void testFixedBarWidth() throws Exception {
+    public void onRender_fixedBarWidth_rendersAllBarsWithSameWidth() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 0, 5, 10);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 1, 7.5, 10);
 
@@ -233,7 +260,7 @@ public void testFixedBarWidth() throws Exception {
     }
 
     @Test
-    public void testFixedGapWidth() throws Exception {
+    public void onRender_fixedGapWidth_rendersFixedGapBetweenAllBars() {
         XYSeries s1 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s1", 0, 5, 10);
         XYSeries s2 = new SimpleXYSeries(SimpleXYSeries.ArrayFormat.Y_VALS_ONLY, "s2", 1, 7.5, 10);
 
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
index 65d3898a..03897972 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -30,6 +30,7 @@
 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;
 import static org.mockito.Matchers.anyFloat;
@@ -323,9 +324,9 @@ private void runDrawGridTest() {
 
         // expecting a 100x100 grid to be drawn:
         verify(graphWidget, times(100))
-                .drawDomainLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
+                .drawDomainLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false));
 
         verify(graphWidget, times(100))
-                .drawRangeLine(eq(canvas), anyFloat(), anyFloat(), any(Paint.class), eq(false));
+                .drawRangeLine(eq(canvas), anyFloat(), anyDouble(), any(Paint.class), eq(false));
     }
 }
diff --git a/build.gradle b/build.gradle
index 1e1d8c9f..41312fc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ ext {
     theTargetSdkVersion = 28
     theMinSdkVersion = 5
     theVersionName = '1.5.7'
-    theVersionCode = 0
+    theVersionCode = 1
 }
 
 buildscript {
@@ -38,11 +38,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
-        classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.6.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
 
@@ -52,7 +51,3 @@ allprojects {
         google()
     }
 }
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
-}
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index 36a7c800..e0e1d1c2 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 
 dependencies {
-	compile project(':androidplot-core')
-    compile 'com.crittercism:crittercism-android-agent:5.4.0'
+	implementation project(':androidplot-core')
+    implementation 'com.crittercism:crittercism-android-agent:5.4.0'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
 }
 
 buildscript {
diff --git a/docs/quickstart.md b/docs/quickstart.md
index ffc3827d..08abc2dd 100644
--- 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 {
-    compile "com.androidplot:androidplot-core:1.5.6"
+    compile "com.androidplot:androidplot-core:1.5.7"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
index 6bebeb8c..b67acaff 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -2,8 +2,15 @@
 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.6
 
+# 1.5.7
+* (#94) Potential fix / better error logging for a crash caused by a buffered canvas resize with illegal arguments.
+* (#93) Fix Android 9 compiler warnings.
+* (#83) Fix NPE when attempting to recycle an already null buffered canvas instance.
+* Remove unused `PlotRenderException`.
+* Added `IN_ORDER` BarRenderer mode.
+
+# 1.5.6
 * Adds convenience methods for saving / restoring `PanZoom` state.
 * (#80) Targets SDK 28, fixing compatibility issues.
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 42a64d0b..4c7210e5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 05 07:26:55 CST 2017
+#Fri Jul 19 09:24:31 CDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From 8ad3fca2e396ad77f13a3d5c134a449f966b38d7 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sat, 20 Jul 2019 12:11:12 -0500
Subject: [PATCH 10/38] fix play deploy

---
 demoapp/build.gradle                     | 31 ++++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index e0e1d1c2..191280a5 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -14,17 +14,8 @@
  *    limitations under the License.
  */
 
-apply plugin: 'com.android.application'
-apply plugin: 'com.github.triplet.play'
-
-dependencies {
-	implementation project(':androidplot-core')
-    implementation 'com.crittercism:crittercism-android-agent:5.4.0'
-
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
-    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
-}
+//apply plugin: 'com.android.application'
+//apply plugin: 'com.github.triplet.play'
 
 buildscript {
 
@@ -32,10 +23,24 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
+        classpath 'com.github.triplet.gradle:play-publisher:2.2.1'
     }
 }
 
+plugins {
+    id 'com.android.application'
+    id 'com.github.triplet.play' version '2.2.1'
+}
+
+dependencies {
+	implementation project(':androidplot-core')
+    implementation 'com.crittercism:crittercism-android-agent:5.4.0'
+
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+}
+
 android {
     compileSdkVersion theCompileSdkVersion
 
@@ -78,6 +83,6 @@ android {
 
 play {
     // see: https://github.com/Triple-T/gradle-play-publisher
-    jsonFile = file(System.getenv("PUBLISHER_ACCT_JSON_FILE") ?: "publisher.json")
+    serviceAccountCredentials = file(System.getenv("PUBLISHER_ACCT_JSON_FILE") ?: "publisher.json")
     track = 'beta'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4c7210e5..b37f1ae6 100644
--- 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-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip

From 3c1da1a5dab6c9f198624b7e894c5a8eec66311a Mon Sep 17 00:00:00 2001
From: JackJackE <37071007+mtjin@users.noreply.github.com>
Date: Thu, 26 Dec 2019 00:33:31 +0900
Subject: [PATCH 11/38] upgrade gradle version and refactoring code in a line
 that doesn't affect the program (#99)

---
 androidplot-core/build.gradle                    |  4 ++--
 build.gradle                                     |  4 ++--
 .../demos/BarPlotExampleActivity.java            |  2 ++
 .../androidplot/demos/DynamicXYPlotActivity.java | 16 ++++++++--------
 .../java/com/androidplot/demos/ECGExample.java   |  6 +++---
 .../com/androidplot/demos/ListViewActivity.java  |  8 ++++----
 .../demos/SimplePieChartActivity.java            |  2 ++
 .../androidplot/demos/TimeSeriesActivity.java    |  2 ++
 8 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 0592389b..e513a542 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -92,9 +92,9 @@ dependencies {
 
     implementation 'com.halfhp.fig:figlib:1.0.7'
     implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation "org.mockito:mockito-core:2.13.0"
+    testImplementation "org.mockito:mockito-core:3.0.0"
     testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation "org.robolectric:robolectric:4.0.1"
+    testImplementation "org.robolectric:robolectric:4.2.1"
 
     // temp fix for:
     // https://github.com/robolectric/robolectric/issues/1932
diff --git a/build.gradle b/build.gradle
index 41312fc7..a00c8e72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,9 +38,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
diff --git a/demoapp/src/main/java/com/androidplot/demos/BarPlotExampleActivity.java b/demoapp/src/main/java/com/androidplot/demos/BarPlotExampleActivity.java
index 8d8720d1..3cc2faa4 100644
--- a/demoapp/src/main/java/com/androidplot/demos/BarPlotExampleActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/BarPlotExampleActivity.java
@@ -22,6 +22,7 @@
 import java.text.ParsePosition;
 import java.util.Arrays;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -86,6 +87,7 @@ private enum SeriesSize {
 
     private Pair<Integer, XYSeries> selection;
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
diff --git a/demoapp/src/main/java/com/androidplot/demos/DynamicXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/DynamicXYPlotActivity.java
index f76dca01..f18b518b 100644
--- a/demoapp/src/main/java/com/androidplot/demos/DynamicXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/DynamicXYPlotActivity.java
@@ -138,8 +138,8 @@ public void notifyObservers() {
         private static final int MAX_AMP_SEED = 100;
         private static final int MIN_AMP_SEED = 10;
         private static final int AMP_STEP = 1;
-        public static final int SINE1 = 0;
-        public static final int SINE2 = 1;
+        static final int SINE1 = 0;
+        static final int SINE2 = 1;
         private static final int SAMPLE_SIZE = 31;
         private int phase = 0;
         private int sinAmp = 1;
@@ -150,7 +150,7 @@ public void notifyObservers() {
             notifier = new MyObservable();
         }
 
-        public void stopThread() {
+        void stopThread() {
             keepRunning = false;
         }
 
@@ -181,18 +181,18 @@ public void run() {
             }
         }
 
-        public int getItemCount(int series) {
+        int getItemCount(int series) {
             return SAMPLE_SIZE;
         }
 
-        public Number getX(int series, int index) {
+        Number getX(int series, int index) {
             if (index >= SAMPLE_SIZE) {
                 throw new IllegalArgumentException();
             }
             return index;
         }
 
-        public Number getY(int series, int index) {
+        Number getY(int series, int index) {
             if (index >= SAMPLE_SIZE) {
                 throw new IllegalArgumentException();
             }
@@ -208,7 +208,7 @@ public Number getY(int series, int index) {
             }
         }
 
-        public void addObserver(Observer observer) {
+        void addObserver(Observer observer) {
             notifier.addObserver(observer);
         }
 
@@ -223,7 +223,7 @@ class SampleDynamicSeries implements XYSeries {
         private int seriesIndex;
         private String title;
 
-        public SampleDynamicSeries(SampleDynamicXYDatasource datasource, int seriesIndex, String title) {
+        SampleDynamicSeries(SampleDynamicXYDatasource datasource, int seriesIndex, String title) {
             this.datasource = datasource;
             this.seriesIndex = seriesIndex;
             this.title = title;
diff --git a/demoapp/src/main/java/com/androidplot/demos/ECGExample.java b/demoapp/src/main/java/com/androidplot/demos/ECGExample.java
index 31d71e87..2bd7dec5 100644
--- a/demoapp/src/main/java/com/androidplot/demos/ECGExample.java
+++ b/demoapp/src/main/java/com/androidplot/demos/ECGExample.java
@@ -82,7 +82,7 @@ public static class MyFadeFormatter extends AdvancedLineAndPointRenderer.Formatt
 
         private int trailSize;
 
-        public MyFadeFormatter(int trailSize) {
+        MyFadeFormatter(int trailSize) {
             this.trailSize = trailSize;
         }
 
@@ -125,7 +125,7 @@ public static class ECGModel implements XYSeries {
          * @param size Sample size contained within this model
          * @param updateFreqHz Frequency at which new samples are added to the model
          */
-        public ECGModel(int size, int updateFreqHz) {
+        ECGModel(int size, int updateFreqHz) {
             data = new Number[size];
             for(int i = 0; i < data.length; i++) {
                 data[i] = 0;
@@ -176,7 +176,7 @@ public void run() {
             });
         }
 
-        public void start(final WeakReference<AdvancedLineAndPointRenderer> rendererRef) {
+        void start(final WeakReference<AdvancedLineAndPointRenderer> rendererRef) {
             this.rendererRef = rendererRef;
             keepRunning = true;
             thread.start();
diff --git a/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java b/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
index 9d640053..590af815 100644
--- a/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
@@ -78,10 +78,10 @@ protected void generateData() {
                 double bp = Math.random();
 
                 LineAndPointFormatter lpf = new LineAndPointFormatter(
-                        Color.rgb(new Double(rl * 255).intValue(),
-                                new Double(gl * 255).intValue(), new Double(bl * 255).intValue()),
-                        Color.rgb(new Double(rp * 255).intValue(),
-                                new Double(gp * 255).intValue(), new Double(bp * 255).intValue()),
+                        Color.rgb(Double.valueOf(rl * 255).intValue(),
+                                Double.valueOf(gl * 255).intValue(), Double.valueOf(bl * 255).intValue()),
+                        Color.rgb(Double.valueOf(rp * 255).intValue(),
+                                Double.valueOf(gp * 255).intValue(), Double.valueOf(bp * 255).intValue()),
                         null, null);
 
                 // for fun, configure interpolation on the formatter:
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimplePieChartActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimplePieChartActivity.java
index 9484176f..cf419083 100644
--- a/demoapp/src/main/java/com/androidplot/demos/SimplePieChartActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/SimplePieChartActivity.java
@@ -18,6 +18,7 @@
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.*;
 import android.os.Bundle;
@@ -52,6 +53,7 @@ public class SimplePieChartActivity extends Activity
     private Segment s3;
     private Segment s4;
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
diff --git a/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java b/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
index c5811bfc..9a8da790 100644
--- a/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
@@ -16,6 +16,7 @@
 
 package com.androidplot.demos;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
@@ -102,6 +103,7 @@ public void onCreate(Bundle savedInstanceState) {
                     // create a simple date format that draws on the year portion of our timestamp.
                     // see http://download.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html
                     // for a full description of SimpleDateFormat.
+                    @SuppressLint("SimpleDateFormat")
                     private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM yyyy");
 
                     @Override

From b275635276dc9023be0803c2bdc4b2ed516d1053 Mon Sep 17 00:00:00 2001
From: topherbuckley <topherbuckley@gmail.com>
Date: Sun, 19 Sep 2021 02:09:39 +0900
Subject: [PATCH 12/38] Quick start edits (#108)

* Changed compile keyword to implementation

This is to match updated gradel recommendations

* Reordered quickstart guide to avoid unresolved xml file errors

Creating the xml files first will remove the unresolved errors you get when copy/pasting the activity code. As people are inherently lazy to read ahead, I think this will eliminate some github issue requests in the future :D
---
 docs/quickstart.md | 55 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/docs/quickstart.md b/docs/quickstart.md
index 08abc2dd..18309987 100644
--- 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 {
-    compile "com.androidplot:androidplot-core:1.5.7"
+    implementation "com.androidplot:androidplot-core:1.5.7"
 }
 ```
 
@@ -55,6 +55,32 @@ directly within your Plot's XML, prefixing each property with "androidPlot".  Ex
 androidPlot.title="My Plot"
 ```
 
+Add these files to your **/res/xml** directory:
+
+#### /res/xml/line_point_formatter_with_labels.xml
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<config
+    linePaint.strokeWidth="5dp"
+    linePaint.color="#00AA00"
+    vertexPaint.color="#007700"
+    vertexPaint.strokeWidth="20dp"
+    fillPaint.color="#00000000"
+    pointLabelFormatter.textPaint.color="#CCCCCC"/>
+```
+
+#### /res/xml/line_point_formatter_with_labels_2.xml
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<config
+    linePaint.strokeWidth="5dp"
+    linePaint.color="#0000AA"
+    vertexPaint.strokeWidth="20dp"
+    vertexPaint.color="#000099"
+    fillPaint.color="#00000000"
+    pointLabelFormatter.textPaint.color="#CCCCCC"/>
+```
+
 # Create an Activity
 Now let's create an Activity to display the XYPlot we just defined in `simple_xy_plot_example.xml`.  
 The basic steps are:
@@ -151,7 +177,6 @@ public class SimpleXYPlotActivity extends Activity {
 }
 ```
 
-
 One potentially confusing section of the code above are the initializations of LineAndPointFormatter   
 You probably noticed that they take a mysterious reference to an xml resource file. This is actually 
 using [Fig](https://github.com/halfhp/fig) to configure the instance properties from XML.  
@@ -173,31 +198,5 @@ In general XML configuration should be used over programmatic configuration when
 more flexibility in terms of defining properties by screen density etc..  For more details on how to 
 programmatically configure Formatters etc. consult the latest Javadocs.
 
-Continuing with the original example above, add these files to your **/res/xml** directory:
-
-#### /res/xml/line_point_formatter_with_labels.xml
-```xml
-<?xml version="1.0" encoding="utf-8"?>
-<config
-    linePaint.strokeWidth="5dp"
-    linePaint.color="#00AA00"
-    vertexPaint.color="#007700"
-    vertexPaint.strokeWidth="20dp"
-    fillPaint.color="#00000000"
-    pointLabelFormatter.textPaint.color="#CCCCCC"/>
-```
-
-#### /res/xml/line_point_formatter_with_labels_2.xml
-```xml
-<?xml version="1.0" encoding="utf-8"?>
-<config
-    linePaint.strokeWidth="5dp"
-    linePaint.color="#0000AA"
-    vertexPaint.strokeWidth="20dp"
-    vertexPaint.color="#000099"
-    fillPaint.color="#00000000"
-    pointLabelFormatter.textPaint.color="#CCCCCC"/>
-```
-
 # Whats Next?
 Learn about [Plot Composition](plot_composition.md) or continue with [XYPlots](xyplot.md).
\ No newline at end of file

From 6079afc8f18c32efdb9c88b1186cc5300d14f0da Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 10:59:43 -0500
Subject: [PATCH 13/38] Project updates (#110)

---
 .circleci/config.yml                          |  15 +-
 README.md                                     |   2 +-
 androidplot-core/build.gradle                 | 129 +++++++++---------
 .../src/main/java/com/androidplot/Plot.java   |   3 +-
 .../com/androidplot/pie/PieLegendItem.java    |   2 +-
 .../com/androidplot/pie/PieLegendWidget.java  |   2 +-
 .../com/androidplot/ui/PositionMetrics.java   |   2 +-
 .../androidplot/ui/widget/LegendWidget.java   |   2 +-
 .../com/androidplot/ui/widget/Widget.java     |   4 +-
 .../java/com/androidplot/util/FastNumber.java |   4 +-
 .../xy/FastLineAndPointRenderer.java          |   2 +-
 .../xy/FixedSizeEditableXYSeries.java         |   4 +-
 .../main/java/com/androidplot/xy/PanZoom.java |   2 +-
 .../com/androidplot/xy/XYConstraints.java     |   4 +-
 .../com/androidplot/xy/XYGraphWidget.java     |   4 +-
 .../java/com/androidplot/xy/XYLegendItem.java |   2 +-
 .../com/androidplot/xy/XYLegendWidget.java    |   2 +-
 .../main/java/com/androidplot/xy/XYPlot.java  |   2 +-
 .../com/androidplot/ui/widget/WidgetTest.java |   2 +-
 .../com/androidplot/xy/XYGraphWidgetTest.java |   4 +-
 build.gradle                                  |  23 +---
 demoapp-wearable/build.gradle                 |   8 +-
 demoapp/build.gradle                          |  16 +--
 .../demos/AnimatedXYPlotActivity.java         |   2 +-
 .../demos/CandlestickChartActivity.java       |   2 +-
 .../androidplot/demos/DualScaleActivity.java  |   2 +-
 .../androidplot/demos/ListViewActivity.java   |   2 +-
 .../demos/SimpleXYPlotActivity.java           |   2 +-
 .../demos/StepChartExampleActivity.java       |   2 +-
 .../androidplot/demos/TimeSeriesActivity.java |   2 +-
 docs/quickstart.md                            |   5 +-
 gradle.properties                             |   2 +
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 33 files changed, 124 insertions(+), 139 deletions(-)
 create mode 100644 gradle.properties

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f333b5c2..bf60104b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
 
       # CircleCI maintains a library of pre-built images
             # documented at https://circleci.com/docs/2.0/circleci-images/
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-30
 
     working_directory: ~/repo
 
@@ -87,17 +87,10 @@ jobs:
           path: androidplot-core/build/test-results/
 
       - deploy:
-          name: "Deploy to Bintray"
+          name: "Publish"
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ];
-              then ./gradlew bintrayUpload;
-            fi
-
-      - deploy:
-          name: "Deploy to Google Play"
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ];
+            if [ "${CIRCLE_BRANCH}" == "project-updates" ];
               then
                 ./misc/download_google_publisher_json.sh;
-                ./gradlew publishApkRelease
+                ./gradlew publish;
             fi
\ No newline at end of file
diff --git a/README.md b/README.md
index 7d7020d2..42b3f9ea 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Technical questions should be posted using the [androidplot tag](http://stackove
 # License
 Androidplot has been made available under the Apache 2.0 license:
 
-    Copyright 2018 Androidplot.com
+    Copyright 2021 Androidplot.com
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index e513a542..3d255cc2 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -14,10 +14,12 @@
  *    limitations under the License.
  */
 
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-apply plugin: 'jacoco-android'
+plugins {
+    id 'com.android.library'
+    id 'com.dicedmelon.gradle.jacoco-android'
+    id 'maven-publish'
+    id 'signing'
+}
 
 class AttrMarkdown extends DefaultTask {
 
@@ -59,8 +61,6 @@ android {
     compileSdkVersion theCompileSdkVersion
 
     defaultConfig {
-        versionCode theVersionCode
-        versionName theVersionName
         minSdkVersion theMinSdkVersion
         targetSdkVersion theTargetSdkVersion
         testApplicationId "com.androidplot.test"
@@ -70,14 +70,13 @@ android {
         unitTests.all {
             jacoco {
                 includeNoLocationClasses = true
+                jacoco.excludes = ['jdk.internal.*']
             }
         }
     }
 
-    /**
-     * TODO: enable and address lint issues.
-     */
     lintOptions {
+        // TODO: enable and address lint issues.
         abortOnError false
     }
 }
@@ -90,15 +89,12 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git'
 
 dependencies {
 
-    implementation 'com.halfhp.fig:figlib:1.0.7'
+    implementation 'com.halfhp.fig:figlib:1.0.11'
     implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation "org.mockito:mockito-core:3.0.0"
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation "org.robolectric:robolectric:4.2.1"
 
-    // temp fix for:
-    // https://github.com/robolectric/robolectric/issues/1932
-    testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
+    testImplementation "org.mockito:mockito-core:3.9.0"
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation "org.robolectric:robolectric:4.5.1"
 }
 
 task javadoc(type: Javadoc) {
@@ -123,63 +119,70 @@ task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
 }
 
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                name 'Androidplot Core Library'
-                description = "Androidplot is a library for creating dynamic and static charts within your Android application."
-                url siteUrl
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'halfhp'
-                        name 'Nick Fellows'
-                        email 'halfhp@gmail.com'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
+javadoc {
+    options.overview = "src/main/java/overview.html"
+}
 
+afterEvaluate {
+    publishing {
+        repositories {
+            maven {
+                name = "Maven Central"
+                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                credentials {
+                    username = System.getenv("OSSRH_ACTOR")
+                    password = System.getenv("OSSRH_TOKEN")
                 }
             }
         }
-    }
-}
-
-bintray {
-
-    // these environment vars must be set when deploying to bintray.
-    // note: BINTRAY_PASSWORD is actually the api key, but naming it 'password'
-    // tells the CI environment to obfuscate the value in public logs.
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_PASSWORD')
 
+        publications {
+            release(MavenPublication) {
+
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = 'com.androidplot'
+                artifactId = 'androidplot'
+                version = theVersionName
+
+                pom {
+                    packaging 'aar'
+                    name = 'Androidplot'
+                    description = "Configure any object from XML."
+                    url = gitUrl
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
+                    }
+                    developers {
+                        developer {
+                            id = 'halfhp'
+                            name = 'Nick Fellows'
+                            email = 'halfhp@gmail.com'
+                        }
+                    }
+                    scm {
+                        connection = gitUrl
+                        developerConnection = gitUrl
+                        url = gitUrl
 
-    configurations = ['archives']
-    pkg {
-        version {
-            name = theVersionName
+                    }
+                }
+            }
         }
-        repo = "androidplot"
-        name = "com.androidplot:androidplot-core"
-        issueTrackerUrl = "https://github.com/halfhp/androidplot/issues"
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = ["Apache-2.0"]
     }
 }
 
-javadoc {
-    options.overview = "src/main/java/overview.html"
+afterEvaluate {
+    signing {
+        def signingKey = System.getenv("SIGNING_KEY")
+        def signingPassword = System.getenv("SIGNING_PASSWORD")
+        useInMemoryPgpKeys(signingKey, signingPassword)
+        sign publishing.publications.release
+    }
 }
 
 artifacts {
diff --git a/androidplot-core/src/main/java/com/androidplot/Plot.java b/androidplot-core/src/main/java/com/androidplot/Plot.java
index 47ef0fd6..925a9c78 100644
--- a/androidplot-core/src/main/java/com/androidplot/Plot.java
+++ b/androidplot-core/src/main/java/com/androidplot/Plot.java
@@ -26,11 +26,12 @@
 import android.graphics.RectF;
 import android.os.Build;
 import android.os.Looper;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.androidplot.ui.Anchor;
 import com.androidplot.ui.BoxModel;
 import com.androidplot.ui.Formatter;
diff --git a/androidplot-core/src/main/java/com/androidplot/pie/PieLegendItem.java b/androidplot-core/src/main/java/com/androidplot/pie/PieLegendItem.java
index 8b4e9913..669b188b 100644
--- a/androidplot-core/src/main/java/com/androidplot/pie/PieLegendItem.java
+++ b/androidplot-core/src/main/java/com/androidplot/pie/PieLegendItem.java
@@ -1,7 +1,7 @@
 package com.androidplot.pie;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.widget.LegendItem;
 
diff --git a/androidplot-core/src/main/java/com/androidplot/pie/PieLegendWidget.java b/androidplot-core/src/main/java/com/androidplot/pie/PieLegendWidget.java
index c59b7f0b..4d1ccd03 100644
--- a/androidplot-core/src/main/java/com/androidplot/pie/PieLegendWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/pie/PieLegendWidget.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.SeriesBundle;
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/PositionMetrics.java b/androidplot-core/src/main/java/com/androidplot/ui/PositionMetrics.java
index 88efddcb..377e9e04 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/PositionMetrics.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/PositionMetrics.java
@@ -16,7 +16,7 @@
 
 package com.androidplot.ui;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class PositionMetrics implements Comparable<PositionMetrics> {
 
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java b/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
index e9222888..0da56a3a 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/widget/LegendWidget.java
@@ -4,7 +4,7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.Size;
 import com.androidplot.ui.TableModel;
diff --git a/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java b/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
index 87a43a02..6d21767b 100644
--- a/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
+++ b/androidplot-core/src/main/java/com/androidplot/ui/widget/Widget.java
@@ -17,8 +17,8 @@
 package com.androidplot.ui.widget;
 
 import android.graphics.*;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.*;
 import com.androidplot.util.DisplayDimensions;
diff --git a/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java b/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java
index 72e8a25d..4fa11d8a 100644
--- a/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java
+++ b/androidplot-core/src/main/java/com/androidplot/util/FastNumber.java
@@ -1,7 +1,7 @@
 package com.androidplot.util;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * An extension of {@link Number} optimized for speed at the cost of memory.
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
index 5f469ce2..df070325 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/FastLineAndPointRenderer.java
@@ -20,7 +20,7 @@
 import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.RenderStack;
 import com.androidplot.ui.SeriesRenderer;
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/FixedSizeEditableXYSeries.java b/androidplot-core/src/main/java/com/androidplot/xy/FixedSizeEditableXYSeries.java
index 0e6ea1a1..36ff371e 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/FixedSizeEditableXYSeries.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/FixedSizeEditableXYSeries.java
@@ -1,7 +1,7 @@
 package com.androidplot.xy;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.androidplot.util.FastNumber;
 
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java b/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
index 33d61369..9cd80847 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/PanZoom.java
@@ -2,7 +2,7 @@
 
 import android.graphics.RectF;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.*;
 
 import com.androidplot.*;
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java b/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java
index 58338264..c4452d33 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYConstraints.java
@@ -16,8 +16,8 @@
 
 package com.androidplot.xy;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Calculates the min/max constraints for an xy plane.
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
index af1f2729..4f6fa04a 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYGraphWidget.java
@@ -22,8 +22,8 @@
 import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.androidplot.R;
 import com.androidplot.Region;
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYLegendItem.java b/androidplot-core/src/main/java/com/androidplot/xy/XYLegendItem.java
index 1fd10ebd..51c67159 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYLegendItem.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYLegendItem.java
@@ -1,6 +1,6 @@
 package com.androidplot.xy;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.widget.LegendItem;
 
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYLegendWidget.java b/androidplot-core/src/main/java/com/androidplot/xy/XYLegendWidget.java
index f08783cb..680fd4b2 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYLegendWidget.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYLegendWidget.java
@@ -17,7 +17,7 @@
 package com.androidplot.xy;
 
 import android.graphics.*;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.ui.LayoutManager;
 import com.androidplot.ui.SeriesBundle;
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/XYPlot.java b/androidplot-core/src/main/java/com/androidplot/xy/XYPlot.java
index 67eaafa8..e519b5a0 100644
--- a/androidplot-core/src/main/java/com/androidplot/xy/XYPlot.java
+++ b/androidplot-core/src/main/java/com/androidplot/xy/XYPlot.java
@@ -22,7 +22,7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 
 import com.androidplot.Plot;
diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
index 408edc33..ce398dc9 100644
--- a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.test.AndroidplotTest;
 import com.androidplot.ui.Anchor;
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
index 03897972..5a0da878 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -298,10 +298,10 @@ public void seriesToScreenY_returnsScreenValue() {
 
     @Test
     public void setGridInsets_updatesGridRect() {
-        graphWidget.setGridInsets(new Insets(0, 0, 0, 0));
+        graphWidget.setGridInsets(new com.androidplot.ui.Insets(0, 0, 0, 0));
         final RectF oldRect = graphWidget.getGridRect();
 
-        graphWidget.setGridInsets(new Insets(2, 2, 2, 2));
+        graphWidget.setGridInsets(new com.androidplot.ui.Insets(2, 2, 2, 2));
         final RectF newRect = graphWidget.getGridRect();
 
         assertEquals(oldRect.left + 2, newRect.left);
diff --git a/build.gradle b/build.gradle
index a00c8e72..96bd5758 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,34 +14,25 @@
  *    limitations under the License.
  */
 
-apply plugin: 'java'
-
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
-
 ext {
-    theCompileSdkVersion = 28
-    theTargetSdkVersion = 28
+    theCompileSdkVersion = 30
+    theTargetSdkVersion = 30
     theMinSdkVersion = 5
-    theVersionName = '1.5.7'
+    theVersionName = '1.5.8'
     theVersionCode = 1
+    gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
 
 buildscript {
     repositories {
         mavenCentral()
-        jcenter()
+        maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5-SNAPSHOT'
     }
 }
 
diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle
index 22e5186d..3bfc0ee0 100644
--- a/demoapp-wearable/build.gradle
+++ b/demoapp-wearable/build.gradle
@@ -16,18 +16,14 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }
-apply plugin: 'com.android.application'
 
-repositories {
-    jcenter()
-}
+apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion theCompileSdkVersion
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index 191280a5..a5583eb9 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -14,22 +14,19 @@
  *    limitations under the License.
  */
 
-//apply plugin: 'com.android.application'
-//apply plugin: 'com.github.triplet.play'
-
 buildscript {
 
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.github.triplet.gradle:play-publisher:2.2.1'
+        classpath 'com.github.triplet.gradle:play-publisher:3.6.0'
     }
 }
 
 plugins {
     id 'com.android.application'
-    id 'com.github.triplet.play' version '2.2.1'
+    id 'com.github.triplet.play' version '3.6.0'
 }
 
 dependencies {
@@ -37,7 +34,9 @@ dependencies {
     implementation 'com.crittercism:crittercism-android-agent:5.4.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
+
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
 }
 
@@ -72,17 +71,14 @@ android {
         }
     }
 
-
-    /**
-     * TODO: uncomment this and address all the lint issues.
-     */
     lintOptions {
+        // TODO: set to true and address all the lint issues.
         abortOnError false
     }
 }
 
 play {
     // see: https://github.com/Triple-T/gradle-play-publisher
-    serviceAccountCredentials = file(System.getenv("PUBLISHER_ACCT_JSON_FILE") ?: "publisher.json")
+    serviceAccountCredentials.set(file(System.getenv("PUBLISHER_ACCT_JSON_FILE") ?: "publisher.json"))
     track = 'beta'
 }
diff --git a/demoapp/src/main/java/com/androidplot/demos/AnimatedXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/AnimatedXYPlotActivity.java
index 75d9553b..43d3adc0 100644
--- a/demoapp/src/main/java/com/androidplot/demos/AnimatedXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/AnimatedXYPlotActivity.java
@@ -21,7 +21,7 @@
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
 import com.androidplot.xy.BoundaryMode;
diff --git a/demoapp/src/main/java/com/androidplot/demos/CandlestickChartActivity.java b/demoapp/src/main/java/com/androidplot/demos/CandlestickChartActivity.java
index 2c37580a..86ae1fbb 100644
--- a/demoapp/src/main/java/com/androidplot/demos/CandlestickChartActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/CandlestickChartActivity.java
@@ -21,7 +21,7 @@
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.Region;
 import com.androidplot.util.PixelUtils;
diff --git a/demoapp/src/main/java/com/androidplot/demos/DualScaleActivity.java b/demoapp/src/main/java/com/androidplot/demos/DualScaleActivity.java
index d164710a..f0116121 100644
--- a/demoapp/src/main/java/com/androidplot/demos/DualScaleActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/DualScaleActivity.java
@@ -20,7 +20,7 @@
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.BoundaryMode;
diff --git a/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java b/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
index 590af815..290b7802 100644
--- a/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/ListViewActivity.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
index 46118949..db3a5a28 100644
--- a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
@@ -19,7 +19,7 @@
 import android.app.Activity;
 import android.graphics.DashPathEffect;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.CatmullRomInterpolator;
diff --git a/demoapp/src/main/java/com/androidplot/demos/StepChartExampleActivity.java b/demoapp/src/main/java/com/androidplot/demos/StepChartExampleActivity.java
index 79b8272f..4b1fdc35 100644
--- a/demoapp/src/main/java/com/androidplot/demos/StepChartExampleActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/StepChartExampleActivity.java
@@ -23,7 +23,7 @@
 import android.graphics.Paint;
 import android.graphics.Shader;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.SimpleXYSeries;
diff --git a/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java b/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
index 9a8da790..12930bd7 100644
--- a/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/TimeSeriesActivity.java
@@ -22,7 +22,7 @@
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.androidplot.util.PixelUtils;
 import com.androidplot.xy.BoundaryMode;
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 18309987..2f1853d2 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -14,10 +14,13 @@ To use the library in your gradle project add the following to your build.gradle
 
 ```groovy
 dependencies {
-    implementation "com.androidplot:androidplot-core:1.5.7"
+    implementation "com.androidplot:androidplot-core:1.5.8"
 }
 ```
 
+*NOTE: As of version 1.5.8 Androidplot has migrated over from the Android Support Libraries to androidx.
+If you have a very old project and experience issues, may need to stay on version 1.5.7*
+
 If you’re using Proguard obfuscation (Projects created by Android Studio do by default) you’ll also 
 want add this to your proguard-rules.pro file:
 
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..d015431a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b37f1ae6..0a24689e 100644
--- 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-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

From 44042626cefab91712dcbb923af2332f6438affe Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 17:19:54 -0500
Subject: [PATCH 14/38] render mode attrs should have a distinct ordinal value
 (#111)

---
 .../src/main/java/com/androidplot/Plot.java   | 22 +++++++++----------
 .../src/main/res/values/attrs.xml             |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/androidplot-core/src/main/java/com/androidplot/Plot.java b/androidplot-core/src/main/java/com/androidplot/Plot.java
index 925a9c78..ac2d6a09 100644
--- a/androidplot-core/src/main/java/com/androidplot/Plot.java
+++ b/androidplot-core/src/main/java/com/androidplot/Plot.java
@@ -145,25 +145,25 @@ public enum BorderStyle {
      */
     public enum RenderMode {
         /**
-         * Use a second thread and an off-screen buffer to do drawing.  This is the preferred method
-         * of drawing dynamic data and static data that consists of a large number of points.  This mode
-         * provides more efficient CPU utilization at the cost of increased memory usage.  As of
-         * version 0.5.1 this is the default RenderMode.
+         * Do everything in the primary thread.  This is the preferred method of drawing static charts
+         * and dynamic data that consists of a small number of points. This mode uses less memory at
+         * the cost of poor CPU utilization.
          *
-         * XML value: use_background_thread
+         * XML value: use_main_thread
          * @since 0.5.1
          */
-        USE_BACKGROUND_THREAD,
+        USE_MAIN_THREAD,
 
         /**
-         * Do everything in the primary thread.  This is the preferred method of drawing static charts
-         * and dynamic data that consists of a small number of points. This mode uses less memory at
-         * the cost of poor CPU utilization.
+         * Use a second thread and an off-screen buffer to do drawing.  This is the preferred method
+         * of drawing dynamic data and static data that consists of a large number of points.  This mode
+         * provides more efficient CPU utilization at the cost of increased memory usage.  As of
+         * version 0.5.1 this is the default RenderMode.
          *
-         * XML value: use_main_thread
+         * XML value: use_background_thread
          * @since 0.5.1
          */
-        USE_MAIN_THREAD
+        USE_BACKGROUND_THREAD
     }
     private BoxModel boxModel = new BoxModel();
 
diff --git a/androidplot-core/src/main/res/values/attrs.xml b/androidplot-core/src/main/res/values/attrs.xml
index 535ccf18..5c714912 100644
--- a/androidplot-core/src/main/res/values/attrs.xml
+++ b/androidplot-core/src/main/res/values/attrs.xml
@@ -30,8 +30,8 @@ Supported Elements:
 <resources>
 
     <attr name="renderMode" format="enum">
-        <enum name="use_background_thread" value="0"/>
         <enum name="use_main_thread" value="0"/>
+        <enum name="use_background_thread" value="1"/>
     </attr>
 
     <attr name="previewMode" format="enum">

From b365c634ad994386c85440d656e69071870a8beb Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 17:29:06 -0500
Subject: [PATCH 15/38] fix androidplot artifact coordinates (#112)

---
 androidplot-core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 3d255cc2..e81e40a2 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -143,7 +143,7 @@ afterEvaluate {
 
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.androidplot'
-                artifactId = 'androidplot'
+                artifactId = 'androidplot-core'
                 version = theVersionName
 
                 pom {

From 0a2e28251a4458a3486db4da0a4e2f856d07a7bb Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 18:05:52 -0500
Subject: [PATCH 16/38] #104 - Add support for redrawing plots inside
 recyclerview + example (#113)

---
 .../src/main/java/com/androidplot/Plot.java   |  86 +++++---
 demoapp/build.gradle                          |  15 +-
 demoapp/src/main/AndroidManifest.xml          |   1 +
 .../com/androidplot/demos/MainActivity.java   | 193 ------------------
 .../com/androidplot/demos/MainActivity.kt     | 122 +++++++++++
 .../androidplot/demos/RecyclerViewActivity.kt | 130 ++++++++++++
 demoapp/src/main/res/layout/main.xml          |   7 +
 .../main/res/layout/recyclerview_example.xml  |  31 +++
 .../res/layout/recyclerview_example_item.xml  |  25 +++
 docs/quickstart.md                            |   2 +-
 docs/release_notes.md                         |   7 +
 11 files changed, 397 insertions(+), 222 deletions(-)
 delete mode 100644 demoapp/src/main/java/com/androidplot/demos/MainActivity.java
 create mode 100644 demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
 create mode 100644 demoapp/src/main/java/com/androidplot/demos/RecyclerViewActivity.kt
 create mode 100644 demoapp/src/main/res/layout/recyclerview_example.xml
 create mode 100644 demoapp/src/main/res/layout/recyclerview_example_item.xml

diff --git a/androidplot-core/src/main/java/com/androidplot/Plot.java b/androidplot-core/src/main/java/com/androidplot/Plot.java
index ac2d6a09..63d2e831 100644
--- a/androidplot-core/src/main/java/com/androidplot/Plot.java
+++ b/androidplot-core/src/main/java/com/androidplot/Plot.java
@@ -212,6 +212,8 @@ public enum RenderMode {
      *  that is being used.
      */
     private static class BufferedCanvas {
+        private int lastHeight = 0;
+        private int lastWidth = 0;
         private volatile Bitmap bgBuffer;  // all drawing is done on this buffer.
         private volatile Bitmap fgBuffer;
         private Canvas canvas = new Canvas();
@@ -226,11 +228,21 @@ public synchronized void swap() {
             fgBuffer = tmp;
         }
 
+        /**
+         * Used when rendering in background mode and a view is attached
+         * but not resized, so that rendering buffers will be reinitialized.
+         */
+        public void resizeToLast() {
+            resize(lastHeight, lastWidth);
+        }
+
         public synchronized void resize(int h, int w) {
             if (w <= 0 || h <= 0) {
                 bgBuffer = null;
                 fgBuffer = null;
             } else {
+                lastHeight = h;
+                lastWidth = w;
                 try {
                     bgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
                     fgBuffer = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
@@ -408,35 +420,43 @@ protected final void init(Context context, AttributeSet attrs, int defStyle) {
 
         layoutManager.onPostInit();
         if (renderMode == RenderMode.USE_BACKGROUND_THREAD) {
-            renderThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-
-                    keepRunning = true;
-                    while (keepRunning) {
-                        isIdle = false;
-                        synchronized (pingPong) {
-                            Canvas c = pingPong.getCanvas();
-                            renderOnCanvas(c);
-                            pingPong.swap();
-                        }
-                        synchronized (renderSync) {
-                            postInvalidate();
-                            // prevent this thread from becoming an orphan
-                            // after the view is destroyed
-                            if (keepRunning) {
-                                try {
-                                    renderSync.wait();
-                                } catch (InterruptedException e) {
-                                    keepRunning = false;
-                                }
-                            }
+            startBackgroundRendering();
+        }
+    }
+
+    protected void startBackgroundRendering() {
+        if(renderThread != null) {
+            return;
+        }
+
+        renderThread = new Thread(() -> {
+            System.out.println("Thread started with id " + this.hashCode());
+
+            keepRunning = true;
+            while (keepRunning) {
+                isIdle = false;
+                synchronized (pingPong) {
+                    Canvas c = pingPong.getCanvas();
+                    renderOnCanvas(c);
+                    pingPong.swap();
+                }
+                synchronized (renderSync) {
+                    postInvalidate();
+                    // prevent this thread from becoming an orphan
+                    // after the view is destroyed
+                    if (keepRunning) {
+                        try {
+                            renderSync.wait();
+                        } catch (InterruptedException e) {
+                            keepRunning = false;
                         }
                     }
-                    pingPong.recycle();
                 }
-            }, "Androidplot renderThread");
-        }
+            }
+            System.out.println("Thread exited with id " + this.hashCode());
+            renderThread = null;
+            pingPong.recycle();
+        }, "Androidplot renderThread");
     }
 
     /**
@@ -745,11 +765,12 @@ public void redraw() {
             // only enter synchronized block if the call is expected to block OR
             // if the render thread is idle, so we know that we won't have to wait to
             // obtain a lock.
-            if (isIdle) {
+            if (renderThread != null && isIdle) {
                 synchronized (renderSync) {
                     renderSync.notify();
                 }
             }
+
         } else if(renderMode == RenderMode.USE_MAIN_THREAD) {
 
             // are we on the UI thread?
@@ -778,6 +799,17 @@ protected void onDetachedFromWindow() {
         }
     }
 
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        // necessary to support rendering in recyclerview etc.
+        if(renderMode == RenderMode.USE_BACKGROUND_THREAD && renderThread == null) {
+            pingPong.resizeToLast();
+            startBackgroundRendering();
+            renderThread.start();
+        }
+    }
 
     @Override
     protected synchronized void onSizeChanged (int w, int h, int oldw, int oldh) {
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index a5583eb9..b8b76251 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -15,12 +15,13 @@
  */
 
 buildscript {
-
+    ext.kotlin_version = '1.5.31'
     repositories {
         mavenCentral()
     }
     dependencies {
         classpath 'com.github.triplet.gradle:play-publisher:3.6.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -29,9 +30,14 @@ plugins {
     id 'com.github.triplet.play' version '3.6.0'
 }
 
+apply plugin: 'kotlin-android'
+
 dependencies {
+    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 	implementation project(':androidplot-core')
     implementation 'com.crittercism:crittercism-android-agent:5.4.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
 
@@ -43,6 +49,10 @@ dependencies {
 android {
     compileSdkVersion theCompileSdkVersion
 
+    buildFeatures {
+        viewBinding true
+    }
+
     defaultConfig {
         versionCode theVersionCode
         versionName theVersionName
@@ -82,3 +92,6 @@ play {
     serviceAccountCredentials.set(file(System.getenv("PUBLISHER_ACCT_JSON_FILE") ?: "publisher.json"))
     track = 'beta'
 }
+repositories {
+    mavenCentral()
+}
diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml
index 89f1428f..16245b9f 100644
--- a/demoapp/src/main/AndroidManifest.xml
+++ b/demoapp/src/main/AndroidManifest.xml
@@ -95,6 +95,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ListViewActivity" android:label="ListView Example"/>
+        <activity android:name=".RecyclerViewActivity" android:label="RecyclerView Example"/>
         <activity android:name=".XYRegionExampleActivity" android:label="XYRegion Example">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/demoapp/src/main/java/com/androidplot/demos/MainActivity.java b/demoapp/src/main/java/com/androidplot/demos/MainActivity.java
deleted file mode 100644
index 86dadb68..00000000
--- a/demoapp/src/main/java/com/androidplot/demos/MainActivity.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright 2015 AndroidPlot.com
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package com.androidplot.demos;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import com.crittercism.app.Crittercism;
-
-public class MainActivity extends Activity {
-
-    private static final String TAG = MainActivity.class.getName();
-
-    // DO *NOT* CHANGE THIS LINE! (CI-MATCH-POPULATE)
-    private static final String CRITTERCISM_APP_ID = null;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (CRITTERCISM_APP_ID != null) {
-            Log.d(TAG, "Crittercism initialized.");
-            Crittercism.initialize(getApplicationContext(), CRITTERCISM_APP_ID);
-        }
-
-        setContentView(R.layout.main);
-
-        Button startAnimatedXYPlotExButton = (Button) findViewById(R.id.animatedXYPlotExButton);
-        startAnimatedXYPlotExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, AnimatedXYPlotActivity.class));
-            }
-        });
-
-        Button startScatterPlotExButton = (Button) findViewById(R.id.startScatterExButton);
-        startScatterPlotExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, ScatterPlotActivity.class));
-            }
-        });
-
-        Button startSimplePieExButton = (Button) findViewById(R.id.startSimplePieExButton);
-        startSimplePieExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, SimplePieChartActivity.class));
-            }
-        });
-
-        Button startDynamicXYExButton = (Button) findViewById(R.id.startDynamicXYExButton);
-        startDynamicXYExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, DynamicXYPlotActivity.class));
-            }
-        });
-
-        Button startCandlestickExButton = (Button) findViewById(R.id.startCandlestickExButton);
-        startCandlestickExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, CandlestickChartActivity.class));
-            }
-        });
-
-        Button startSimpleXYExButton = (Button) findViewById(R.id.startSimpleXYExButton);
-        startSimpleXYExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, SimpleXYPlotActivity.class));
-            }
-        });
-
-        Button startBarPlotExButton = (Button) findViewById(R.id.startBarPlotExButton);
-        startBarPlotExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, BarPlotExampleActivity.class));
-            }
-        });
-
-        Button startOrSensorExButton = (Button) findViewById(R.id.startOrSensorExButton);
-        startOrSensorExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, OrientationSensorExampleActivity.class));
-            }
-        });
-
-        Button startDualScaleExButton = (Button) findViewById(R.id.startDualScaleExButton);
-        startDualScaleExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, DualScaleActivity.class));
-            }
-        });
-
-        Button startTimeSeriesExButon = (Button) findViewById(R.id.startTimeSeriesExButton);
-        startTimeSeriesExButon.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, TimeSeriesActivity.class));
-            }
-        });
-
-        Button startStepChartExButton = (Button) findViewById(R.id.startStepChartExButton);
-        startStepChartExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, StepChartExampleActivity.class));
-            }
-        });
-
-        Button startScrollZoomExButton = (Button) findViewById(R.id.startScrollZoomButton);
-        startScrollZoomExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, TouchZoomExampleActivity.class));
-            }
-        });
-
-        Button startXyRegionExampleButton = (Button) findViewById(R.id.startXyRegionExampleButton);
-        startXyRegionExampleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, XYRegionExampleActivity.class));
-            }
-        });
-
-
-        Button listViewExButton = (Button) findViewById(R.id.startXyListViewExButton);
-        listViewExButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, ListViewActivity.class));
-            }
-        });
-
-        Button startXYPlotWithBgImgExampleButton = (Button) findViewById(R.id.startXYPlotWithBgImgExample);
-        startXYPlotWithBgImgExampleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, XYPlotWithBgImgActivity.class));
-            }
-        });
-
-        // ECG
-        Button startECGExampleButton = (Button) findViewById(R.id.startECGExample);
-        startECGExampleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, ECGExample.class));
-            }
-        });
-
-        // f(x) plot
-        Button fxPlotExampleButton = (Button) findViewById(R.id.fxPlotExample);
-        fxPlotExampleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, FXPlotExampleActivity.class));
-            }
-        });
-
-        // bubble chart
-        Button bubbleChartButton = (Button) findViewById(R.id.bubbleChartExample);
-        bubbleChartButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, BubbleChartActivity.class));
-            }
-        });
-    }
-}
diff --git a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
new file mode 100644
index 00000000..6c8320e1
--- /dev/null
+++ b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2021 AndroidPlot.com
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.androidplot.demos
+
+import android.app.Activity
+import android.os.Bundle
+import com.crittercism.app.Crittercism
+import android.content.Intent
+import android.util.Log
+import com.androidplot.demos.databinding.MainBinding
+
+class MainActivity : Activity() {
+
+    private lateinit var binding: MainBinding
+
+    companion object {
+        private val TAG = MainActivity::class.java.name
+
+        // DO *NOT* CHANGE THIS LINE! (CI-MATCH-POPULATE)
+        private val CRITTERCISM_APP_ID: String? = null
+    }
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = MainBinding.inflate(layoutInflater)
+        if (CRITTERCISM_APP_ID != null) {
+            Log.d(TAG, "Crittercism initialized.")
+            Crittercism.initialize(applicationContext, CRITTERCISM_APP_ID)
+        }
+
+        binding.animatedXYPlotExButton.setOnClickListener {
+            startActivity(Intent(this, AnimatedXYPlotActivity::class.java))
+        }
+
+        binding.startScatterExButton.setOnClickListener {
+            startActivity(Intent(this, ScatterPlotActivity::class.java))
+        }
+
+        binding.startSimplePieExButton.setOnClickListener {
+            startActivity(Intent(this, SimplePieChartActivity::class.java))
+        }
+
+        binding.startDynamicXYExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, DynamicXYPlotActivity::class.java))
+        }
+
+        binding.startCandlestickExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, CandlestickChartActivity::class.java))
+        }
+
+        binding.startSimpleXYExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, SimpleXYPlotActivity::class.java))
+        }
+
+        binding.startBarPlotExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, BarPlotExampleActivity::class.java))
+        }
+
+        binding.startOrSensorExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, OrientationSensorExampleActivity::class.java))
+        }
+
+        binding.startDualScaleExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, DualScaleActivity::class.java))
+        }
+
+        binding.startTimeSeriesExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, TimeSeriesActivity::class.java))
+        }
+
+        binding.startStepChartExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, StepChartExampleActivity::class.java))
+        }
+
+        binding.startScrollZoomButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, TouchZoomExampleActivity::class.java))
+        }
+
+        binding.startXyRegionExampleButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, XYRegionExampleActivity::class.java))
+        }
+
+        binding.startXyListViewExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, ListViewActivity::class.java))
+        }
+
+        binding.startXyRecyclerViewExButton.setOnClickListener {
+            startActivity(Intent(this@MainActivity, RecyclerViewActivity::class.java))
+        }
+
+        binding.startXYPlotWithBgImgExample.setOnClickListener {
+            startActivity(Intent(this@MainActivity, XYPlotWithBgImgActivity::class.java))
+        }
+
+        binding.startECGExample.setOnClickListener {
+            startActivity(Intent(this@MainActivity, ECGExample::class.java))
+        }
+
+        binding.fxPlotExample.setOnClickListener {
+            startActivity(Intent(this@MainActivity, FXPlotExampleActivity::class.java))
+        }
+
+        binding.bubbleChartExample.setOnClickListener {
+            startActivity(Intent(this@MainActivity, BubbleChartActivity::class.java))
+        }
+
+        setContentView(binding.root)
+    }
+}
\ No newline at end of file
diff --git a/demoapp/src/main/java/com/androidplot/demos/RecyclerViewActivity.kt b/demoapp/src/main/java/com/androidplot/demos/RecyclerViewActivity.kt
new file mode 100644
index 00000000..194ee6e0
--- /dev/null
+++ b/demoapp/src/main/java/com/androidplot/demos/RecyclerViewActivity.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2021 AndroidPlot.com
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.androidplot.demos
+
+import android.app.Activity
+import android.graphics.Color
+import com.androidplot.ui.SeriesBundle
+import android.os.Bundle
+import android.view.ViewGroup
+import android.view.LayoutInflater
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.androidplot.demos.databinding.RecyclerviewExampleBinding
+import com.androidplot.demos.databinding.RecyclerviewExampleItemBinding
+import com.androidplot.util.PixelUtils
+import com.androidplot.xy.*
+import java.util.*
+
+class RecyclerViewActivity : Activity() {
+    private lateinit var binding: RecyclerviewExampleBinding
+
+    companion object {
+        private const val NUM_PLOTS = 10
+        private const val NUM_POINTS_PER_SERIES = 10
+        private const val NUM_SERIES_PER_PLOT = 5
+    }
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        PixelUtils.init(this)
+
+        binding = RecyclerviewExampleBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        binding.recyclerView.adapter = MyRecyclerViewAdapter()
+    }
+
+    class MyRecyclerViewHolder(
+        private val binding: RecyclerviewExampleItemBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(data: List<SeriesBundle<XYSeries, LineAndPointFormatter>>, title: String) {
+            val plot = binding.plot
+            plot.clear()
+            plot.title.text = title
+            data.map { plot.addSeries(it.series, it.formatter) }
+            plot.redraw()
+        }
+    }
+
+    class MyRecyclerViewAdapter : RecyclerView.Adapter<MyRecyclerViewHolder>() {
+        private val seriesData = generateData()
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyRecyclerViewHolder {
+            val itemBinding = RecyclerviewExampleItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            return MyRecyclerViewHolder(itemBinding)
+        }
+
+        override fun onBindViewHolder(holder: MyRecyclerViewHolder, position: Int) {
+            holder.bind(seriesData[position], "Series $position")
+        }
+
+        override fun getItemCount() = seriesData.size
+
+        private fun generateData(): List<List<SeriesBundle<XYSeries, LineAndPointFormatter>>> {
+            val theData = mutableListOf<List<SeriesBundle<XYSeries, LineAndPointFormatter>>>()
+            fun generateBundle(seriesLabel: String): SeriesBundle<XYSeries, LineAndPointFormatter> {
+                val generator = Random()
+                val nums = ArrayList<Number>()
+                for (j in 0 until NUM_POINTS_PER_SERIES) {
+                    nums.add(generator.nextFloat())
+                }
+
+                val formatter = LineAndPointFormatter(
+                    Color.rgb(
+                        java.lang.Double.valueOf(Math.random() * 255).toInt(),
+                        java.lang.Double.valueOf(Math.random() * 255).toInt(),
+                        java.lang.Double.valueOf(Math.random() * 255).toInt()
+                    ),
+                    Color.rgb(
+                        java.lang.Double.valueOf(Math.random() * 255).toInt(),
+                        java.lang.Double.valueOf(Math.random() * 255).toInt(),
+                        java.lang.Double.valueOf(Math.random() * 255).toInt()
+                    ),
+                    null, null
+                )
+
+                // for fun, configure interpolation on the formatter:
+                formatter.interpolationParams = CatmullRomInterpolator.Params(
+                    20,
+                    CatmullRomInterpolator.Type.Centripetal
+                )
+
+                return SeriesBundle(
+                    SimpleXYSeries(
+                        nums,
+                        SimpleXYSeries.ArrayFormat.Y_VALS_ONLY,
+                        seriesLabel
+                    ),
+                    formatter
+                )
+            }
+
+            for (i in 0 until NUM_PLOTS) {
+                val seriesList: MutableList<SeriesBundle<XYSeries, LineAndPointFormatter>> =
+                    ArrayList(NUM_SERIES_PER_PLOT)
+
+                for (k in 0 until NUM_SERIES_PER_PLOT) {
+                    seriesList.add(generateBundle("S$k"))
+                }
+                theData.add(seriesList)
+            }
+            return theData
+        }
+    }
+}
\ No newline at end of file
diff --git a/demoapp/src/main/res/layout/main.xml b/demoapp/src/main/res/layout/main.xml
index 590087de..3a2d873f 100644
--- a/demoapp/src/main/res/layout/main.xml
+++ b/demoapp/src/main/res/layout/main.xml
@@ -118,6 +118,13 @@
                 android:text="ListView of XYPlots"
                 android:enabled="true"/>
 
+            <Button
+                android:id="@+id/startXyRecyclerViewExButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="RecyclerView of XYPlots"
+                android:enabled="true"/>
+
             <Button
                 android:id="@+id/startXYPlotWithBgImgExample"
                 android:layout_width="match_parent"
diff --git a/demoapp/src/main/res/layout/recyclerview_example.xml b/demoapp/src/main/res/layout/recyclerview_example.xml
new file mode 100644
index 00000000..e92a6f8e
--- /dev/null
+++ b/demoapp/src/main/res/layout/recyclerview_example.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2015 AndroidPlot.com
+  ~
+  ~    Licensed under the Apache License, Version 2.0 (the "License");
+  ~    you may not use this file except in compliance with the License.
+  ~    You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~    Unless required by applicable law or agreed to in writing, software
+  ~    distributed under the License is distributed on an "AS IS" BASIS,
+  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~    See the License for the specific language governing permissions and
+  ~    limitations under the License.
+  -->
+
+<LinearLayout android:id="@+id/LinearLayout01"
+              android:layout_width="fill_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="fill_parent"
+    android:background="@color/ap_white"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/demoapp/src/main/res/layout/recyclerview_example_item.xml b/demoapp/src/main/res/layout/recyclerview_example_item.xml
new file mode 100644
index 00000000..b8392dc9
--- /dev/null
+++ b/demoapp/src/main/res/layout/recyclerview_example_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2015 AndroidPlot.com
+  ~
+  ~    Licensed under the Apache License, Version 2.0 (the "License");
+  ~    you may not use this file except in compliance with the License.
+  ~    You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~    Unless required by applicable law or agreed to in writing, software
+  ~    distributed under the License is distributed on an "AS IS" BASIS,
+  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~    See the License for the specific language governing permissions and
+  ~    limitations under the License.
+  -->
+
+<com.androidplot.xy.XYPlot xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ap="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/plot"
+    style="@style/APDefacto.Light"
+    android:layout_width="fill_parent"
+    android:layout_height="250dp"
+    ap:title="an xy plot" />
\ No newline at end of file
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 2f1853d2..9dde294d 100644
--- 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.8"
+    implementation "com.androidplot:androidplot-core:1.5.9"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
index b67acaff..00a80a5c 100644
--- a/docs/release_notes.md
+++ b/docs/release_notes.md
@@ -2,6 +2,13 @@
 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.9
+* (#107) Fix ambiguous ordinal for render mode attributes
+* (#104) Fix issue with background rendering in RecyclerView.
+* Adds a RecyclerView example to demo app.
+
+# 1.5.8
+* Maintenance release - update dependences, get off jcenter, etc.
 
 # 1.5.7
 * (#94) Potential fix / better error logging for a crash caused by a buffered canvas resize with illegal arguments.

From adf979d88cabe201af7e15f6f933711d61d7968e Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 18:15:30 -0500
Subject: [PATCH 17/38] fix publish step in buildscript

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf60104b..35a84a76 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,7 +89,7 @@ jobs:
       - deploy:
           name: "Publish"
           command: |
-            if [ "${CIRCLE_BRANCH}" == "project-updates" ];
+            if [ "${CIRCLE_BRANCH}" == "master" ];
               then
                 ./misc/download_google_publisher_json.sh;
                 ./gradlew publish;

From cb114c59fecd2e787611493660dda30597b58248 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 19 Sep 2021 18:19:35 -0500
Subject: [PATCH 18/38] uprev to 1.5.9

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 96bd5758..69be2080 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     theCompileSdkVersion = 30
     theTargetSdkVersion = 30
     theMinSdkVersion = 5
-    theVersionName = '1.5.8'
+    theVersionName = '1.5.9'
     theVersionCode = 1
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }

From b46fd30f07897e443c21721d411185b42227cd20 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 31 Jul 2022 19:22:07 -0500
Subject: [PATCH 19/38] Release 1.5.10 Changes (#117)

* uprev to 1.5.10
* remove circleci, add github actions build script
* #114 fix setLinesPerRangeLabel & setLinesPerDomainLabel
* fix barchart documentation
---
 .circleci/config.yml                          | 96 -------------------
 .github/workflows/build.yml                   | 53 ++++++++++
 androidplot-core/build.gradle                 |  5 +-
 .../com/androidplot/xy/XYGraphWidget.java     | 35 ++++---
 .../com/androidplot/xy/XYGraphWidgetTest.java | 11 +--
 build.gradle                                  |  7 +-
 demoapp/build.gradle                          |  5 +-
 .../demos/SimpleXYPlotActivity.java           |  2 +
 docs/barchart.md                              |  4 +-
 docs/quickstart.md                            |  2 +-
 docs/release_notes.md                         |  4 +
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 misc/download_keystore.sh                     |  9 --
 13 files changed, 98 insertions(+), 137 deletions(-)
 delete mode 100644 .circleci/config.yml
 create mode 100644 .github/workflows/build.yml
 delete mode 100755 misc/download_keystore.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 35a84a76..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Java Gradle CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-java/ for more details
-#
-version: 2
-
-general:
-  branches:
-    only:
-      #- circleci
-jobs:
-  build:
-    docker:
-      # specify the version you desire here
-      #- image: circleci/openjdk:8-jdk
-
-      # CircleCI maintains a library of pre-built images
-            # documented at https://circleci.com/docs/2.0/circleci-images/
-      - image: circleci/android:api-30
-
-    working_directory: ~/repo
-
-    environment:
-      # Customize the JVM maximum heap limit
-      JVM_OPTS: -Xmx3200m
-      TERM: dumb
-#      KEYSTORE: ${CIRCLE_WORKING_DIRECTORY}/sigining.keystore
-#      PUBLISHER_ACCT_JSON_FILE: ${CIRCLE_WORKING_DIRECTORY}/publisher_profile.json
-
-    steps:
-      - checkout
-
-      - run: echo 'export KEYSTORE=${HOME}/repo/sigining.keystore' >> $BASH_ENV
-      - run: echo 'export PUBLISHER_ACCT_JSON_FILE=${HOME}/repo/publisher_profile.json' >> $BASH_ENV
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "build.gradle" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
-
-      # Get private keys etc
-      - run: ./misc/download_keystore.sh
-      - run: ./misc/inject_circle_build_number.sh
-
-      - run: ./gradlew dependencies
-
-      - save_cache:
-          paths:
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "build.gradle" }}
-
-      # run tests & code coc!
-      - run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport
-
-      # build release
-      - run: ./gradlew assembleRelease
-
-      # javadoc
-      - run: ./gradlew javadoc
-
-      # trigger codecod.io
-      - run: bash <(curl -s https://codecov.io/bash)
-
-      - store_artifacts:
-          path: androidplot-core/build/outputs/aar/
-          destination: aar
-
-      - store_artifacts:
-          path: demoapp/build/outputs/apk/
-          destination: apk
-
-      - store_artifacts:
-          path: androidplot-core/build/reports/jacoco/debug/
-          destination: coverage_report
-
-      - store_artifacts:
-          path: androidplot-core/build/reports/tests/
-          destination: test_results
-
-      - store_artifacts:
-          path: androidplot-core/build/docs/javadoc
-          destination: javadoc
-
-      - store_test_results:
-          path: androidplot-core/build/test-results/
-
-      - deploy:
-          name: "Publish"
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ];
-              then
-                ./misc/download_google_publisher_json.sh;
-                ./gradlew publish;
-            fi
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..259a938c
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index e81e40a2..c7c4056f 100644
--- 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
index 4f6fa04a..8fa0571f 100644
--- 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,12 +574,19 @@ 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,
@@ -587,9 +594,15 @@ protected void drawRangeLine(Canvas canvas, float yPix, Number yVal,
             );
         }
 
-        // 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
index 5a0da878..1d1133dd 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -21,7 +21,6 @@
 
 import com.androidplot.test.*;
 import com.androidplot.ui.*;
-import com.androidplot.util.DisplayDimensions;
 
 import org.junit.*;
 import org.mockito.*;
@@ -29,7 +28,6 @@
 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
index 69be2080..1850c58e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     theCompileSdkVersion = 30
     theTargetSdkVersion = 30
     theMinSdkVersion = 5
-    theVersionName = '1.5.9'
+    theVersionName = '1.5.10'
     theVersionCode = 1
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
@@ -26,13 +26,14 @@ ext {
 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
index b8b76251..d80c07b6 100644
--- 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
index db3a5a28..df9799d1 100644
--- 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
index 7da49957..5b384250 100644
--- 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
index 9dde294d..6c0878a2 100644
--- 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
index 00a80a5c..e0c6cb82 100644
--- 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
index 0a24689e..4bde2d74 100644
--- 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
deleted file mode 100755
index 99fd503a..00000000
--- a/misc/download_keystore.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# use curl to download a keystore from $KEYSTORE_URI, if set,
-# to the path/filename set in $KEYSTORE.
-if [[ $KEYSTORE && ${KEYSTORE} && $KEYSTORE_URI && ${KEYSTORE_URI} ]]
-then
-    echo "Keystore detected - downloading..."
-    curl -L -o ${KEYSTORE} ${KEYSTORE_URI}
-else
-    echo "Keystore uri not set.  .APK artifact will not be signed."
-fi
\ No newline at end of file

From 3b9c2a90d6a233d1d117e8f02b281dc33807109b Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Sun, 31 Jul 2022 19:33:39 -0500
Subject: [PATCH 20/38] build on all pushes

---
 .github/workflows/build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 259a938c..99a0053d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,5 @@
 name: build androidplot
-on:
-  push:
-    branches:
-      - v1.5.10b # TODO change to master
+on: [push]
 jobs:
   build-and-test:
     runs-on: ubuntu-latest

From 5d474ad6e774bc701d9cc1eb75b860eceb67bcfd Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 07:01:55 -0500
Subject: [PATCH 21/38] update readme

---
 README.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 42b3f9ea..49d2b78b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
-# ![image](docs/images/aplogo_small.png) Androidplot [![CircleCI](https://circleci.com/gh/halfhp/androidplot.svg?style=shield)](https://circleci.com/gh/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
+# [![AppBrain SDK](https://www.appbrain.com/stats/libraries/shield/appbrain.svg)](https://www.appbrain.com/stats/libraries/details/appbrain/appbrain-sdk) ![image](docs/images/aplogo_small.png) Androidplot [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
 
-A library for creating dynamic and static charts in Android apps. It’s designed from the ground up for Android, 
-compatible with all versions of Android from 1.6 onward and is **used by over 
-[1,000 apps](http://www.appbrain.com/stats/libraries/details/androidplot/androidplot) on Google Play**.
-
-[![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot)
+A library for creating dynamic and static charts in Android apps. Compatible with all versions of Android from 1.6 onward.
 
 If you enjoy the lib, please [rate us on codix.io](http://codix.io/gh/repo/halfhp/androidplot)!
 

From 4ff9a98c309cb9bf5c7f5cb0d0e79e2ecfaa97a1 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 07:02:31 -0500
Subject: [PATCH 22/38] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49d2b78b..e07f36cd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [![AppBrain SDK](https://www.appbrain.com/stats/libraries/shield/appbrain.svg)](https://www.appbrain.com/stats/libraries/details/appbrain/appbrain-sdk) ![image](docs/images/aplogo_small.png) Androidplot [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
+# ![image](docs/images/aplogo_small.png) Androidplot [![AppBrain SDK](https://www.appbrain.com/stats/libraries/shield/appbrain.svg)](https://www.appbrain.com/stats/libraries/details/appbrain/appbrain-sdk) [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
 
 A library for creating dynamic and static charts in Android apps. Compatible with all versions of Android from 1.6 onward.
 

From ba09f8fd2fd70767ce5f8c901d90d28e4c66677a Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 07:05:30 -0500
Subject: [PATCH 23/38] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e07f36cd..1aafa97c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ![image](docs/images/aplogo_small.png) Androidplot [![AppBrain SDK](https://www.appbrain.com/stats/libraries/shield/appbrain.svg)](https://www.appbrain.com/stats/libraries/details/appbrain/appbrain-sdk) [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
+# ![image](docs/images/aplogo_small.png) Androidplot [![AndroidPlot](https://www.appbrain.com/stats/libraries/shield/androidplot.svg)](https://www.appbrain.com/stats/libraries/details/androidplot/androidplot) [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
 
 A library for creating dynamic and static charts in Android apps. Compatible with all versions of Android from 1.6 onward.
 

From 89fc2b3f9ec6fab788c0a8637efa8f7d69f56519 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 07:30:36 -0500
Subject: [PATCH 24/38] update readme

---
 README.md                                                    | 5 ++++-
 .../java/com/androidplot/demos/SimpleXYPlotActivity.java     | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1aafa97c..9617a26e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # ![image](docs/images/aplogo_small.png) Androidplot [![AndroidPlot](https://www.appbrain.com/stats/libraries/shield/androidplot.svg)](https://www.appbrain.com/stats/libraries/details/androidplot/androidplot) [![Codix](http://codix.io/gh/badge/halfhp/androidplot)](http://codix.io/gh/repo/halfhp/androidplot) [![codecov](https://codecov.io/gh/halfhp/androidplot/branch/master/graph/badge.svg)](https://codecov.io/gh/halfhp/androidplot) [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/androidplot.svg?style=social&label=Follow%20Us)](https://twitter.com/androidplot)
 
-A library for creating dynamic and static charts in Android apps. Compatible with all versions of Android from 1.6 onward.
+A library for creating dynamic and static charts in Android apps. 
+
+Androidplot is compatible with all versions of Android from 1.6 onward, works equally with Kotlin and Java codebases
+and is compatible with Jetpack compose.
 
 If you enjoy the lib, please [rate us on codix.io](http://codix.io/gh/repo/halfhp/androidplot)!
 
diff --git a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
index df9799d1..db3a5a28 100644
--- a/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
+++ b/demoapp/src/main/java/com/androidplot/demos/SimpleXYPlotActivity.java
@@ -88,8 +88,6 @@ 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

From a4d0c32cecb2cf4ed7f9ccf7fe932038472eb1f2 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 07:49:02 -0500
Subject: [PATCH 25/38] remove crittercism, uprev demoapp version code

---
 build.gradle                                              | 2 +-
 demoapp/build.gradle                                      | 1 -
 .../src/main/java/com/androidplot/demos/MainActivity.kt   | 8 --------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1850c58e..5796da53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ ext {
     theTargetSdkVersion = 30
     theMinSdkVersion = 5
     theVersionName = '1.5.10'
-    theVersionCode = 1
+    theVersionCode = 226
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
 
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index d80c07b6..1506e9ce 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -36,7 +36,6 @@ dependencies {
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 	implementation project(':androidplot-core')
-    implementation 'com.crittercism:crittercism-android-agent:5.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
diff --git a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
index 6c8320e1..b01f3e1c 100644
--- a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
+++ b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
@@ -17,7 +17,6 @@ package com.androidplot.demos
 
 import android.app.Activity
 import android.os.Bundle
-import com.crittercism.app.Crittercism
 import android.content.Intent
 import android.util.Log
 import com.androidplot.demos.databinding.MainBinding
@@ -28,18 +27,11 @@ class MainActivity : Activity() {
 
     companion object {
         private val TAG = MainActivity::class.java.name
-
-        // DO *NOT* CHANGE THIS LINE! (CI-MATCH-POPULATE)
-        private val CRITTERCISM_APP_ID: String? = null
     }
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MainBinding.inflate(layoutInflater)
-        if (CRITTERCISM_APP_ID != null) {
-            Log.d(TAG, "Crittercism initialized.")
-            Crittercism.initialize(applicationContext, CRITTERCISM_APP_ID)
-        }
 
         binding.animatedXYPlotExButton.setOnClickListener {
             startActivity(Intent(this, AnimatedXYPlotActivity::class.java))

From e0272dad4126bd0441e474898db13dbfcb0c9f0d Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 18:24:49 -0500
Subject: [PATCH 26/38] update dependencies

---
 androidplot-core/build.gradle                 |  4 +-
 build.gradle                                  |  4 +-
 demoapp/build.gradle                          | 10 ++---
 demoapp/src/main/AndroidManifest.xml          | 39 ++++++++++++-------
 .../androidplot/demos/DemoApplication.java    |  8 ----
 .../com/androidplot/demos/MainActivity.kt     |  5 ---
 6 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index c7c4056f..389a5cfd 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -91,9 +91,9 @@ dependencies {
     implementation 'com.halfhp.fig:figlib:1.0.11'
     implementation 'com.android.support:support-annotations:28.0.0'
 
-    testImplementation "org.mockito:mockito-core:3.9.0"
+    testImplementation "org.mockito:mockito-core:4.0.0"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation "org.robolectric:robolectric:4.5.1"
+    testImplementation "org.robolectric:robolectric:4.7.3"
 }
 
 task javadoc(type: Javadoc) {
diff --git a/build.gradle b/build.gradle
index 5796da53..6360970f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 ext {
-    theCompileSdkVersion = 30
-    theTargetSdkVersion = 30
+    theCompileSdkVersion = 32
+    theTargetSdkVersion = 32
     theMinSdkVersion = 5
     theVersionName = '1.5.10'
     theVersionCode = 226
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index 1506e9ce..8c8c8d2c 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.7.10'
     repositories {
         mavenCentral()
     }
@@ -33,16 +33,12 @@ plugins {
 apply plugin: 'kotlin-android'
 
 dependencies {
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.core:core-ktx:1.8.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 	implementation project(':androidplot-core')
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
-
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
-
-    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
 
 android {
diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml
index 16245b9f..eaf69362 100644
--- a/demoapp/src/main/AndroidManifest.xml
+++ b/demoapp/src/main/AndroidManifest.xml
@@ -27,76 +27,88 @@
                  android:icon="@drawable/ic_launcher">
 
         <activity android:name=".MainActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".SimplePieChartActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".AnimatedXYPlotActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".SimpleXYPlotActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ScatterPlotActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".BarPlotExampleActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".DynamicXYPlotActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".CandlestickChartActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name=".OrientationSensorExampleActivity"
                   android:label="@string/app_name"
-                  android:screenOrientation="landscape">
+                  android:screenOrientation="landscape"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".StepChartExampleActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".TouchZoomExampleActivity"
-                  android:label="@string/app_name">
+                  android:label="@string/app_name"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ListViewActivity" android:label="ListView Example"/>
         <activity android:name=".RecyclerViewActivity" android:label="RecyclerView Example"/>
-        <activity android:name=".XYRegionExampleActivity" android:label="XYRegion Example">
+        <activity android:name=".XYRegionExampleActivity" android:label="XYRegion Example"
+            android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -112,7 +124,8 @@
         <receiver
                 android:icon="@drawable/ic_launcher"
                 android:label="Example Widget"
-                android:name="com.androidplot.demos.widget.DemoAppWidgetProvider" >
+                android:name="com.androidplot.demos.widget.DemoAppWidgetProvider"
+            android:exported="false">
             <intent-filter >
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
diff --git a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
index 9c931a73..e5c724c7 100644
--- a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
+++ b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
@@ -8,14 +8,6 @@ public class DemoApplication extends Application {
 
     @Override public void onCreate() {
         super.onCreate();
-        initLeakCanary();
-    }
-
-    protected void initLeakCanary() {
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            return;
-        }
-        LeakCanary.install(this);
     }
 }
 
diff --git a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
index b01f3e1c..6632af40 100644
--- a/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
+++ b/demoapp/src/main/java/com/androidplot/demos/MainActivity.kt
@@ -18,17 +18,12 @@ package com.androidplot.demos
 import android.app.Activity
 import android.os.Bundle
 import android.content.Intent
-import android.util.Log
 import com.androidplot.demos.databinding.MainBinding
 
 class MainActivity : Activity() {
 
     private lateinit var binding: MainBinding
 
-    companion object {
-        private val TAG = MainActivity::class.java.name
-    }
-
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MainBinding.inflate(layoutInflater)

From ce9099b31d344c122e1a655e1d7b19a67ee5ed5a Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Mon, 1 Aug 2022 18:33:43 -0500
Subject: [PATCH 27/38] update unit tests to use latest mockito

---
 .../com/androidplot/ui/widget/TextLabelWidgetTest.java    | 6 +++---
 .../test/java/com/androidplot/ui/widget/WidgetTest.java   | 8 ++++----
 .../java/com/androidplot/util/PlotStatisticsTest.java     | 6 +++---
 .../androidplot/xy/AdvanceLineAndPointRendererTest.java   | 1 -
 .../src/test/java/com/androidplot/xy/BarRendererTest.java | 6 +++---
 .../test/java/com/androidplot/xy/BubbleRendererTest.java  | 1 -
 .../java/com/androidplot/xy/CandlestickRendererTest.java  | 1 -
 .../com/androidplot/xy/FastLineAndPointRendererTest.java  | 4 ++--
 .../src/test/java/com/androidplot/xy/LTTBSamplerTest.java | 1 -
 .../java/com/androidplot/xy/LineAndPointRendererTest.java | 1 -
 .../test/java/com/androidplot/xy/XYGraphWidgetTest.java   | 8 ++++----
 .../test/java/com/androidplot/xy/XYLegendWidgetTest.java  | 5 ++---
 .../main/java/com/androidplot/demos/DemoApplication.java  | 2 --
 13 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java
index 6ed81b7b..bdb48f92 100644
--- a/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/TextLabelWidgetTest.java
@@ -14,9 +14,9 @@
 import org.mockito.InOrder;
 import org.mockito.Mock;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
diff --git a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
index ce398dc9..cae6c056 100644
--- a/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/ui/widget/WidgetTest.java
@@ -21,10 +21,10 @@
 import org.mockito.Mockito;
 
 import static junit.framework.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -94,9 +94,9 @@ public void draw_sizeChanged_invokesOnResizeBeforeDoOnDraw() {
 
         widget.draw(canvas);
 
-        inOrder.verify(widget).onResize(isNull(RectF.class), any(RectF.class));
+        inOrder.verify(widget).onResize(isNull(), any(RectF.class));
         inOrder.verify(widget).doOnDraw(eq(canvas), any(RectF.class));
-        verify(widget).onResize(isNull(RectF.class), any(RectF.class));
+        verify(widget).onResize(isNull(), any(RectF.class));
     }
 
     static class TestWidget extends Widget {
diff --git a/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java b/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java
index b063235a..4454c69c 100644
--- a/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/util/PlotStatisticsTest.java
@@ -27,9 +27,9 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java
index 647882c5..b1600828 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/AdvanceLineAndPointRendererTest.java
@@ -24,7 +24,6 @@
 import org.junit.*;
 import org.mockito.*;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
index e4624d08..08cc1480 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/BarRendererTest.java
@@ -33,9 +33,9 @@
 import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java
index cd0ff2b1..94a0be50 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/BubbleRendererTest.java
@@ -24,7 +24,6 @@
 import org.junit.*;
 import org.mockito.*;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java
index a7fba775..8eda23b9 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/CandlestickRendererTest.java
@@ -24,7 +24,6 @@
 import org.junit.*;
 import org.mockito.*;
 
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 public class CandlestickRendererTest extends AndroidplotTest {
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java
index de81e70c..cf083d9e 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/FastLineAndPointRendererTest.java
@@ -24,8 +24,8 @@
 import org.junit.runner.*;
 import org.mockito.*;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java b/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java
index 3269082d..800992f9 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/LTTBSamplerTest.java
@@ -27,7 +27,6 @@
 import java.util.*;
 
 import static junit.framework.Assert.assertEquals;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 public class LTTBSamplerTest extends AndroidplotTest {
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java b/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java
index 9cb03cd1..44a7b22d 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/LineAndPointRendererTest.java
@@ -26,7 +26,6 @@
 import java.util.*;
 
 import static junit.framework.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class LineAndPointRendererTest extends AndroidplotTest {
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
index 1d1133dd..a9182501 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYGraphWidgetTest.java
@@ -28,11 +28,11 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyDouble;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyFloat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyFloat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
diff --git a/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java b/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java
index b50f7237..778fb40a 100644
--- a/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/xy/XYLegendWidgetTest.java
@@ -32,11 +32,10 @@
 
 import java.util.List;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
diff --git a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
index e5c724c7..df3d6117 100644
--- a/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
+++ b/demoapp/src/main/java/com/androidplot/demos/DemoApplication.java
@@ -2,8 +2,6 @@
 
 import android.app.*;
 
-import com.squareup.leakcanary.*;
-
 public class DemoApplication extends Application {
 
     @Override public void onCreate() {

From 7b072e107e6b5efa195b726d1b79053fe4af3174 Mon Sep 17 00:00:00 2001
From: Francisco Salinas Del Riego
 <133713499+fdelriego@users.noreply.github.com>
Date: Thu, 22 Aug 2024 05:05:59 -0700
Subject: [PATCH 28/38] Fix jetifier being required (#122)

This prevents the library from being flagged in Jetifier check build analyzer task. No other changes are needed :) (that I know of)
---
 androidplot-core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 389a5cfd..7602311b 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -89,7 +89,7 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git'
 dependencies {
 
     implementation 'com.halfhp.fig:figlib:1.0.11'
-    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.4.0'
 
     testImplementation "org.mockito:mockito-core:4.0.0"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'

From d47fb53dccd6eff451d98dcb1e37da45e09e555f Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 08:00:37 -0500
Subject: [PATCH 29/38] uprev to 1.5.11

---
 build.gradle          | 2 +-
 docs/quickstart.md    | 2 +-
 docs/release_notes.md | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6360970f..fdbd3e60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     theCompileSdkVersion = 32
     theTargetSdkVersion = 32
     theMinSdkVersion = 5
-    theVersionName = '1.5.10'
+    theVersionName = '1.5.11'
     theVersionCode = 226
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 6c0878a2..3bd87c3d 100644
--- 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.10"
+    implementation "com.androidplot:androidplot-core:1.5.11"
 }
 ```
 
diff --git a/docs/release_notes.md b/docs/release_notes.md
index e0c6cb82..50d52c11 100644
--- 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.11
+* Update project to latest gradle / build tools
+* Fix issue with jetifier flagging an outdated dependency
+
 # 1.5.10
 * Update project to use latest gradle / build tools
 * (#114) fix `setLinesPerRangeLabel` & `setLinesPerDomainLabel`

From e2c1bbef640349fb76def7f0f00cf36adab502b4 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 08:15:48 -0500
Subject: [PATCH 30/38] update project files for latest android changes

---
 androidplot-core/build.gradle                 | 1 +
 androidplot-core/src/main/AndroidManifest.xml | 2 +-
 build.gradle                                  | 2 +-
 demoapp/build.gradle                          | 1 +
 demoapp/src/main/AndroidManifest.xml          | 2 +-
 gradle/wrapper/gradle-wrapper.properties      | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 7602311b..acfa2c11 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -77,6 +77,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'com.androidplot'
 
 }
 
diff --git a/androidplot-core/src/main/AndroidManifest.xml b/androidplot-core/src/main/AndroidManifest.xml
index e83183d1..3043c930 100644
--- a/androidplot-core/src/main/AndroidManifest.xml
+++ b/androidplot-core/src/main/AndroidManifest.xml
@@ -16,5 +16,5 @@
 
 <!-- This file has been intentionally left empty; values should be
 set in android.defaultConfig in build.gradle wherever possible.-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.androidplot">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fdbd3e60..0e4c8e8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5'
     }
 }
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index 8c8c8d2c..b5856456 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -78,6 +78,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'com.androidplot.demos'
 
 }
 
diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml
index eaf69362..5b73a2b7 100644
--- a/demoapp/src/main/AndroidManifest.xml
+++ b/demoapp/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
   ~    limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.androidplot.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Used by Crittercism to report crashes -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4bde2d74..43c64dc4 100644
--- 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.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

From 7ef1d0cbcb97879cd733aa16ed82910390cf7fed Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 10:05:07 -0500
Subject: [PATCH 31/38] updates gradle, android plugin, dependencies etc. to
 latest.  also updates to use JDK 17.

---
 androidplot-core/build.gradle            | 36 ++++++++++++++----------
 build.gradle                             |  8 +++---
 demoapp-wearable/build.gradle            |  5 ++--
 demoapp/build.gradle                     | 18 +++++++++---
 demoapp/project.properties               |  2 --
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index acfa2c11..36b0ea63 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -16,7 +16,7 @@
 
 plugins {
     id 'com.android.library'
-    id 'com.dicedmelon.gradle.jacoco-android'
+    id 'com.mxalbert.gradle.jacoco-android'
     id 'maven-publish'
     id 'signing'
 }
@@ -58,9 +58,15 @@ task generateAttrsMarkdown(type: AttrMarkdown) {
 }
 
 android {
-    compileSdkVersion theCompileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
 
     defaultConfig {
+        compileSdk theCompileSdkVersion
         minSdkVersion theMinSdkVersion
         targetSdkVersion theTargetSdkVersion
         testApplicationId "com.androidplot.test"
@@ -90,9 +96,9 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git'
 dependencies {
 
     implementation 'com.halfhp.fig:figlib:1.0.11'
-    implementation 'androidx.annotation:annotation:1.4.0'
+    implementation 'androidx.annotation:annotation:1.8.2'
 
-    testImplementation "org.mockito:mockito-core:4.0.0"
+    testImplementation "org.mockito:mockito-core:5.7.0"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     testImplementation "org.robolectric:robolectric:4.7.3"
 }
@@ -110,12 +116,12 @@ task javadoc(type: Javadoc) {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
 }
 
@@ -137,9 +143,11 @@ afterEvaluate {
         }
 
         publications {
-            release(MavenPublication) {
 
-                from components.release
+            publications.withType(MavenPublication) {
+//            release(MavenPublication) {
+//
+//                from components.release
 
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.androidplot'
@@ -176,13 +184,11 @@ afterEvaluate {
     }
 }
 
-afterEvaluate {
-    signing {
-        def signingKey = System.getenv("SIGNING_KEY")
-        def signingPassword = System.getenv("SIGNING_PASSWORD")
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign publishing.publications.release
-    }
+signing {
+    def signingKey = System.getenv("SIGNING_KEY")
+    def signingPassword = System.getenv("SIGNING_PASSWORD")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign publishing.publications
 }
 
 artifacts {
diff --git a/build.gradle b/build.gradle
index 0e4c8e8c..d1140299 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 ext {
-    theCompileSdkVersion = 32
-    theTargetSdkVersion = 32
+    theCompileSdkVersion = 34
+    theTargetSdkVersion = 34
     theMinSdkVersion = 5
     theVersionName = '1.5.11'
     theVersionCode = 226
@@ -32,8 +32,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5'
+        classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath 'com.mxalbert.gradle:jacoco-android:0.2.0'
     }
 }
 
diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle
index 3bfc0ee0..666b353e 100644
--- a/demoapp-wearable/build.gradle
+++ b/demoapp-wearable/build.gradle
@@ -38,9 +38,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
index b5856456..2c2fbd52 100644
--- a/demoapp/build.gradle
+++ b/demoapp/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '2.0.0'
     repositories {
         mavenCentral()
     }
@@ -33,15 +33,25 @@ plugins {
 apply plugin: 'kotlin-android'
 
 dependencies {
-    implementation "androidx.core:core-ktx:1.8.0"
+    implementation "androidx.core:core-ktx:1.13.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 	implementation project(':androidplot-core')
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 android {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     compileSdkVersion theCompileSdkVersion
 
     buildFeatures {
@@ -51,7 +61,7 @@ android {
     defaultConfig {
         versionCode theVersionCode
         versionName theVersionName
-        minSdkVersion 14
+        minSdkVersion 19
         targetSdkVersion theTargetSdkVersion
         applicationId "com.androidplot.demos"
     }
diff --git a/demoapp/project.properties b/demoapp/project.properties
index 29656f2d..90a2cb18 100644
--- a/demoapp/project.properties
+++ b/demoapp/project.properties
@@ -39,5 +39,3 @@
 #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
 # using config with optimization enabled so that things like log statement removal will work:
 proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
-# Project target.
-target=android-16
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 43c64dc4..e9defc20 100644
--- 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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

From 01e338e4540918831b7f8d773efec37113b3ba40 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 10:07:05 -0500
Subject: [PATCH 32/38] pull in jdk 17 in build scrip

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 99a0053d..afbda48e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,12 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
 
+      - name: Set Up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+
       - name: Build and Test
         run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport
 

From 04e819db59a94ba1c386341973f6c1ff1311c29b Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 10:16:27 -0500
Subject: [PATCH 33/38] Fix broken tests

---
 .../src/test/java/com/androidplot/PlotTest.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/androidplot-core/src/test/java/com/androidplot/PlotTest.java b/androidplot-core/src/test/java/com/androidplot/PlotTest.java
index 5a750afd..9e4753bf 100644
--- a/androidplot-core/src/test/java/com/androidplot/PlotTest.java
+++ b/androidplot-core/src/test/java/com/androidplot/PlotTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -44,7 +45,8 @@ public class PlotTest extends AndroidplotTest {
 
     @Test
     public void testInit_withoutAttrs() {
-        Plot plot = mock(Plot.class);
+        //Plot plot = mock(Plot.class);
+        Plot plot = spy(new MockPlot("MockPlot"));
         plot.init(RuntimeEnvironment.application, null, 0);
 
         verify(plot, times(1)).onPreInit();
@@ -53,10 +55,12 @@ public void testInit_withoutAttrs() {
 
     @Test
     public void testInit_withAttrs() {
-        Plot plot = new MockPlot("MockPlot");
+        Plot plot = spy(new MockPlot("MockPlot"));
         AttributeSet attrs = mock(AttributeSet.class);
         plot.init(RuntimeEnvironment.application, attrs, 0);
-        // TODO: verifications
+
+        verify(plot, times(1)).onPreInit();
+        verify(plot, times(1)).onAfterConfig();
     }
 
     @Test

From b8b3837de953fcac8f15767cf5ef9002fbac9ce1 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 10:34:18 -0500
Subject: [PATCH 34/38] temporarily disable javadoc artifacts

---
 .github/workflows/build.yml   |  5 ++--
 androidplot-core/build.gradle | 43 +++++++++++++++++++----------------
 docs/index.md                 |  4 +++-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afbda48e..d38f337e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,8 +27,9 @@ jobs:
           echo $ENCODED | base64 -di > "${GITHUB_WORKSPACE}/demoapp/keystore.jks"
           ./gradlew assembleRelease
 
-      - name: Javadoc
-        run: ./gradlew javadoc
+# TODO: get javadoc working again at some point
+#      - name: Javadoc
+#        run: ./gradlew javadoc
 
       - name: Code Coverage
         run: bash <(curl -s https://codecov.io/bash)
diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 36b0ea63..af0adb66 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -103,31 +103,33 @@ dependencies {
     testImplementation "org.robolectric:robolectric:4.7.3"
 }
 
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    failOnError false
-    options {
-        links "http://docs.oracle.com/javase/7/docs/api/"
-        linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
-    }
-    exclude '**/BuildConfig.java'
-    exclude '**/R.java'
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from javadoc.destinationDir
-}
+// TODO: get javadoc working again at some point
+//task javadoc(type: Javadoc) {
+//    source = android.sourceSets.main.java.srcDirs
+//    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+//    failOnError false
+//    options {
+//        links "http://docs.oracle.com/javase/7/docs/api/"
+//        linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+//    }
+//    exclude '**/BuildConfig.java'
+//    exclude '**/R.java'
+//}
+//
+//task javadocJar(type: Jar, dependsOn: javadoc) {
+//    archiveClassifier.set('javadoc')
+//    from javadoc.destinationDir
+//}
 
 task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
 }
 
-javadoc {
-    options.overview = "src/main/java/overview.html"
-}
+// TODO: get javadoc working again at some point
+//javadoc {
+//    options.overview = "src/main/java/overview.html"
+//}
 
 afterEvaluate {
     publishing {
@@ -192,6 +194,7 @@ signing {
 }
 
 artifacts {
-    archives javadocJar
+    // TODO: get javadoc working again at some point
+//    archives javadocJar
     archives sourcesJar
 }
diff --git a/docs/index.md b/docs/index.md
index 4959db92..90a8a021 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -42,7 +42,9 @@ Source code examples of the various plot types.
 # XML Attributes
 A complete list of XML attributes is [available here](attrs.md).
 # Javadoc
-The latest Javadocs are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core).
+Javadocs for versions through 1.5.7 are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core).  Due to a build issue
+producing Javadocs for the latest releases has been paused.  There have been very
+few changes to the API since 1.5.7 so the Javadocs should still be useful in the mean time.
 
 # Release Notes
 Full release notes are [available here](release_notes.md)

From de72e9c24704f8d325c01aa5d45a5fccf9a4ee5b Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 11:17:51 -0500
Subject: [PATCH 35/38] uprev version code for demo app publishing

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d1140299..4b5e18de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ ext {
     theTargetSdkVersion = 34
     theMinSdkVersion = 5
     theVersionName = '1.5.11'
-    theVersionCode = 226
+    theVersionCode = 227
     gitUrl = 'https://github.com/halfhp/androidplot.git'
 }
 

From 1e11eb2683ee3b746664564f2fd64ba7c4d22576 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 11:33:10 -0500
Subject: [PATCH 36/38] fix mavencentral publishing

---
 androidplot-core/build.gradle | 110 ++++++++++++++++++----------------
 1 file changed, 58 insertions(+), 52 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index af0adb66..4d7cf020 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -31,13 +31,14 @@ class AttrMarkdown extends DefaultTask {
         def input = project.file(inFile)
 
         def output = project.file(outFile)
-        if(output.exists()) {
+        if (output.exists()) {
             output.delete()
         }
         output.parentFile.mkdirs()
 
-        input.text.findAll(/<!--\n?([\s\S]*?)\n?-->/) { match, g1 -> g1
-            if(!g1.startsWith("NODOC")) {
+        input.text.findAll(/<!--\n?([\s\S]*?)\n?-->/) { match, g1 ->
+            g1
+            if (!g1.startsWith("NODOC")) {
                 output.append(g1)
                 output.append "\n\n"
             }
@@ -53,7 +54,7 @@ class AttrMarkdown extends DefaultTask {
  * The generated doc will appear in / replace androidplot/docs/attrs.md
  */
 task generateAttrsMarkdown(type: AttrMarkdown) {
-    inFile = { "src/main/res/values/attrs.xml"}
+    inFile = { "src/main/res/values/attrs.xml" }
     outFile = { "../docs/attrs.md" }
 }
 
@@ -85,6 +86,13 @@ android {
     }
     namespace 'com.androidplot'
 
+    publishing {
+        singleVariant("release") {
+            //withSourcesJar()
+            //withJavadocJar()
+        }
+    }
+
 }
 
 group = 'com.androidplot'
@@ -121,65 +129,63 @@ dependencies {
 //    from javadoc.destinationDir
 //}
 
-task sourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-}
+//task sourcesJar(type: Jar) {
+//    archiveClassifier.set('sources')
+//    from android.sourceSets.main.java.srcDirs
+//}
 
 // TODO: get javadoc working again at some point
 //javadoc {
 //    options.overview = "src/main/java/overview.html"
 //}
 
-afterEvaluate {
-    publishing {
-        repositories {
-            maven {
-                name = "Maven Central"
-                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                credentials {
-                    username = System.getenv("OSSRH_ACTOR")
-                    password = System.getenv("OSSRH_TOKEN")
-                }
+publishing {
+    repositories {
+        maven {
+            name = "MavenCentral"
+            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            credentials {
+                username = System.getenv("OSSRH_ACTOR")
+                password = System.getenv("OSSRH_TOKEN")
             }
         }
+    }
 
-        publications {
+    publications {
 
-            publications.withType(MavenPublication) {
+        publications.withType(MavenPublication) {
 //            release(MavenPublication) {
 //
 //                from components.release
 
-                // You can then customize attributes of the publication as shown below.
-                groupId = 'com.androidplot'
-                artifactId = 'androidplot-core'
-                version = theVersionName
-
-                pom {
-                    packaging 'aar'
-                    name = 'Androidplot'
-                    description = "Configure any object from XML."
-                    url = gitUrl
-                    licenses {
-                        license {
-                            name = 'The Apache Software License, Version 2.0'
-                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        }
+            // You can then customize attributes of the publication as shown below.
+            groupId = 'com.androidplot'
+            artifactId = 'androidplot-core'
+            version = theVersionName
+
+            pom {
+                packaging 'aar'
+                name = 'Androidplot'
+                description = "Configure any object from XML."
+                url = gitUrl
+                licenses {
+                    license {
+                        name = 'The Apache Software License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
-                    developers {
-                        developer {
-                            id = 'halfhp'
-                            name = 'Nick Fellows'
-                            email = 'halfhp@gmail.com'
-                        }
+                }
+                developers {
+                    developer {
+                        id = 'halfhp'
+                        name = 'Nick Fellows'
+                        email = 'halfhp@gmail.com'
                     }
-                    scm {
-                        connection = gitUrl
-                        developerConnection = gitUrl
-                        url = gitUrl
+                }
+                scm {
+                    connection = gitUrl
+                    developerConnection = gitUrl
+                    url = gitUrl
 
-                    }
                 }
             }
         }
@@ -190,11 +196,11 @@ signing {
     def signingKey = System.getenv("SIGNING_KEY")
     def signingPassword = System.getenv("SIGNING_PASSWORD")
     useInMemoryPgpKeys(signingKey, signingPassword)
-    sign publishing.publications
+    sign(publishing.publications)
 }
 
-artifacts {
-    // TODO: get javadoc working again at some point
-//    archives javadocJar
-    archives sourcesJar
-}
+//artifacts {
+//    // TODO: get javadoc working again at some point
+////    archives javadocJar
+//    archives sourcesJar
+//}

From a9f065fbbe20fabcf198a95b4777533ce365572f Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 12:25:24 -0500
Subject: [PATCH 37/38] fix mavencentral publishing

---
 androidplot-core/build.gradle | 83 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 4d7cf020..7063e0c9 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -88,11 +88,12 @@ android {
 
     publishing {
         singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
             //withSourcesJar()
             //withJavadocJar()
         }
     }
-
 }
 
 group = 'com.androidplot'
@@ -139,53 +140,53 @@ dependencies {
 //    options.overview = "src/main/java/overview.html"
 //}
 
-publishing {
-    repositories {
-        maven {
-            name = "MavenCentral"
-            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-            credentials {
-                username = System.getenv("OSSRH_ACTOR")
-                password = System.getenv("OSSRH_TOKEN")
+afterEvaluate {
+    publishing {
+        repositories {
+            maven {
+                name = "MavenCentral"
+                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                credentials {
+                    username = System.getenv("OSSRH_ACTOR")
+                    password = System.getenv("OSSRH_TOKEN")
+                }
             }
         }
-    }
 
-    publications {
-
-        publications.withType(MavenPublication) {
+        publications {
+            release(MavenPublication) {
 //            release(MavenPublication) {
 //
-//                from components.release
-
-            // You can then customize attributes of the publication as shown below.
-            groupId = 'com.androidplot'
-            artifactId = 'androidplot-core'
-            version = theVersionName
-
-            pom {
-                packaging 'aar'
-                name = 'Androidplot'
-                description = "Configure any object from XML."
-                url = gitUrl
-                licenses {
-                    license {
-                        name = 'The Apache Software License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                from components.release
+
+                // You can then customize attributes of the publication as shown below.
+                groupId = 'com.androidplot'
+                artifactId = 'androidplot-core'
+                version = theVersionName
+
+                pom {
+                    packaging 'aar'
+                    name = 'Androidplot'
+                    description = "Configure any object from XML."
+                    url = gitUrl
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        }
                     }
-                }
-                developers {
-                    developer {
-                        id = 'halfhp'
-                        name = 'Nick Fellows'
-                        email = 'halfhp@gmail.com'
+                    developers {
+                        developer {
+                            id = 'halfhp'
+                            name = 'Nick Fellows'
+                            email = 'halfhp@gmail.com'
+                        }
+                    }
+                    scm {
+                        connection = gitUrl
+                        developerConnection = gitUrl
+                        url = gitUrl
                     }
-                }
-                scm {
-                    connection = gitUrl
-                    developerConnection = gitUrl
-                    url = gitUrl
-
                 }
             }
         }

From 2a15eed4decc4f4b9a604f302068d6de4b055e01 Mon Sep 17 00:00:00 2001
From: Nick Fellows <halfhp@gmail.com>
Date: Thu, 22 Aug 2024 12:38:31 -0500
Subject: [PATCH 38/38] cleanup

---
 androidplot-core/build.gradle | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle
index 7063e0c9..b37b2b4a 100644
--- a/androidplot-core/build.gradle
+++ b/androidplot-core/build.gradle
@@ -90,8 +90,6 @@ android {
         singleVariant("release") {
             withSourcesJar()
             withJavadocJar()
-            //withSourcesJar()
-            //withJavadocJar()
         }
     }
 }
@@ -125,15 +123,7 @@ dependencies {
 //    exclude '**/R.java'
 //}
 //
-//task javadocJar(type: Jar, dependsOn: javadoc) {
-//    archiveClassifier.set('javadoc')
-//    from javadoc.destinationDir
-//}
 
-//task sourcesJar(type: Jar) {
-//    archiveClassifier.set('sources')
-//    from android.sourceSets.main.java.srcDirs
-//}
 
 // TODO: get javadoc working again at some point
 //javadoc {
@@ -155,8 +145,6 @@ afterEvaluate {
 
         publications {
             release(MavenPublication) {
-//            release(MavenPublication) {
-//
                 from components.release
 
                 // You can then customize attributes of the publication as shown below.
@@ -199,9 +187,3 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign(publishing.publications)
 }
-
-//artifacts {
-//    // TODO: get javadoc working again at some point
-////    archives javadocJar
-//    archives sourcesJar
-//}