android: show thumbnails in DrawerLayout - parts side bar

Change-Id: Iae0ba5d7396f8f4d148fd2a298d0648dfc493b28

4 files changed, 19 insertions, 6 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
index e014e13d6399..c5f6e338eb5c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
@@ -1,13 +1,17 @@
 package org.libreoffice;
 
 
+import android.graphics.Bitmap;
+
 public class DocumentPartView {
     private final int partIndex;
     private final String partName;
+    private final Bitmap thumbnail;
 
-    public DocumentPartView(int partIndex, String partName) {
+    public DocumentPartView(int partIndex, String partName, Bitmap thumbnail) {
         this.partIndex = partIndex;
         this.partName = partName;
+        this.thumbnail = thumbnail;
     }
 
     public String getPartName() {
@@ -17,4 +21,7 @@ public class DocumentPartView {
     public int getPartIndex() {
         return partIndex;
     }
+    public Bitmap getThumbnail() {
+        return thumbnail;
+    }
 }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
index 5ec49e13e4b4..067d44d2c2f8 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
@@ -34,7 +34,11 @@ public class DocumentPartViewListAdpater extends ArrayAdapter<DocumentPartView>
         Log.i(LOGTAG, "getView - " + documentPartView.getPartName());
 
         ImageView imageView = (ImageView) view.findViewById(R.id.image);
-        imageView.setImageResource(R.drawable.writer);
+        if (documentPartView.getThumbnail() != null) {
+            imageView.setImageBitmap(documentPartView.getThumbnail());
+        } else {
+            imageView.setImageResource(R.drawable.writer);
+        }
 
         return view;
     }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 7919a554f1fb..579ce307f52a 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -67,7 +67,9 @@ public class LOKitTileProvider implements TileProvider {
                     }
                 }
                 Log.i(LOGTAG, "Document part " + i + " name:'" + partName + "'");
-                final DocumentPartView partView = new DocumentPartView(i, partName);
+
+                mDocument.setPart(i);
+                final DocumentPartView partView = new DocumentPartView(i, partName, thumbnail(128));
                 LibreOfficeMainActivity.mAppContext.getDocumentPartView().add(partView);
             }
 
@@ -129,9 +131,9 @@ public class LOKitTileProvider implements TileProvider {
         if (mDocument != null) {
             float twipX = pixelToTwip(x, mDPI) / zoom;
             float twipY = pixelToTwip(y, mDPI) / zoom;
-            float twipWidth  = mTileWidth / zoom;
+            float twipWidth = mTileWidth / zoom;
             float twipHeight = mTileHeight / zoom;
-            mDocument.paintTile(buffer, TILE_SIZE, TILE_SIZE, (int) twipX, (int) twipY, (int)twipWidth, (int)twipHeight);
+            mDocument.paintTile(buffer, TILE_SIZE, TILE_SIZE, (int) twipX, (int) twipY, (int) twipWidth, (int) twipHeight);
         } else {
             Log.e(LOGTAG, "Document is null!!");
         }
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
index 1266f7928528..2d81d3e0d1a0 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
@@ -17,7 +17,7 @@ public class MockTileProvider implements TileProvider {
 
         for (int i = 0; i < 5; i++) {
             String partName = "Part " + i;
-            DocumentPartView partView = new DocumentPartView(i, partName);
+            DocumentPartView partView = new DocumentPartView(i, partName, null);
             LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdpater().add(partView);
         }
         LibreOfficeMainActivity.mAppContext.mMainHandler.post(new Runnable() {