android/experimental/LOAndroid3/res/layout/activity_main.xml
| 12 ++++++++++
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
| 9 ++++++-
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
| 6 ++++-
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 7 +++++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 8 ++++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 8 ++++++
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
| 2 -
7 files changed, 46 insertions(+), 6 deletions(-)
New commits:
commit 5368184ec4402609b9f0b1ba5a016674adddfc83
Author: Tomaž Vajngerl <[email protected]>
Date: Tue Sep 30 18:00:54 2014 +0200
android: show loading animation until the document is loaded
Change-Id: I98eeafe30e90d039175daea65428526a95c9ff1e
diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml
b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 1d09af9..9fa5e51 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -32,4 +32,16 @@
android:background="#9FFF"
android:choiceMode="singleChoice"/>
+ <RelativeLayout
+ android:id="@+id/loadingPanel"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center" >
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminate="true" />
+ </RelativeLayout>
+
</android.support.v4.widget.DrawerLayout>
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index c6ee612..4493e94 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -75,6 +75,13 @@ public class LOKitThread extends Thread {
boolean isReady = mTileProvider.isReady();
if (isReady) {
refresh();
+ LOKitShell.getMainHandler().post(new Runnable() {
+ @Override
+ public void run() {
+ LibreOfficeMainActivity.mAppContext.hideProgressBar();
+ }
+ });
+
}
return isReady;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index cc86e0b..3c53454 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -195,6 +195,14 @@ public class LibreOfficeMainActivity extends Activity {
}
+ public void showProgressBar() {
+ findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
+ }
+
+ public void hideProgressBar() {
+ findViewById(R.id.loadingPanel).setVisibility(View.GONE);
+ }
+
private class DocumentPartClickListener implements
android.widget.AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView<?> parent, View view, int
position, long id) {
commit 114056c996519bc20390b087deae4ab1bdd917f4
Author: Tomaž Vajngerl <[email protected]>
Date: Tue Sep 30 17:50:35 2014 +0200
android: show thumbnails in DrawerLayout - parts side bar
Change-Id: Iae0ba5d7396f8f4d148fd2a298d0648dfc493b28
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
index e014e13..c5f6e33 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 5ec49e1..067d44d 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 7919a55..579ce30 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 1266f79..2d81d3e 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() {
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
