From c15f8ca38f526930bd4da7fe610b04cd8fa93bca Mon Sep 17 00:00:00 2001
From: fredrossperry <fredrossperry@gmail.com>
Date: Fri, 21 Aug 2015 13:27:08 -0700
Subject: Support for proofing

- use core.fileFormat to decide whether a proof file is being viewed,
- don't show the proofing button except for PDF files.
- in a proofing activity, show the page that was being viewed when
  the proof was requested.
- Add extra two arguments to fz_write_gproof_file in the Android build.
---
 platform/android/res/drawable-mdpi/ic_proof.png | Bin 1244 -> 2267 bytes
 platform/android/res/drawable-mdpi/ic_sep.png   | Bin 0 -> 1098 bytes
 platform/android/res/layout/buttons.xml         |  12 ++++++++++++
 platform/android/res/values/strings.xml         |   1 +
 4 files changed, 13 insertions(+)
 create mode 100644 platform/android/res/drawable-mdpi/ic_sep.png

(limited to 'platform/android/res')

diff --git a/platform/android/res/drawable-mdpi/ic_proof.png b/platform/android/res/drawable-mdpi/ic_proof.png
index 61d94587..cbda8721 100644
Binary files a/platform/android/res/drawable-mdpi/ic_proof.png and b/platform/android/res/drawable-mdpi/ic_proof.png differ
diff --git a/platform/android/res/drawable-mdpi/ic_sep.png b/platform/android/res/drawable-mdpi/ic_sep.png
new file mode 100644
index 00000000..2167be2e
Binary files /dev/null and b/platform/android/res/drawable-mdpi/ic_sep.png differ
diff --git a/platform/android/res/layout/buttons.xml b/platform/android/res/layout/buttons.xml
index 12de40c6..6c1620ba 100644
--- a/platform/android/res/layout/buttons.xml
+++ b/platform/android/res/layout/buttons.xml
@@ -30,6 +30,17 @@
 				android:textStyle="bold"
 				android:textAppearance="?android:attr/textAppearanceMedium" />
 
+			<ImageButton
+				android:id="@+id/sepsButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_centerVertical="true"
+				android:layout_alignParentRight="true"
+				android:contentDescription="Separations"
+				android:background="@drawable/button"
+				android:onClick="OnSepsButtonClick"
+				android:src="@drawable/ic_sep" />
+
 			<ImageButton
 				android:id="@+id/linkButton"
 				android:layout_width="wrap_content"
@@ -393,4 +404,5 @@
 		android:background="@drawable/page_num"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textColor="#FFFFFF" />
+
 </RelativeLayout>
diff --git a/platform/android/res/values/strings.xml b/platform/android/res/values/strings.xml
index dcff35f4..ab4b7152 100644
--- a/platform/android/res/values/strings.xml
+++ b/platform/android/res/values/strings.xml
@@ -26,6 +26,7 @@
 	<string name="ink">Ink</string>
 	<string name="save">Save</string>
 	<string name="proof">Proof</string>
+	<string name="separation">Separation</string>
 	<string name="print">Print</string>
 	<string name="dismiss">Dismiss</string>
 	<string name="parent_directory">[Up one level]</string>
-- 
cgit v1.2.3