diff options
| -rw-r--r-- | res/drawable-hdpi/badimage.png | bin | 0 -> 14350 bytes | |||
| -rw-r--r-- | res/drawable/s_badimage.svg | 88 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ComicFragment.java | 1 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ViewComicActivity.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttcomics/ViewPager.java | 7 |
5 files changed, 96 insertions, 2 deletions
diff --git a/res/drawable-hdpi/badimage.png b/res/drawable-hdpi/badimage.png Binary files differnew file mode 100644 index 0000000..bc71802 --- /dev/null +++ b/res/drawable-hdpi/badimage.png diff --git a/res/drawable/s_badimage.svg b/res/drawable/s_badimage.svg new file mode 100644 index 0000000..8c61713 --- /dev/null +++ b/res/drawable/s_badimage.svg @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="64px" + height="64px" + id="svg2985" + version="1.1" + inkscape:version="0.48.0 r9654" + inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttcomics\res\drawable\badimage.png" + inkscape:export-xdpi="800" + inkscape:export-ydpi="800" + sodipodi:docname="s_badimage.svg"> + <defs + id="defs2987" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.5" + inkscape:cx="3.6363636" + inkscape:cy="32" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:window-width="1600" + inkscape:window-height="1138" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" /> + <metadata + id="metadata2990"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <path + sodipodi:type="star" + style="opacity:0.25000000000000000;fill:#909090;fill-opacity:1;stroke:none" + id="path2999" + sodipodi:sides="3" + sodipodi:cx="33.090908" + sodipodi:cy="8.363636" + sodipodi:r1="33.989788" + sodipodi:r2="16.994896" + sodipodi:arg1="2.6179939" + sodipodi:arg2="3.6651914" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 3.6548878,25.358529 33.090909,-25.626152 62.526928,25.358531 z" + inkscape:transform-center-y="-8.4974474" + transform="translate(-1.0909077,32.133811)" /> + <text + xml:space="preserve" + style="font-size:23.69292450000000000px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans" + x="21.763916" + y="50.357021" + id="text2993" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan2995" + x="21.763916" + y="50.357021" + style="font-size:33.17009354000000300px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial Bold">?</tspan></text> + </g> +</svg> diff --git a/src/org/fox/ttcomics/ComicFragment.java b/src/org/fox/ttcomics/ComicFragment.java index d55b102..21c50fd 100644 --- a/src/org/fox/ttcomics/ComicFragment.java +++ b/src/org/fox/ttcomics/ComicFragment.java @@ -102,6 +102,7 @@ public class ComicFragment extends Fragment { image.setImageBitmap(result);
} else {
activity.toast(R.string.error_loading_image);
+ image.setImageResource(R.drawable.badimage);
}
}
}
diff --git a/src/org/fox/ttcomics/ViewComicActivity.java b/src/org/fox/ttcomics/ViewComicActivity.java index cb17495..95917c5 100644 --- a/src/org/fox/ttcomics/ViewComicActivity.java +++ b/src/org/fox/ttcomics/ViewComicActivity.java @@ -110,7 +110,7 @@ public class ViewComicActivity extends CommonActivity { // upload progress
if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) {
- toast(R.string.sync_uploading);
+ //toast(R.string.sync_uploading);
m_syncClient.setPosition(sha1(new File(m_fileName).getName()), getLastPosition(m_fileName));
}
}
diff --git a/src/org/fox/ttcomics/ViewPager.java b/src/org/fox/ttcomics/ViewPager.java index 18bcc49..6d9c68f 100644 --- a/src/org/fox/ttcomics/ViewPager.java +++ b/src/org/fox/ttcomics/ViewPager.java @@ -19,7 +19,12 @@ public class ViewPager extends android.support.v4.view.ViewPager { protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) {
if (v instanceof ImageViewTouch) {
ImageViewTouch ivt = (ImageViewTouch) v;
- return ivt.canScroll(dx);
+ try {
+ return ivt.canScroll(dx);
+ } catch (NullPointerException e) {
+ // bad image, etc
+ return false;
+ }
} else {
return super.canScroll(v, checkV, dx, x, y);
}
|
