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

Use vector

Browse Source
This commit is contained in:
seven332 committed 2015-03-17 19:54:04 +08:00
1 parent b3d2310950
commit 1d40c9d873
27 files changed
+117 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/data/LofiGalleryInfo.java
+1 -3
View File
@@ -17,11 +17,9 @@ package com.hippo.ehviewer.data;
import android.os.Parcel;
import org.jetbrains.annotations.NotNull;
public class LofiGalleryInfo extends GalleryInfo {
public @NotNull String[] lofiTags;
public String[] lofiTags;
public static final Creator<LofiGalleryInfo> CREATOR =
new Creator<LofiGalleryInfo>() {
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+2 -3
View File
@@ -24,6 +24,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Parcelable;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.SparseArray;
@@ -39,8 +40,6 @@ import com.hippo.ehviewer.widget.SearchLayout;
import com.hippo.scene.Scene;
import com.hippo.widget.Appbar;
import org.jetbrains.annotations.NotNull;
public class GalleryListScene extends Scene implements SearchLayout.SearhLayoutHelper,
Scene.ActivityResultListener, ContentLayout.OnGetFitPaddingListener {
@@ -108,7 +107,7 @@ public class GalleryListScene extends Scene implements SearchLayout.SearhLayoutH
}
@Override
protected void onRestoreInstanceState(@NotNull SparseArray<Parcelable> savedStates) {
protected void onRestoreInstanceState(@NonNull SparseArray<Parcelable> savedStates) {
super.onRestoreInstanceState(savedStates);
// mSearchView and mListView may not in hierarchy
app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java
+2 -3
View File
@@ -17,12 +17,11 @@ package com.hippo.ehviewer.widget;
import android.content.Context;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import com.hippo.scene.StageLayout;
import org.jetbrains.annotations.NotNull;
public class ContentLayout extends StageLayout {
private OnGetFitPaddingListener mOnGetFitPaddingListener;
@@ -50,7 +49,7 @@ public class ContentLayout extends StageLayout {
@SuppressWarnings("deprecation")
@Override
protected boolean fitSystemWindows(@NotNull Rect insets) {
protected boolean fitSystemWindows(@NonNull Rect insets) {
mFitPaddingLeft = 0;
mFitPaddingTop = 0;
mFitPaddingRight = 0;
app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
+5 -6
View File
@@ -20,6 +20,8 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.SwitchCompat;
@@ -44,9 +46,6 @@ import com.hippo.widget.FloatingActionButton;
import com.hippo.widget.PrefixEditText;
import com.hippo.widget.recyclerview.EasyRecyclerView;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class SearchLayout extends FrameLayout implements CompoundButton.OnCheckedChangeListener,
View.OnClickListener, SelectSearchImageLayout.SelectSearchImageLayoutHelper {
@@ -171,14 +170,14 @@ public class SearchLayout extends FrameLayout implements CompoundButton.OnChecke
}
@Override
protected void dispatchSaveInstanceState(@NotNull SparseArray<Parcelable> container) {
protected void dispatchSaveInstanceState(@NonNull SparseArray<Parcelable> container) {
super.dispatchSaveInstanceState(container);
mSavedInstanceState = null;
}
@Override
protected void dispatchRestoreInstanceState(@NotNull SparseArray<Parcelable> container) {
protected void dispatchRestoreInstanceState(@NonNull SparseArray<Parcelable> container) {
super.dispatchRestoreInstanceState(container);
mSavedInstanceState = container;
@@ -247,7 +246,7 @@ public class SearchLayout extends FrameLayout implements CompoundButton.OnChecke
}
}
public void onSelectImage(@NotNull String imagePath) {
public void onSelectImage(@NonNull String imagePath) {
mImageView.onSelectImage(imagePath);
}
app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java
+2 -3
View File
@@ -22,6 +22,7 @@ import android.graphics.BitmapFactory;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,8 +36,6 @@ import com.hippo.util.ViewUtils;
import com.larvalabs.svgandroid.SVG;
import com.larvalabs.svgandroid.SVGBuilder;
import org.jetbrains.annotations.NotNull;
public class SelectSearchImageLayout extends LinearLayout implements View.OnClickListener{
private static final String STATE_KEY_SUPER = "super";
@@ -115,7 +114,7 @@ public class SelectSearchImageLayout extends LinearLayout implements View.OnClic
}
}
public void onSelectImage(@NotNull String selectPath) {
public void onSelectImage(@NonNull String selectPath) {
mSelectedPath = selectPath;
mTextPath.setText(selectPath);
app/src/main/java/com/hippo/scene/Scene.java
+6 -7
View File
@@ -18,6 +18,8 @@ package com.hippo.scene;
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentManager;
import android.util.SparseArray;
import android.view.View;
@@ -25,9 +27,6 @@ import android.view.ViewParent;
import com.hippo.util.AssertUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* {@link com.hippo.scene.Scene} is a {@code Activity} of {@link android.app.Activity}.
* <p>
@@ -55,7 +54,7 @@ public abstract class Scene {
return mSceneView;
}
public void startScene(@NotNull Class sceneClass, @Nullable Announcer announcer) {
public void startScene(@NonNull Class sceneClass, @Nullable Announcer announcer) {
sSceneManager.startScene(sceneClass, announcer);
}
@@ -181,7 +180,7 @@ public abstract class Scene {
outState.putSparseParcelableArray(getStateKey(), states);
}
void restoreInstanceState(@NotNull Bundle savedInstanceState) {
void restoreInstanceState(@NonNull Bundle savedInstanceState) {
if (mSceneView != null) {
SparseArray<Parcelable> savedStates
= savedInstanceState.getSparseParcelableArray(getStateKey());
@@ -191,13 +190,13 @@ public abstract class Scene {
}
}
protected void onSaveInstanceState(@NotNull SparseArray<Parcelable> outState) {
protected void onSaveInstanceState(@NonNull SparseArray<Parcelable> outState) {
if (mSceneView != null) {
mSceneView.saveHierarchyState(outState);
}
}
protected void onRestoreInstanceState(@NotNull SparseArray<Parcelable> savedStates) {
protected void onRestoreInstanceState(@NonNull SparseArray<Parcelable> savedStates) {
if (mSceneView != null) {
mSceneView.restoreHierarchyState(savedStates);
}
app/src/main/java/com/hippo/scene/SceneManager.java
+5 -6
View File
@@ -16,12 +16,11 @@
package com.hippo.scene;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.hippo.util.Log;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Stack;
class SceneManager {
@@ -43,7 +42,7 @@ class SceneManager {
return mStageActivity;
}
void startScene(@NotNull Class sceneClass, @Nullable Announcer announcer) {
void startScene(@NonNull Class sceneClass, @Nullable Announcer announcer) {
Scene scene;
try {
scene = (Scene) sceneClass.newInstance();
@@ -67,7 +66,7 @@ class SceneManager {
scene.resume();
}
void finishScene(@NotNull Scene scene) {
void finishScene(@NonNull Scene scene) {
if (mSceneStack.remove(scene)) {
scene.destroy();
} else {
@@ -109,7 +108,7 @@ class SceneManager {
}
}
protected void onRestoreInstanceState(@NotNull Bundle savedInstanceState) {
protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
for (Scene scene : mSceneStack) {
// Recreate
scene.create(savedInstanceState);
app/src/main/java/com/hippo/scene/StageActivity.java
+4 -5
View File
@@ -17,14 +17,13 @@ package com.hippo.scene;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.SparseArray;
import com.hippo.ehviewer.ui.AbsActionBarActivity;
import com.hippo.util.IntIdGenerator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class StageActivity extends AbsActionBarActivity {
private IntIdGenerator mActivityResultIdGenerator = IntIdGenerator.create();
@@ -66,7 +65,7 @@ public abstract class StageActivity extends AbsActionBarActivity {
getStageLayout().removeView(scene.getSceneView());
}
public void startScene(@NotNull Class sceneClass, @Nullable Announcer announcer) {
public void startScene(@NonNull Class sceneClass, @Nullable Announcer announcer) {
sSceneManager.startScene(sceneClass, announcer);
}
@@ -110,7 +109,7 @@ public abstract class StageActivity extends AbsActionBarActivity {
}
@Override
protected void onRestoreInstanceState(@NotNull Bundle savedInstanceState) {
protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
sSceneManager.onRestoreInstanceState(savedInstanceState);
app/src/main/java/com/hippo/scene/StageLayout.java
+3 -4
View File
@@ -19,12 +19,11 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.util.SparseArray;
import android.widget.FrameLayout;
import org.jetbrains.annotations.NotNull;
public class StageLayout extends FrameLayout {
public StageLayout(Context context) {
@@ -45,12 +44,12 @@ public class StageLayout extends FrameLayout {
}
@Override
protected void dispatchSaveInstanceState(@NotNull SparseArray<Parcelable> container) {
protected void dispatchSaveInstanceState(@NonNull SparseArray<Parcelable> container) {
// Do nothing
}
@Override
protected void dispatchRestoreInstanceState(@NotNull SparseArray<Parcelable> container) {
protected void dispatchRestoreInstanceState(@NonNull SparseArray<Parcelable> container) {
// Do nothing
}
}
app/src/main/java/com/hippo/widget/CheckTextView.java
+2 -3
View File
@@ -24,6 +24,7 @@ import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.View;
import android.view.View.OnClickListener;
@@ -32,8 +33,6 @@ import android.widget.TextView;
import com.hippo.util.ApiHelper;
import com.hippo.util.MathUtils;
import org.jetbrains.annotations.NotNull;
public class CheckTextView extends TextView implements OnClickListener, Hotspotable {
private static final String STATE_KEY_SUPER = "super";
@@ -145,7 +144,7 @@ public class CheckTextView extends TextView implements OnClickListener, Hotspota
}
@Override
protected void onDraw(@NotNull Canvas canvas) {
protected void onDraw(@NonNull Canvas canvas) {
super.onDraw(canvas);
if (mAimating) {
app/src/main/java/com/hippo/widget/DrawerFrameLayout.java
+2 -3
View File
@@ -20,11 +20,10 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.widget.FrameLayout;
import org.jetbrains.annotations.NotNull;
public class DrawerFrameLayout extends FrameLayout {
private static final int[] MAX_ATTRS = {android.R.attr.maxWidth};
@@ -76,7 +75,7 @@ public class DrawerFrameLayout extends FrameLayout {
@SuppressWarnings("deprecation")
@Override
protected boolean fitSystemWindows(@NotNull Rect insets) {
protected boolean fitSystemWindows(@NonNull Rect insets) {
mFitPaddingLeft = insets.left;
mFitPaddingTop = insets.top;
mFitPaddingRight = insets.right;