Android example - hook up the back button to finish the activity.

2 files changed, 30 insertions, 0 deletions

diff --git a/platform/android/example/app/src/main/java/com/artifex/mupdf/example/DocViewActivity.java b/platform/android/example/app/src/main/java/com/artifex/mupdf/example/DocViewActivity.java
index 7cc4b076..48d73305 100755
--- a/platform/android/example/app/src/main/java/com/artifex/mupdf/example/DocViewActivity.java
+++ b/platform/android/example/app/src/main/java/com/artifex/mupdf/example/DocViewActivity.java
@@ -24,8 +24,19 @@ public class DocViewActivity extends Activity
 		mDocActivityView = (DocActivityView) findViewById(R.id.doc_view);
 		mDocActivityView.showUI(true);  //  set to false for no built-in UI
 
+		//  set a listener for when it's done
+		mDocActivityView.setOnDoneListener(new DocActivityView.OnDoneListener()
+		{
+			@Override
+			public void done()
+			{
+				finish();
+			}
+		});
+
 		//  Go!
 		mDocActivityView.start(path);
+
 	}
 
 	@Override
diff --git a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocActivityView.java b/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocActivityView.java
index d6b3fbb9..5d5834be 100644
--- a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocActivityView.java
+++ b/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocActivityView.java
@@ -46,6 +46,7 @@ public class DocActivityView extends FrameLayout implements TabHost.OnTabChangeL
 	private EditText mSearchText;
 	private ImageButton mSearchNextButton;
 	private ImageButton mSearchPreviousButton;
+	private ImageButton mBackButton;
 
 	public DocActivityView(Context context)
 	{
@@ -289,6 +290,9 @@ public class DocActivityView extends FrameLayout implements TabHost.OnTabChangeL
 
 		//  connect buttons to functions
 
+		mBackButton = (ImageButton)findViewById(R.id.back_button);
+		mBackButton.setOnClickListener(this);
+
 		mReflowButton = (ImageButton)findViewById(R.id.reflow_button);
 		mReflowButton.setOnClickListener(this);
 
@@ -415,6 +419,8 @@ public class DocActivityView extends FrameLayout implements TabHost.OnTabChangeL
 			onSearchNextButton();
 		if (v == mSearchPreviousButton)
 			onSearchPreviousButton();
+		if (v == mBackButton)
+			onBackButton();
 	}
 
 	public void onSearchNextButton()
@@ -517,4 +523,17 @@ public class DocActivityView extends FrameLayout implements TabHost.OnTabChangeL
 		byte bytes[] = dpv.getPage().textAsHtml();
 		mDocReflowView.setHTML(bytes);
 	}
+
+	private void onBackButton()
+	{
+		if (mDoneListener != null)
+			mDoneListener.done();
+	}
+
+	private OnDoneListener mDoneListener = null;
+	public void setOnDoneListener(OnDoneListener l) {mDoneListener = l;}
+	public interface OnDoneListener
+	{
+		public void done();
+	}
 }