diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e6c1c2ad9..9610bde1a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -61,7 +61,7 @@ 这很重要 - 上次该应用崩溃了。你愿意把日志发送给开发者以便以后得到更好的用户体验么？ + 上次该应用崩溃了。你愿意把错误日志发送给开发者以便以后得到更好的用户体验么？（以电子邮件的形式发送） 我愿意 门儿都没有 请在发送完日志后关闭该窗口 diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 23213a606..3d1759b2f 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -49,7 +49,7 @@ 這很重要 - 上次該應用崩潰了。你願意把日誌發送給開發者以便以後得到更好的用戶體驗麼？ + 上次該應用崩潰了。你願意把錯誤日誌發送給開發者以便以後得到更好的用戶體驗麼？（以電子郵件的形式發送） 我願意 門兒都沒有 請在發送完日誌後關閉該窗口 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index e09b7b630..1341d79cf 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -49,7 +49,7 @@ 這很重要 - 上次該應用崩潰了。你願意把日誌發送給開發者以便以後得到更好的使用者體驗麼？ + 上次該應用崩潰了。你願意把錯誤日誌發送給開發者以便以後得到更好的使用者體驗麼？（以電子郵件的形式發送） 我願意 門兒都沒有 請在發送完日誌後關閉該視窗 diff --git a/res/values/strings.xml b/res/values/strings.xml index 30a125674..362aa9d6e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -64,7 +64,7 @@ It is important - This application crashed last time. Would you mind to send logcat to the developer for a better user experience in future ? + This application crashed last time. Would you mind to send logcat to the developer for a better user experience in future ? (via e-mail) Never mind Yes, I would Please close the dialog after sending logcat diff --git a/src/com/hippo/ehviewer/gallery/GalleryView.java b/src/com/hippo/ehviewer/gallery/GalleryView.java index 3e6f7b169..ad86364ff 100644 --- a/src/com/hippo/ehviewer/gallery/GalleryView.java +++ b/src/com/hippo/ehviewer/gallery/GalleryView.java @@ -92,8 +92,8 @@ public class GalleryView extends GLView private static final float[] CENTER_AREA_SCALE = {2/7.0f, 3/8.0f, 5/7.0f, 5/8.0f}; private static final float MILLSEC_PER_DIX = 0.2f; - private static final float CHANGE_PAGE_PROPORTION = 0.05f; - private static final float CHANGE_PAGE_OFFSET = Ui.dp2pix(12); + private static final float CHANGE_PAGE_PROPORTION = 0.1f; + private static final float CHANGE_PAGE_OFFSET = Ui.dp2pix(24); // TODO 根据界面的大小调整缩放界限 private static final float SCALE_MIN = 1/10.0f; diff --git a/src/com/hippo/ehviewer/ui/DownloadActivity.java b/src/com/hippo/ehviewer/ui/DownloadActivity.java index 5bfade842..83f44c4bd 100644 --- a/src/com/hippo/ehviewer/ui/DownloadActivity.java +++ b/src/com/hippo/ehviewer/ui/DownloadActivity.java @@ -185,7 +185,6 @@ public class DownloadActivity extends AbsActivity { .inflate(R.layout.download_list_item, parent, false); CardViewSalon.reformWithShadow(((ViewGroup)convertView).getChildAt(0), 0xFFFAFAFA, 0, false); // TODO - mWindowsAnimate.addRippleEffect(((ViewGroup)convertView).getChildAt(0), true); ((TextView)convertView.findViewById(R.id.action)).setTextColor(mThemeColor); } LoadImageView thumb = (LoadImageView)convertView.findViewById(R.id.thumb); diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java index 36b7f6bdb..fca908533 100644 --- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java +++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java @@ -150,6 +150,7 @@ public class GalleryListActivity extends AbsGalleryActivity private EhClient mClient; private Resources mResources; private WindowsAnimate mWindowsAnimate; + private SearchRecentSuggestions mSuggestions; private SlidingMenu mSlidingMenu; private View mMenuLeft; @@ -514,7 +515,7 @@ public class GalleryListActivity extends AbsGalleryActivity String filePath = (String)mSearchImageText.getText(); File file = new File(filePath); if (!file.exists()) { - MaterialToast.showToast("图片不存在"); + MaterialToast.showToast("图片不存在"); // TODO } else { if (!file.canRead()) { MaterialToast.showToast("图片不可读"); @@ -942,6 +943,9 @@ public class GalleryListActivity extends AbsGalleryActivity mResources = getResources(); mWindowsAnimate = new WindowsAnimate(); mWindowsAnimate.init(this); + mSuggestions = new SearchRecentSuggestions( + GalleryListActivity.this, SimpleSuggestionProvider.AUTHORITY, + SimpleSuggestionProvider.MODE); handleIntent(getIntent()); // Check show drawer or not @@ -1259,10 +1263,7 @@ public class GalleryListActivity extends AbsGalleryActivity @Override public boolean onQueryTextSubmit(String query) { // Store suggestion - SearchRecentSuggestions suggestions = new SearchRecentSuggestions( - GalleryListActivity.this, SimpleSuggestionProvider.AUTHORITY, - SimpleSuggestionProvider.MODE); - suggestions.saveRecentQuery(query, null); + mSuggestions.saveRecentQuery(query, null); // collapse search view if (mSearchItem != null) mSearchItem.collapseActionView(); diff --git a/src/com/hippo/ehviewer/widget/ExpandingListView.java b/src/com/hippo/ehviewer/widget/ExpandingListView.java index d2c2c38a2..ef58a707c 100644 --- a/src/com/hippo/ehviewer/widget/ExpandingListView.java +++ b/src/com/hippo/ehviewer/widget/ExpandingListView.java @@ -263,6 +263,9 @@ public class ExpandingListView extends ListView { setSelectionFromTop(firstVisiblePosition, firstChildStartTop - deltaTop - getPaddingTop()); + /* Request another layout to update the layout parameters of the cells.*/ + requestLayout(); + /* Return false such that the ListView does not redraw its contents on * this layout but only updates all the parameters associated with its * children.*/ @@ -458,6 +461,8 @@ public class ExpandingListView extends ListView { setSelectionFromTop(firstVisiblePosition, firstChildStartTop - deltaTop - getPaddingTop()); + requestLayout(); + return false; }