summaryrefslogtreecommitdiff
path: root/android/src/com/artifex
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2012-11-27 00:39:02 +0100
committerRobin Watts <robin.watts@artifex.com>2012-11-27 15:44:22 +0000
commit2961adbf90d5eb737bf6aceaa6bfd7ca9e1dbc97 (patch)
treedf2122990bb790a8779a4c66953e5469db67c3ce /android/src/com/artifex
parent554163f2fe0cde5990bf323a13e5c04de4b7b30b (diff)
downloadmupdf-2961adbf90d5eb737bf6aceaa6bfd7ca9e1dbc97.tar.xz
android: Use custom styles for widgets.
Diffstat (limited to 'android/src/com/artifex')
-rw-r--r--android/src/com/artifex/mupdf/MuPDFActivity.java10
-rw-r--r--android/src/com/artifex/mupdf/OutlineActivity.java1
-rw-r--r--android/src/com/artifex/mupdf/PageView.java4
3 files changed, 8 insertions, 7 deletions
diff --git a/android/src/com/artifex/mupdf/MuPDFActivity.java b/android/src/com/artifex/mupdf/MuPDFActivity.java
index 81a23eee..283ed761 100644
--- a/android/src/com/artifex/mupdf/MuPDFActivity.java
+++ b/android/src/com/artifex/mupdf/MuPDFActivity.java
@@ -415,7 +415,7 @@ public class MuPDFActivity extends Activity
protected void onMoveToChild(int i) {
if (core == null)
return;
- mPageNumberView.setText(String.format("%d/%d", i+1, core.countPages()));
+ mPageNumberView.setText(String.format("%d / %d", i+1, core.countPages()));
mPageSlider.setMax((core.countPages()-1) * mPageSliderRes);
mPageSlider.setProgress(i * mPageSliderRes);
if (SearchTaskResult.get() != null && SearchTaskResult.get().pageNumber != i) {
@@ -546,11 +546,11 @@ public class MuPDFActivity extends Activity
mLinkButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
if (mLinkHighlight) {
- mLinkButton.setColorFilter(Color.argb(255, 255, 255, 255));
+ mLinkButton.setColorFilter(Color.argb(0xFF, 255, 255, 255));
mLinkHighlight = false;
} else {
- // light blue tint
- mLinkButton.setColorFilter(Color.argb(255, (37+255)/2, (114+255)/2, (172+255)/2));
+ // LINK_COLOR tint
+ mLinkButton.setColorFilter(Color.argb(0xFF, 172, 114, 37));
mLinkHighlight = true;
}
// Inform pages of the change.
@@ -753,7 +753,7 @@ public class MuPDFActivity extends Activity
void updatePageNumView(int index) {
if (core == null)
return;
- mPageNumberView.setText(String.format("%d/%d", index+1, core.countPages()));
+ mPageNumberView.setText(String.format("%d / %d", index+1, core.countPages()));
}
void makeButtonsView() {
diff --git a/android/src/com/artifex/mupdf/OutlineActivity.java b/android/src/com/artifex/mupdf/OutlineActivity.java
index dfb10639..262d4e22 100644
--- a/android/src/com/artifex/mupdf/OutlineActivity.java
+++ b/android/src/com/artifex/mupdf/OutlineActivity.java
@@ -16,6 +16,7 @@ public class OutlineActivity extends ListActivity {
setListAdapter(new OutlineAdapter(getLayoutInflater(),mItems));
// Restore the position within the list from last viewing
getListView().setSelection(OutlineActivityData.get().position);
+ getListView().setDividerHeight(0);
setResult(-1);
}
diff --git a/android/src/com/artifex/mupdf/PageView.java b/android/src/com/artifex/mupdf/PageView.java
index adacb3bd..f07ea8d8 100644
--- a/android/src/com/artifex/mupdf/PageView.java
+++ b/android/src/com/artifex/mupdf/PageView.java
@@ -41,8 +41,8 @@ class OpaqueImageView extends ImageView {
}
public abstract class PageView extends ViewGroup {
- private static final int HIGHLIGHT_COLOR = 0x805555FF;
- private static final int LINK_COLOR = 0x80FFCC88;
+ private static final int HIGHLIGHT_COLOR = 0x802572AC;
+ private static final int LINK_COLOR = 0x80AC7225;
private static final int BACKGROUND_COLOR = 0xFFFFFFFF;
private static final int PROGRESS_DIALOG_DELAY = 200;
private final Context mContext;