From c197a66b317debb124b3b49b221a3b3d218c50a4 Mon Sep 17 00:00:00 2001 From: Mike Dunn Date: Thu, 25 Aug 2016 20:36:27 -0500 Subject: [PATCH 1/2] updates 2 methods that might show up when swapping detail level sets --- .../src/main/java/com/qozix/tileview/detail/DetailLevel.java | 2 +- .../main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java b/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java index 8af26b66..e3bc0db9 100644 --- a/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java +++ b/tileview/src/main/java/com/qozix/tileview/detail/DetailLevel.java @@ -124,7 +124,7 @@ public boolean equals( Object object ) { } if( object instanceof DetailLevel ) { DetailLevel detailLevel = (DetailLevel) object; - return mScale == detailLevel.getScale(); + return mScale == detailLevel.getScale() && mData != null && mData.equals( detailLevel.getData() ); } return false; } diff --git a/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java b/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java index 2f63835b..d75c80c4 100755 --- a/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java +++ b/tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java @@ -203,9 +203,9 @@ public boolean getIsRendering() { * Clears existing tiles and cancels any existing render tasks. */ public void clear() { - suppressRender(); cancelRender(); mTilesInCurrentViewport.clear(); + mPreviouslyDrawnTiles.clear(); invalidate(); } From 335386503f64dd7054a7dcf547197cb970c133fb Mon Sep 17 00:00:00 2001 From: Mike Dunn Date: Thu, 25 Aug 2016 20:41:50 -0500 Subject: [PATCH 2/2] bumping version --- README.md | 4 ++-- tileview/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6740a628..f8074490 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Javadocs are [here](http://moagrius.github.io/TileView/index.html?com/qozix/tile ###Installation Gradle: ``` -compile 'com.qozix:tileview:2.2.1' +compile 'com.qozix:tileview:'2.2.2' ``` The library is hosted on jcenter, and is not currently available from maven. @@ -64,7 +64,7 @@ A demo application, built in Android Studio, is available in the `demo` folder o at the 2nd column from left and 3rd row from top. 1. Create a new application with a single activity ('Main'). 1. Save the image tiles to your `assets` directory. -1. Add `compile 'com.qozix:tileview:2.2.1'` to your gradle dependencies. +1. Add `compile 'com.qozix:tileview:2.2.2'` to your gradle dependencies. 1. In the Main Activity, use this for `onCreate`: ``` @Override diff --git a/tileview/build.gradle b/tileview/build.gradle index 64cf6707..7d8d009e 100644 --- a/tileview/build.gradle +++ b/tileview/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 11 targetSdkVersion 23 versionCode 33 - versionName "2.2.1" + versionName "2.2.2" } buildTypes { release {