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

Fix error due to bad android.jar

Browse Source
This commit is contained in:
seven332 committed 2015-06-07 20:40:21 +08:00
1 parent 6edc156dd0
commit 3f75e1d685
12 files changed
+26 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+1 -1
View File
@@ -16,9 +16,9 @@
package com.hippo.ehviewer.ui.scene;
import android.annotation.Nullable;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.TextView;
app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+1 -1
View File
@@ -16,8 +16,8 @@
package com.hippo.ehviewer.ui.scene;
import android.annotation.Nullable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.KeyEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java
+4 -4
View File
@@ -77,12 +77,12 @@ public class DrawerLeftPanel extends LinearLayout implements FitPaddingImpl {
mSignIn = false;
mAvatar.setImageURI(DEFAULT_AVATAR_URI);
mUsename.setText("");
mAction.setText(mContext.getString(R.string.signin));
mAction.setText(getContext().getString(R.string.signin));
} else if (obj instanceof String) {
// Sign in
mSignIn = true;
mUsename.setText((String) obj);
mAction.setText(mContext.getString(R.string.signout));
mAction.setText(getContext().getString(R.string.signout));
}
} else if (id == Constants.MESSENGER_ID_USER_AVATAR) {
if (mSignIn && obj instanceof Uri) {
@@ -142,11 +142,11 @@ public class DrawerLeftPanel extends LinearLayout implements FitPaddingImpl {
// TODO
mAvatar.setImageURI(DEFAULT_AVATAR_URI);
mUsename.setText(Config.getDisplayName());
mAction.setText(mContext.getString(R.string.signout));
mAction.setText(getContext().getString(R.string.signout));
} else {
mAvatar.setImageURI(DEFAULT_AVATAR_URI);
mUsename.setText("");
mAction.setText(mContext.getString(R.string.signin));
mAction.setText(getContext().getString(R.string.signin));
}
}
app/src/main/java/com/hippo/scene/AppbarScene.java
+3 -3
View File
@@ -16,11 +16,11 @@
package com.hippo.scene;
import android.annotation.DrawableRes;
import android.annotation.Nullable;
import android.annotation.StringRes;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
app/src/main/java/com/hippo/scene/preference/ListPreference.java
+1 -1
View File
@@ -16,7 +16,7 @@
package com.hippo.scene.preference;
import android.annotation.NonNull;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import com.hippo.ehviewer.util.Config;
app/src/main/java/com/hippo/scene/preference/Preference.java
+3 -2
View File
@@ -16,8 +16,8 @@
package com.hippo.scene.preference;
import android.annotation.NonNull;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@@ -30,7 +30,8 @@ public class Preference extends PreferenceBase {
private int mPosition;
private @NonNull String mKey;
private @NonNull
String mKey;
private String mTitle;
private String mSummary;
app/src/main/java/com/hippo/scene/preference/PreferenceHeaderScene.java
+1 -1
View File
@@ -16,8 +16,8 @@
package com.hippo.scene.preference;
import android.annotation.NonNull;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
app/src/main/java/com/hippo/scene/preference/SwitchPreference.java
+1 -1
View File
@@ -16,8 +16,8 @@
package com.hippo.scene.preference;
import android.annotation.NonNull;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
app/src/main/java/com/hippo/util/FrescoUtils.java
+2 -2
View File
@@ -16,14 +16,14 @@
package com.hippo.util;
import android.annotation.IdRes;
import android.net.Uri;
import android.support.annotation.DrawableRes;
import com.facebook.common.util.UriUtil;
public class FrescoUtils {
public static Uri getResourcesDrawableUri(@IdRes int resId) {
public static Uri getResourcesDrawableUri(@DrawableRes int resId) {
return new Uri.Builder().scheme(UriUtil.LOCAL_RESOURCE_SCHEME)
.path(String.valueOf(resId)).build();
}
app/src/main/java/com/hippo/util/Utils.java
+1 -1
View File
@@ -16,12 +16,12 @@
package com.hippo.util;
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Vibrator;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
app/src/main/java/com/hippo/widget/SimpleImageView.java
+1 -1
View File
@@ -16,11 +16,11 @@
package com.hippo.widget;
import android.annotation.DrawableRes;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.View;
app/src/main/java/com/hippo/widget/recyclerview/EasyRecyclerView.java
+7 -10
View File
@@ -269,15 +269,13 @@ public class EasyRecyclerView extends RecyclerView {
@Override
protected void dispatchDraw(@NonNull Canvas canvas) {
int saveCount = 0;
final boolean clipToPadding = (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK;
if (clipToPadding) {
if (getClipToPadding()) {
saveCount = canvas.save();
final int scrollX = mScrollX;
final int scrollY = mScrollY;
canvas.clipRect(scrollX + mPaddingLeft, scrollY + mPaddingTop,
scrollX + mRight - mLeft - mPaddingRight,
scrollY + mBottom - mTop - mPaddingBottom);
mGroupFlags &= ~CLIP_TO_PADDING_MASK;
final int scrollX = getScrollX();
final int scrollY = getScrollY();
canvas.clipRect(scrollX + getPaddingLeft(), scrollY + getPaddingTop(),
scrollX + getRight() - getLeft() - getPaddingRight(),
scrollY + getBottom() - getTop() - getPaddingBottom());
}
// TODO disable selector drawable state change when need not to draw selector
@@ -297,9 +295,8 @@ public class EasyRecyclerView extends RecyclerView {
drawSelector(canvas);
}
if (clipToPadding) {
if (getClipToPadding()) {
canvas.restoreToCount(saveCount);
mGroupFlags |= CLIP_TO_PADDING_MASK;
}
}