yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改手势，字符串

Browse Source
This commit is contained in:
seven332 committed 2014-04-07 11:23:46 +08:00
1 parent c6c060b5e2
commit 74e37ea72d
10 files changed
+47 -156
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/EhViewer.apk
BIN
View File
Binary file not shown.
bin/classes.dex
BIN
View File
Binary file not shown.
bin/dexedLibs/android-support-v4-ad222bec85930bfd3f22cbfb79715dcb.jar
BIN
View File
Binary file not shown.
bin/dexedLibs/commons-lang3-3.2.1-8a36c15e1c40f2ad0206e5389bc96b5a.jar
BIN
View File
Binary file not shown.
bin/proguard.txt
-122
View File
@@ -1,122 +0,0 @@
# view AndroidManifest.xml #generated:15
-keep class com.hippo.ehviewer.AppContext { <init>(...); }
# view AndroidManifest.xml #generated:24
-keep class com.hippo.ehviewer.StartActivity { <init>(...); }
# view AndroidManifest.xml #generated:77
-keep class com.hippo.ehviewer.activity.DownloadActivity { <init>(...); }
# view AndroidManifest.xml #generated:69
-keep class com.hippo.ehviewer.activity.FavouriteActivity { <init>(...); }
# view AndroidManifest.xml #generated:55
-keep class com.hippo.ehviewer.activity.MangaActivity { <init>(...); }
# view AndroidManifest.xml #generated:48
-keep class com.hippo.ehviewer.activity.MangaDetailActivity { <init>(...); }
# view AndroidManifest.xml #generated:86
-keep class com.hippo.ehviewer.activity.MangaDownloadActivity { <init>(...); }
# view AndroidManifest.xml #generated:35
-keep class com.hippo.ehviewer.activity.MangaListActivity { <init>(...); }
# view AndroidManifest.xml #generated:61
-keep class com.hippo.ehviewer.activity.SettingsActivity { <init>(...); }
# view res/layout/gl_root_group.xml #generated:7
-keep class com.hippo.ehviewer.gallery.ui.GLRootView { <init>(...); }
# view res/xml/settings.xml #generated:13
# view res/xml/settings.xml #generated:21
# view res/xml/settings.xml #generated:5
# view res/xml/settings.xml #generated:71
-keep class com.hippo.ehviewer.preference.AutoListPreference { <init>(...); }
# view AndroidManifest.xml #generated:94
-keep class com.hippo.ehviewer.service.DownloadService { <init>(...); }
# view res/layout/dialog.xml #generated:70
# view res/layout/dialog.xml #generated:77
# view res/layout/dialog.xml #generated:84
-keep class com.hippo.ehviewer.view.AlertButton { <init>(...); }
# view res/layout/filter.xml #generated:19
# view res/layout/filter.xml #generated:27
# view res/layout/filter.xml #generated:37
# view res/layout/filter.xml #generated:45
# view res/layout/filter.xml #generated:55
# view res/layout/filter.xml #generated:63
# view res/layout/filter.xml #generated:73
# view res/layout/filter.xml #generated:81
# view res/layout/filter.xml #generated:91
# view res/layout/filter.xml #generated:99
-keep class com.hippo.ehviewer.view.CheckImage { <init>(...); }
# view res/layout/download_item.xml #generated:1
-keep class com.hippo.ehviewer.view.DownloadItemLayout { <init>(...); }
# view res/layout/list.xml #generated:6
-keep class com.hippo.ehviewer.view.GetPaddingRelativeLayout { <init>(...); }
# view res/layout/manga.xml #generated:1
-keep class com.hippo.ehviewer.view.MangaViewPager { <init>(...); }
# view res/layout/detail.xml #generated:20
# view res/layout/download_item.xml #generated:8
-keep class com.hippo.ehviewer.view.OlImageView { <init>(...); }
# view res/layout/list_menu_list.xml #generated:1
-keep class com.hippo.ehviewer.view.TagListView { <init>(...); }
# view res/layout/page_list.xml #generated:13
-keep class com.hippo.ehviewer.widget.AutoWrapLayout { <init>(...); }
# view res/layout/list.xml #generated:1
-keep class com.hippo.ehviewer.widget.DrawerLayout { <init>(...); }
# view res/layout/list_item.xml #generated:6
-keep class com.hippo.ehviewer.widget.LoadImageView { <init>(...); }
# view res/layout/list.xml #generated:12
-keep class com.hippo.ehviewer.widget.PullListView { <init>(...); }
# onClick res/layout/page_list_panel.xml #generated:6
-keepclassmembers class * { *** ButtonBack(...); }
# onClick res/layout/page_list_panel.xml #generated:25
-keepclassmembers class * { *** ButtonFront(...); }
# onClick res/layout/page_list.xml #generated:28
-keepclassmembers class * { *** ButtonPreviewRefresh(...); }
# onClick res/layout/menu_login.xml #generated:17
-keepclassmembers class * { *** buttonCheckLogin(...); }
# onClick res/layout/detail_offensive.xml #generated:41
-keepclassmembers class * { *** buttonEvery(...); }
# onClick res/layout/detail_offensive.xml #generated:23
# onClick res/layout/detail_pining.xml #generated:15
-keepclassmembers class * { *** buttonFinsh(...); }
# onClick res/layout/menu_login.xml #generated:6
-keepclassmembers class * { *** buttonLogin(...); }
# onClick res/layout/menu_login_over.xml #generated:16
-keepclassmembers class * { *** buttonLogout(...); }
# onClick res/layout/detail_offensive.xml #generated:31
-keepclassmembers class * { *** buttonOnce(...); }
# onClick res/layout/detail_normal.xml #generated:73
-keepclassmembers class * { *** buttonRead(...); }
# onClick res/layout/detail.xml #generated:60
# onClick res/layout/list.xml #generated:25
-keepclassmembers class * { *** buttonRefresh(...); }
# onClick res/layout/page_list_panel.xml #generated:12
-keepclassmembers class * { *** goTo(...); }
bin/resources.ap_
BIN
View File
Binary file not shown.
res/values-zh-rCN/strings.xml
+2 -2
View File
@@ -153,8 +153,8 @@
<string name="create_cache_error">创建缓存错误</string>
<!-- server -->
<string name="update_server_google">国外服务器</string>
<string name="update_server_qiniu">国内服务器</string>
<string name="update_server_google">Google</string>
<string name="update_server_qiniu">七牛</string>
<!-- Tag -->
<string name="add_tag">添加标签</string>
src/com/hippo/ehviewer/activity/MangaActivity.java
+2
View File
@@ -150,6 +150,8 @@ public class MangaActivity extends Activity {
private boolean testImage(String path, String name) {
boolean isImage = false;
File file = new File(path, name);
if (!file.exists() || !file.isFile())
return false;
FileInputStream fis = null;
try {
// Just test bound might error
src/com/hippo/ehviewer/gallery/GalleryView.java
+40 -29
View File
@@ -6,9 +6,6 @@ import android.graphics.Color;
import android.graphics.Movie;
import android.graphics.Rect;
import android.graphics.RectF;
import com.hippo.ehviewer.util.Log;
import android.view.MotionEvent;
import com.hippo.ehviewer.R;
@@ -24,6 +21,10 @@ import com.hippo.ehviewer.gallery.ui.GLView;
import com.hippo.ehviewer.gallery.ui.GestureRecognizer;
import com.hippo.ehviewer.gallery.util.GalleryUtils;
import com.hippo.ehviewer.util.Config;
import com.hippo.ehviewer.util.Log;
import com.hippo.ehviewer.util.ThreadPool;
import com.hippo.ehviewer.util.ThreadPool.Job;
import com.hippo.ehviewer.util.ThreadPool.JobContext;
import com.hippo.ehviewer.util.TimeRunner;
import com.hippo.ehviewer.util.Ui;
@@ -93,6 +94,7 @@ public class GalleryView extends GLView {
// TODO
private static final int BACKGROUND_COLOR = Color.BLACK;
@SuppressWarnings("unused")
private static final int MASK_COLOR = 0x88000000;
@@ -144,6 +146,8 @@ public class GalleryView extends GLView {
private OnTapTextListener mOnTapTextListener;
private OnScrollPageListener mOnScrollPageListener;
private ThreadPool mMovieWait;
public interface OnEdgeListener {
public void onFirstPageEdge();
public void onLastPageEdge();
@@ -182,6 +186,8 @@ public class GalleryView extends GLView {
setState();
mMovieWait = new ThreadPool(1, 1);
mGestureRecognizer = new GestureRecognizer(mContext, new MyGestureListener());
setBackgroundColor(GalleryUtils.intColorToFloatARGBArray(BACKGROUND_COLOR));
@@ -296,24 +302,24 @@ public class GalleryView extends GLView {
//canvas.fillRect(0, 0, mWidth, mHeight, MASK_COLOR);
// TODO
if (hasMovie) {
Log.d(TAG, "hasMovie");
new Thread() {
@Override
public void run() {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
invalidate();
}
}
}.start();
}
if (hasMovie)
mMovieWait.submit(mMovieShowJob);
}
private Job<Object> mMovieShowJob = new Job<Object>() {
@Override
public Object run(JobContext jc) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
invalidate();
}
return null;
}
};
private void resetSizePosition() {
resetSizePosition(PRE_TARGET_INDEX);
resetSizePosition(CUR_TARGET_INDEX);
@@ -579,11 +585,9 @@ public class GalleryView extends GLView {
@Override
public void onDecodeOver(Object res, int index) {
int targetIndex = index - mCurIndex + 1;
ShowItem showItem;
Image image;
if (targetIndex < 0 || targetIndex > 2
|| !((showItem = showItems[targetIndex]) instanceof EmptyItem)) {// If it do not need any more
|| !(showItems[targetIndex] instanceof EmptyItem)) {// If it do not need any more
if (res != null && res instanceof Bitmap)
((Bitmap)res).recycle();
} else {
@@ -777,9 +781,14 @@ public class GalleryView extends GLView {
}
@Override
public boolean onSingleTapUp(float x, float y) {
if (mScrollState != SCROLL_NONE || mShowTapAreaTurn)
public boolean onSingleTapConfirmed(float x, float y) {
if (mScrollState != SCROLL_NONE) {
return false;
}
if (mShowTapAreaTurn) {
mShowTapAreaTurn = false;
return false;
}
if ( showItems[CUR_TARGET_INDEX] == null
|| showItems[CUR_TARGET_INDEX] instanceof Text) {
@@ -815,6 +824,7 @@ public class GalleryView extends GLView {
@Override
public boolean onDoubleTap(float x, float y) {
Log.d(TAG, "onDoubleTap");
return true;
}
@@ -1029,8 +1039,13 @@ public class GalleryView extends GLView {
@Override
public void onUp() {
mShowEdegTip = true;
if (!mShowTapArea)
// if use onSingleTapUp, use below
/*
* if (mShowTapAreaTurn) {
mShowTapAreaTurn = false;
*/
}
// *** TimeRunner *** //
@@ -1168,10 +1183,6 @@ public class GalleryView extends GLView {
imageScale = 1;
}
public boolean isLoaded() {
return mTexture != null;
}
@Override
public void draw(GLCanvas canvas, int xOffset, int yOffset) {
if (mTexture != null) {
src/com/hippo/ehviewer/gallery/ui/GestureRecognizer.java
+3 -3
View File
@@ -29,7 +29,7 @@ public class GestureRecognizer {
private static final String TAG = "GestureRecognizer";
public interface Listener {
boolean onSingleTapUp(float x, float y);
boolean onSingleTapConfirmed(float x, float y);
boolean onDoubleTap(float x, float y);
void onLongPress(MotionEvent e);
boolean onScrollBegin(float dx, float dy, float totalX, float totalY);
@@ -82,8 +82,8 @@ public class GestureRecognizer {
float firstX = 0;
float firstY = 0;
@Override
public boolean onSingleTapUp(MotionEvent e) {
return mListener.onSingleTapUp(e.getX(), e.getY());
public boolean onSingleTapConfirmed(MotionEvent e) {
return mListener.onSingleTapConfirmed(e.getX(), e.getY());
}
@Override