Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes for 339 and 340 #341

Merged
merged 2 commits into from
Aug 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tileview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
minSdkVersion 11
targetSdkVersion 23
versionCode 33
versionName "2.2.1"
versionName "2.2.2"
}
buildTypes {
release {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down