added rubber band like scrolling effect

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.2'
+compile 'com.qozix:tileview:'2.2.6'
 ```
 
 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.2'` to your gradle dependencies.
+1. Add `compile 'com.qozix:tileview:2.2.6'` to your gradle dependencies.
 1. In the Main Activity, use this for `onCreate`:
 ```
 @Override

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Aug 07 15:38:33 CDT 2016
+#Wed Oct 26 20:44:34 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

tileview/aar-release.gradle

@@ -51,5 +51,5 @@ generateRelease.dependsOn(zipRelease)
 
 artifacts {
     archives androidSourcesJar
-    archives androidJavadocsJar
+    //archives androidJavadocsJar
 }

tileview/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 33
-        versionName "2.2.2"
+        versionCode 37
+        versionName "2.2.6"
     }
     buildTypes {
         release {

tileview/src/main/java/com/qozix/tileview/TileView.java

@@ -19,6 +19,7 @@
 import com.qozix.tileview.detail.DetailLevelManager;
 import com.qozix.tileview.geom.CoordinateTranslater;
 import com.qozix.tileview.geom.FloatMathHelper;
+import com.qozix.tileview.graphics.BitmapRecycler;
 import com.qozix.tileview.graphics.BitmapProvider;
 import com.qozix.tileview.hotspots.HotSpot;
 import com.qozix.tileview.hotspots.HotSpotManager;
@@ -287,6 +288,18 @@ public void setBitmapProvider( BitmapProvider bitmapProvider ) {
     mTileCanvasViewGroup.setBitmapProvider( bitmapProvider );
   }
 
+  /**
+   * Sets a custom class to perform the Bitmap finalization on Tile#reset.
+   * By default, a BitmapRecycler implementation is provided that calls Bitmap#recycle, but
+   * alternative implementations could be used that recycle Bitmap instances to prevent garbage
+   * collection or do other things after the Bitmap is no longer needed for rendering.
+   *
+   * @param bitmapRecycler A class instance that implements BitmapRecycler and must define a recycleBitmap method, which accepts a Bitmap after it is no longer being used
+   */
+  public void setBitmapRecycler( BitmapRecycler bitmapRecycler ) {
+    mTileCanvasViewGroup.setBitmapRecycler( bitmapRecycler );
+  }
+
   /**
    * Defines whether tile bitmaps should be rendered using an AlphaAnimation
    *

tileview/src/main/java/com/qozix/tileview/graphics/BitmapProviderAssets.java

@@ -8,6 +8,7 @@
 import com.qozix.tileview.tiles.Tile;
 
 import java.io.InputStream;
+import java.util.Locale;
 
 /**
  * This is a very simple implementation of BitmapProvider, using a formatted string to find
@@ -30,7 +31,7 @@ public Bitmap getBitmap( Tile tile, Context context ) {
     Object data = tile.getData();
     if( data instanceof String ) {
       String unformattedFileName = (String) tile.getData();
-      String formattedFileName = String.format( unformattedFileName, tile.getColumn(), tile.getRow() );
+      String formattedFileName = String.format( Locale.US, unformattedFileName, tile.getColumn(), tile.getRow() );
       AssetManager assetManager = context.getAssets();
       try {
         InputStream inputStream = assetManager.open( formattedFileName );

tileview/src/main/java/com/qozix/tileview/graphics/BitmapRecycler.java

@@ -0,0 +1,13 @@
+package com.qozix.tileview.graphics;
+
+import android.graphics.Bitmap;
+
+/**
+ * This interface represents the final operations applied to a {@link Bitmap} owned by a
+ * {@link com.qozix.tileview.tiles.Tile} after it is no longer being used. Generally, this only
+ * entails a call to {@link Bitmap#recycle()}, but it also provides a place to catch {@link Bitmap}
+ * instances for reuse in a cache or an object pool.
+ */
+public interface BitmapRecycler {
+  void recycleBitmap( Bitmap bitmap );
+}

tileview/src/main/java/com/qozix/tileview/graphics/BitmapRecyclerDefault.java

@@ -0,0 +1,12 @@
+package com.qozix.tileview.graphics;
+
+import android.graphics.Bitmap;
+
+public class BitmapRecyclerDefault implements BitmapRecycler {
+  @Override
+  public void recycleBitmap( Bitmap bitmap ) {
+    if( !bitmap.isRecycled() ) {
+      bitmap.recycle();
+    }
+  }
+}

tileview/src/main/java/com/qozix/tileview/markers/MarkerLayout.java

@@ -54,8 +54,15 @@ public float getScale() {
   }
 
   public View addMarker( View view, int x, int y, Float aX, Float aY ) {
-    LayoutParams layoutParams = new LayoutParams( LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, x, y, aX, aY );
-    return addMarker( view, layoutParams );
+    ViewGroup.LayoutParams defaultLayoutParams = view.getLayoutParams();
+    LayoutParams markerLayoutParams = (defaultLayoutParams != null)
+      ? generateLayoutParams(defaultLayoutParams)
+      : generateDefaultLayoutParams();
+    markerLayoutParams.x = x;
+    markerLayoutParams.y = y;
+    markerLayoutParams.anchorX = aX;
+    markerLayoutParams.anchorY = aY;
+    return addMarker( view, markerLayoutParams );
   }
 
   public View addMarker( View view, LayoutParams params ) {
@@ -149,7 +156,7 @@ protected void onLayout( boolean changed, int l, int t, int r, int b ) {
   }
 
   @Override
-  protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+  protected MarkerLayout.LayoutParams generateDefaultLayoutParams() {
     return new LayoutParams( LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0, 0 );
   }
 
@@ -159,7 +166,7 @@ protected boolean checkLayoutParams( ViewGroup.LayoutParams layoutParams ) {
   }
 
   @Override
-  protected ViewGroup.LayoutParams generateLayoutParams( ViewGroup.LayoutParams layoutParams ) {
+  protected MarkerLayout.LayoutParams generateLayoutParams( ViewGroup.LayoutParams layoutParams ) {
     return new LayoutParams( layoutParams );
   }
 

tileview/src/main/java/com/qozix/tileview/tiles/Tile.java

@@ -10,6 +10,7 @@
 import com.qozix.tileview.detail.DetailLevel;
 import com.qozix.tileview.geom.FloatMathHelper;
 import com.qozix.tileview.graphics.BitmapProvider;
+import com.qozix.tileview.graphics.BitmapRecycler;
 
 import java.lang.ref.WeakReference;
 
@@ -58,6 +59,7 @@ public enum State {
   private DetailLevel mDetailLevel;
 
   private WeakReference<TileRenderRunnable> mTileRenderRunnableWeakReference;
+  private WeakReference<BitmapRecycler> mBitmapRecyclerReference;
 
   public Tile( int column, int row, int width, int height, Object data, DetailLevel detailLevel ) {
     mRow = row;
@@ -71,15 +73,7 @@ public Tile( int column, int row, int width, int height, Object data, DetailLeve
     mData = data;
     mDetailLevel = detailLevel;
     mDetailLevelScale = mDetailLevel.getScale();
-    mIntrinsicRect.set( 0, 0, mWidth, mHeight );
-    mBaseRect.set( mLeft, mTop, mRight, mBottom );
-    mRelativeRect.set(
-      FloatMathHelper.unscale( mLeft, mDetailLevelScale ),
-      FloatMathHelper.unscale( mTop, mDetailLevelScale ),
-      FloatMathHelper.unscale( mRight, mDetailLevelScale ),
-      FloatMathHelper.unscale( mBottom, mDetailLevelScale )
-    );
-    mScaledRect.set( mRelativeRect );
+    updateRects();
   }
 
   public int getWidth() {
@@ -151,6 +145,18 @@ public Rect getScaledRect( float scale ) {
     return mScaledRect;
   }
 
+  private void updateRects() {
+    mIntrinsicRect.set( 0, 0, mWidth, mHeight );
+    mBaseRect.set( mLeft, mTop, mRight, mBottom );
+    mRelativeRect.set(
+      FloatMathHelper.unscale( mLeft, mDetailLevelScale ),
+      FloatMathHelper.unscale( mTop, mDetailLevelScale ),
+      FloatMathHelper.unscale( mRight, mDetailLevelScale ),
+      FloatMathHelper.unscale( mBottom, mDetailLevelScale )
+    );
+    mScaledRect.set( mRelativeRect );
+  }
+
   public void setTransitionDuration( int transitionDuration ) {
     mTransitionDuration = transitionDuration;
   }
@@ -164,12 +170,17 @@ public void setState( State state ) {
   }
 
   public void execute( TileRenderPoolExecutor tileRenderPoolExecutor ) {
+    execute( tileRenderPoolExecutor, null );
+  }
+
+  public void execute( TileRenderPoolExecutor tileRenderPoolExecutor, BitmapRecycler recycler ) {
     if(mState != State.UNASSIGNED){
       return;
     }
     mState = State.PENDING_DECODE;
     TileRenderRunnable runnable = new TileRenderRunnable();
     mTileRenderRunnableWeakReference = new WeakReference<>( runnable );
+    mBitmapRecyclerReference = new WeakReference<>( recycler );
     runnable.setTile( this );
     runnable.setTileRenderPoolExecutor( tileRenderPoolExecutor );
     tileRenderPoolExecutor.execute( runnable );
@@ -223,6 +234,11 @@ void generateBitmap( Context context, BitmapProvider bitmapProvider ) {
       return;
     }
     mBitmap = bitmapProvider.getBitmap( this, context );
+    mWidth = mBitmap.getWidth();
+    mHeight = mBitmap.getHeight();
+    mRight = mLeft + mWidth;
+    mBottom = mTop + mHeight;
+    updateRects();
     mState = State.DECODED;
   }
 
@@ -245,8 +261,11 @@ void reset() {
     }
     mState = State.UNASSIGNED;
     mRenderTimeStamp = null;
-    if( mBitmap != null && !mBitmap.isRecycled() ) {
-      mBitmap.recycle();
+    if( mBitmap != null ) {
+      BitmapRecycler recycler = mBitmapRecyclerReference.get();
+      if( recycler != null ) {
+        recycler.recycleBitmap( mBitmap );
+      }
     }
     mBitmap = null;
   }
@@ -255,7 +274,7 @@ void reset() {
    * @param canvas The canvas the tile's bitmap should be drawn into
    */
   public void draw( Canvas canvas ) {
-    if( mBitmap != null ) {
+    if( mBitmap != null && !mBitmap.isRecycled() ) {
       canvas.drawBitmap( mBitmap, mIntrinsicRect, mRelativeRect, getPaint() );
     }
   }

tileview/src/main/java/com/qozix/tileview/tiles/TileCanvasViewGroup.java

@@ -10,6 +10,8 @@
 import android.view.ViewGroup;
 
 import com.qozix.tileview.detail.DetailLevel;
+import com.qozix.tileview.graphics.BitmapRecyclerDefault;
+import com.qozix.tileview.graphics.BitmapRecycler;
 import com.qozix.tileview.graphics.BitmapProvider;
 import com.qozix.tileview.graphics.BitmapProviderAssets;
 
@@ -34,6 +36,7 @@ public class TileCanvasViewGroup extends ViewGroup {
   private float mScale = 1;
 
   private BitmapProvider mBitmapProvider;
+  private BitmapRecycler mBitmapRecycler;
 
   private DetailLevel mDetailLevelToRender;
   private DetailLevel mLastRenderedDetailLevel;
@@ -112,10 +115,21 @@ public BitmapProvider getBitmapProvider() {
     return mBitmapProvider;
   }
 
+  public BitmapRecycler getBitmapRecycler() {
+    if( mBitmapRecycler == null ) {
+      mBitmapRecycler = new BitmapRecyclerDefault();
+    }
+    return mBitmapRecycler;
+  }
+
   public void setBitmapProvider( BitmapProvider bitmapProvider ) {
     mBitmapProvider = bitmapProvider;
   }
 
+  public void setBitmapRecycler( BitmapRecycler bitmapRecycler ) {
+    mBitmapRecycler = bitmapRecycler;
+  }
+
   public void setTileRenderListener( TileRenderListener tileRenderListener ) {
     mTileRenderListener = tileRenderListener;
   }

tileview/src/main/java/com/qozix/tileview/tiles/TileRenderPoolExecutor.java

@@ -51,7 +51,7 @@ public void queue( TileCanvasViewGroup tileCanvasViewGroup, Set<Tile> renderSet
       if( isShutdownOrTerminating() ) {
         return;
       }
-      tile.execute( this );
+      tile.execute( this, tileCanvasViewGroup.getBitmapRecycler() );
     }
   }