diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 3570ace50..be3bc6a77 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -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; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java index 6495ccef7..591f8bb39 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java @@ -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; diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java b/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java index 9a1f68ce4..4c644d347 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java @@ -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)); } } diff --git a/app/src/main/java/com/hippo/scene/AppbarScene.java b/app/src/main/java/com/hippo/scene/AppbarScene.java index 4c57792c3..409ddd740 100644 --- a/app/src/main/java/com/hippo/scene/AppbarScene.java +++ b/app/src/main/java/com/hippo/scene/AppbarScene.java @@ -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; diff --git a/app/src/main/java/com/hippo/scene/preference/ListPreference.java b/app/src/main/java/com/hippo/scene/preference/ListPreference.java index 7e5bd492a..6d3ce3076 100644 --- a/app/src/main/java/com/hippo/scene/preference/ListPreference.java +++ b/app/src/main/java/com/hippo/scene/preference/ListPreference.java @@ -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; diff --git a/app/src/main/java/com/hippo/scene/preference/Preference.java b/app/src/main/java/com/hippo/scene/preference/Preference.java index 06f95f36b..8bd0bdf88 100644 --- a/app/src/main/java/com/hippo/scene/preference/Preference.java +++ b/app/src/main/java/com/hippo/scene/preference/Preference.java @@ -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; diff --git a/app/src/main/java/com/hippo/scene/preference/PreferenceHeaderScene.java b/app/src/main/java/com/hippo/scene/preference/PreferenceHeaderScene.java index bdb6fc8f9..3cf89b073 100644 --- a/app/src/main/java/com/hippo/scene/preference/PreferenceHeaderScene.java +++ b/app/src/main/java/com/hippo/scene/preference/PreferenceHeaderScene.java @@ -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; diff --git a/app/src/main/java/com/hippo/scene/preference/SwitchPreference.java b/app/src/main/java/com/hippo/scene/preference/SwitchPreference.java index 5ad829604..75b48b025 100644 --- a/app/src/main/java/com/hippo/scene/preference/SwitchPreference.java +++ b/app/src/main/java/com/hippo/scene/preference/SwitchPreference.java @@ -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; diff --git a/app/src/main/java/com/hippo/util/FrescoUtils.java b/app/src/main/java/com/hippo/util/FrescoUtils.java index c76f9473f..afcbc58fc 100644 --- a/app/src/main/java/com/hippo/util/FrescoUtils.java +++ b/app/src/main/java/com/hippo/util/FrescoUtils.java @@ -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(); } diff --git a/app/src/main/java/com/hippo/util/Utils.java b/app/src/main/java/com/hippo/util/Utils.java index 82e4a4ea4..36f5415a5 100644 --- a/app/src/main/java/com/hippo/util/Utils.java +++ b/app/src/main/java/com/hippo/util/Utils.java @@ -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; diff --git a/app/src/main/java/com/hippo/widget/SimpleImageView.java b/app/src/main/java/com/hippo/widget/SimpleImageView.java index cb27121a4..28b4902a0 100644 --- a/app/src/main/java/com/hippo/widget/SimpleImageView.java +++ b/app/src/main/java/com/hippo/widget/SimpleImageView.java @@ -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; diff --git a/app/src/main/java/com/hippo/widget/recyclerview/EasyRecyclerView.java b/app/src/main/java/com/hippo/widget/recyclerview/EasyRecyclerView.java index 3dd628d59..f78e45648 100644 --- a/app/src/main/java/com/hippo/widget/recyclerview/EasyRecyclerView.java +++ b/app/src/main/java/com/hippo/widget/recyclerview/EasyRecyclerView.java @@ -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; } }