diff --git a/app/src/main/java/com/hippo/ehviewer/data/LofiGalleryInfo.java b/app/src/main/java/com/hippo/ehviewer/data/LofiGalleryInfo.java index 3b79db210..26e98ac97 100644 --- a/app/src/main/java/com/hippo/ehviewer/data/LofiGalleryInfo.java +++ b/app/src/main/java/com/hippo/ehviewer/data/LofiGalleryInfo.java @@ -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 CREATOR = new Creator() { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index a2c6f3edc..9812962f1 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -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 savedStates) { + protected void onRestoreInstanceState(@NonNull SparseArray savedStates) { super.onRestoreInstanceState(savedStates); // mSearchView and mListView may not in hierarchy diff --git a/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java index b30764ec7..ced51527d 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java @@ -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; diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index 6037ca04d..628bdf718 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -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 container) { + protected void dispatchSaveInstanceState(@NonNull SparseArray container) { super.dispatchSaveInstanceState(container); mSavedInstanceState = null; } @Override - protected void dispatchRestoreInstanceState(@NotNull SparseArray container) { + protected void dispatchRestoreInstanceState(@NonNull SparseArray 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); } diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java index a2fbeac71..b7ee305a4 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java @@ -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); diff --git a/app/src/main/java/com/hippo/scene/Scene.java b/app/src/main/java/com/hippo/scene/Scene.java index 3d960452c..f537f5a61 100644 --- a/app/src/main/java/com/hippo/scene/Scene.java +++ b/app/src/main/java/com/hippo/scene/Scene.java @@ -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}. *

@@ -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 savedStates = savedInstanceState.getSparseParcelableArray(getStateKey()); @@ -191,13 +190,13 @@ public abstract class Scene { } } - protected void onSaveInstanceState(@NotNull SparseArray outState) { + protected void onSaveInstanceState(@NonNull SparseArray outState) { if (mSceneView != null) { mSceneView.saveHierarchyState(outState); } } - protected void onRestoreInstanceState(@NotNull SparseArray savedStates) { + protected void onRestoreInstanceState(@NonNull SparseArray savedStates) { if (mSceneView != null) { mSceneView.restoreHierarchyState(savedStates); } diff --git a/app/src/main/java/com/hippo/scene/SceneManager.java b/app/src/main/java/com/hippo/scene/SceneManager.java index 4bcbed698..4039283ff 100644 --- a/app/src/main/java/com/hippo/scene/SceneManager.java +++ b/app/src/main/java/com/hippo/scene/SceneManager.java @@ -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); diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java index 2a47c09cb..95e3ac102 100644 --- a/app/src/main/java/com/hippo/scene/StageActivity.java +++ b/app/src/main/java/com/hippo/scene/StageActivity.java @@ -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); diff --git a/app/src/main/java/com/hippo/scene/StageLayout.java b/app/src/main/java/com/hippo/scene/StageLayout.java index 34f9de466..ec5f47569 100644 --- a/app/src/main/java/com/hippo/scene/StageLayout.java +++ b/app/src/main/java/com/hippo/scene/StageLayout.java @@ -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 container) { + protected void dispatchSaveInstanceState(@NonNull SparseArray container) { // Do nothing } @Override - protected void dispatchRestoreInstanceState(@NotNull SparseArray container) { + protected void dispatchRestoreInstanceState(@NonNull SparseArray container) { // Do nothing } } diff --git a/app/src/main/java/com/hippo/widget/CheckTextView.java b/app/src/main/java/com/hippo/widget/CheckTextView.java index 58f22e474..dd9a74a0b 100644 --- a/app/src/main/java/com/hippo/widget/CheckTextView.java +++ b/app/src/main/java/com/hippo/widget/CheckTextView.java @@ -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) { diff --git a/app/src/main/java/com/hippo/widget/DrawerFrameLayout.java b/app/src/main/java/com/hippo/widget/DrawerFrameLayout.java index 25ae55563..182cdeaa6 100644 --- a/app/src/main/java/com/hippo/widget/DrawerFrameLayout.java +++ b/app/src/main/java/com/hippo/widget/DrawerFrameLayout.java @@ -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; diff --git a/app/src/main/res/drawable-hdpi/ic_fab_create.png b/app/src/main/res/drawable-hdpi/ic_fab_create.png deleted file mode 100644 index 8996dba1d..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_fab_create.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_fab_search.png b/app/src/main/res/drawable-hdpi/ic_fab_search.png deleted file mode 100644 index 708a9c212..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_fab_create.png b/app/src/main/res/drawable-mdpi/ic_fab_create.png deleted file mode 100644 index 4f56b53f0..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_fab_create.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_fab_search.png b/app/src/main/res/drawable-mdpi/ic_fab_search.png deleted file mode 100644 index 168e0405c..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fab_create.png b/app/src/main/res/drawable-xhdpi/ic_fab_create.png deleted file mode 100644 index 9fb1c19a8..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_fab_create.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fab_search.png b/app/src/main/res/drawable-xhdpi/ic_fab_search.png deleted file mode 100644 index e57f46cfb..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fab_create.png b/app/src/main/res/drawable-xxhdpi/ic_fab_create.png deleted file mode 100644 index 95906adbb..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_fab_create.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fab_search.png b/app/src/main/res/drawable-xxhdpi/ic_fab_search.png deleted file mode 100644 index 811d639d1..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fab_create.png b/app/src/main/res/drawable-xxxhdpi/ic_fab_create.png deleted file mode 100644 index 5982a6353..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fab_create.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fab_search.png b/app/src/main/res/drawable-xxxhdpi/ic_fab_search.png deleted file mode 100644 index 0b20ec928..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable/drop_shadow.xml b/app/src/main/res/drawable/drop_shadow.xml index 9a0be4a4c..9fc2ed158 100644 --- a/app/src/main/res/drawable/drop_shadow.xml +++ b/app/src/main/res/drawable/drop_shadow.xml @@ -13,7 +13,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - diff --git a/app/src/main/res/drawable/ic_fab_search.xml b/app/src/main/res/drawable/ic_fab_search.xml new file mode 100644 index 000000000..464557009 --- /dev/null +++ b/app/src/main/res/drawable/ic_fab_search.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_vector_happy.xml b/app/src/main/res/drawable/ic_happy.xml similarity index 100% rename from app/src/main/res/drawable/ic_vector_happy.xml rename to app/src/main/res/drawable/ic_happy.xml diff --git a/app/src/main/res/drawable/ic_sad.xml b/app/src/main/res/drawable/ic_sad.xml new file mode 100644 index 000000000..eecdf5776 --- /dev/null +++ b/app/src/main/res/drawable/ic_sad.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml index eff7dd3ec..b54d38832 100644 --- a/app/src/main/res/layout/fragment_list.xml +++ b/app/src/main/res/layout/fragment_list.xml @@ -23,7 +23,7 @@ android:layout_width="240dp" android:layout_height="240dp" android:layout_gravity="center" - android:src="@drawable/ic_vector_happy" + android:src="@drawable/ic_happy" android:scaleType="fitXY" android:contentDescription="@null"/> diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml index f389c0cef..2d912e55a 100644 --- a/app/src/main/res/values/pathdata.xml +++ b/app/src/main/res/values/pathdata.xml @@ -14,5 +14,9 @@ ~ limitations under the License. --> + M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8C16.3,8 17,8.7 17,9.5M12,17.23C10.25,17.23 8.71,16.5 7.81,15.42L9.23,14C9.68,14.72 10.75,15.23 12,15.23C13.25,15.23 14.32,14.72 14.77,14L16.19,15.42C15.29,16.5 13.75,17.23 12,17.23Z + M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M15.5,8C16.3,8 17,8.7 17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M12,14C13.75,14 15.29,14.72 16.19,15.81L14.77,17.23C14.32,16.5 13.25,16 12,16C10.75,16 9.68,16.5 9.23,17.23L7.81,15.81C8.71,14.72 10.25,14 12,14Z + M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z +