From 3523503d08c3280cf05159536c830666fd484449 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sun, 2 Aug 2015 11:38:30 +0800
Subject: [PATCH] Use ProgressView instance of ProgressBar, remove useless
 stuff

---
 .../hippo/ehviewer/gallery/ui/GLRootView.java |  3 +-
 .../ehviewer/ui/scene/GalleryDetailScene.java |  6 +--
 .../hippo/ehviewer/widget/ContentLayout.java  | 12 ++---
 .../hippo/ehviewer/widget/PreviewLayout.java  |  6 +--
 .../anim/progress_indeterminate_material.xml  | 46 ----------------
 ...ogress_indeterminate_rotation_material.xml | 24 ---------
 .../main/res/anim/trim_end_interpolator.xml   | 18 -------
 .../main/res/anim/trim_start_interpolator.xml | 18 -------
 .../res/drawable/progress_large_material.xml  | 29 -----------
 .../res/drawable/progress_medium_material.xml | 29 -----------
 .../res/drawable/progress_small_material.xml  | 29 -----------
 .../vector_drawable_progress_bar_large.xml    | 45 ----------------
 .../vector_drawable_progress_bar_medium.xml   | 45 ----------------
 .../vector_drawable_progress_bar_small.xml    | 45 ----------------
 .../main/res/layout-land/activity_start.xml   | 46 ----------------
 app/src/main/res/layout/activity_start.xml    | 46 ----------------
 app/src/main/res/layout/item_gallery.xml      | 52 -------------------
 app/src/main/res/layout/scene_gallery.xml     | 28 ----------
 .../main/res/layout/scene_gallery_detail.xml  |  6 +--
 .../main/res/layout/widget_content_layout.xml |  4 +-
 .../layout/widget_float_label_edit_text.xml   | 21 --------
 .../main/res/layout/widget_preview_layout.xml |  4 +-
 app/src/main/res/raw/file_image.svg           |  5 --
 app/src/main/res/raw/file_image_off.svg       |  8 ---
 app/src/main/res/values-v21/styles.xml        | 30 -----------
 app/src/main/res/values/styles.xml            | 12 -----
 26 files changed, 20 insertions(+), 597 deletions(-)
 delete mode 100644 app/src/main/res/anim/progress_indeterminate_material.xml
 delete mode 100644 app/src/main/res/anim/progress_indeterminate_rotation_material.xml
 delete mode 100644 app/src/main/res/anim/trim_end_interpolator.xml
 delete mode 100644 app/src/main/res/anim/trim_start_interpolator.xml
 delete mode 100644 app/src/main/res/drawable/progress_large_material.xml
 delete mode 100644 app/src/main/res/drawable/progress_medium_material.xml
 delete mode 100644 app/src/main/res/drawable/progress_small_material.xml
 delete mode 100644 app/src/main/res/drawable/vector_drawable_progress_bar_large.xml
 delete mode 100644 app/src/main/res/drawable/vector_drawable_progress_bar_medium.xml
 delete mode 100644 app/src/main/res/drawable/vector_drawable_progress_bar_small.xml
 delete mode 100644 app/src/main/res/layout-land/activity_start.xml
 delete mode 100644 app/src/main/res/layout/activity_start.xml
 delete mode 100644 app/src/main/res/layout/item_gallery.xml
 delete mode 100644 app/src/main/res/layout/scene_gallery.xml
 delete mode 100644 app/src/main/res/layout/widget_float_label_edit_text.xml
 delete mode 100644 app/src/main/res/raw/file_image.svg
 delete mode 100644 app/src/main/res/raw/file_image_off.svg
 delete mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ui/GLRootView.java b/app/src/main/java/com/hippo/ehviewer/gallery/ui/GLRootView.java
index 890718ac3..061844067 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/ui/GLRootView.java
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/ui/GLRootView.java
@@ -35,7 +35,6 @@ import com.hippo.ehviewer.gallery.glrenderer.BasicTexture;
 import com.hippo.ehviewer.gallery.glrenderer.GLCanvas;
 import com.hippo.ehviewer.gallery.glrenderer.GLES11Canvas;
 import com.hippo.ehviewer.gallery.glrenderer.GLES20Canvas;
-import com.hippo.ehviewer.gallery.glrenderer.TextTexture;
 import com.hippo.ehviewer.gallery.glrenderer.UploadedTexture;
 import com.hippo.ehviewer.gallery.util.ApiHelper;
 import com.hippo.ehviewer.gallery.util.GalleryUtils;
@@ -201,7 +200,7 @@ public class GLRootView extends GLSurfaceView
         }
         if (mRenderRequested) return;
         mRenderRequested = true;
-        if (ApiHelper.HAS_POST_ON_ANIMATION) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             postOnAnimation(mRequestRenderOnAnimationFrame);
         } else {
             super.requestRender();
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 d0ba8d3c3..c0bf40489 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
@@ -119,7 +119,7 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener,
     private TextView mCommentMore;
     private PreviewLayout mPreviewLayout;
 
-    private View mProgressBar;
+    private View mProgressView;
 
     private ViewTransition mViewTransition;
 
@@ -175,9 +175,9 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener,
         mCommentMore = (TextView) mContent.findViewById(R.id.comment_more);
         mPreviewLayout = (PreviewLayout) mContent.findViewById(R.id.preview);
 
-        mProgressBar = findViewById(R.id.progress_bar);
+        mProgressView = findViewById(R.id.progress_view);
 
-        mViewTransition = new ViewTransition(mContent, mProgressBar);
+        mViewTransition = new ViewTransition(mContent, mProgressView);
     }
 
     private void handleAnnouncer(Announcer announcer) {
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 a04e0348f..aa5753e71 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/ContentLayout.java
@@ -25,7 +25,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -33,6 +32,7 @@ import com.hippo.effect.ViewTransition;
 import com.hippo.ehviewer.R;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.LayoutManagerUtils;
+import com.hippo.widget.ProgressView;
 import com.hippo.widget.recyclerview.EasyRecyclerView;
 import com.hippo.widget.refreshlayout.RefreshLayout;
 import com.hippo.yorozuya.AssertUtils;
@@ -47,7 +47,7 @@ public class ContentLayout extends FrameLayout {
 
     private static final String TAG = ContentLayout.class.getSimpleName();
 
-    private ProgressBar mProgressBar;
+    private ProgressView mProgressView;
     private ViewGroup mTipView;
     private RefreshLayout mRefreshLayout;
     private EasyRecyclerView mRecyclerView;
@@ -77,7 +77,7 @@ public class ContentLayout extends FrameLayout {
     private void init(Context context) {
         LayoutInflater.from(context).inflate(R.layout.widget_content_layout, this);
 
-        mProgressBar = (ProgressBar) getChildAt(0);
+        mProgressView = (ProgressView) getChildAt(0);
         mTipView = (ViewGroup) getChildAt(1);
         mRefreshLayout = (RefreshLayout) getChildAt(2);
         mRecyclerView = (EasyRecyclerView) mRefreshLayout.getChildAt(1);
@@ -165,7 +165,7 @@ public class ContentLayout extends FrameLayout {
 
         private Context mContext;
 
-        private ProgressBar mProgressBar;
+        private ProgressView mProgressView;
         private ViewGroup mTipView;
         private RefreshLayout mRefreshLayout;
         private EasyRecyclerView mRecyclerView;
@@ -277,7 +277,7 @@ public class ContentLayout extends FrameLayout {
         }
 
         private void init(ContentLayout contentLayout) {
-            mProgressBar = contentLayout.mProgressBar;
+            mProgressView = contentLayout.mProgressView;
             mTipView = contentLayout.mTipView;
             mRefreshLayout = contentLayout.mRefreshLayout;
             mRecyclerView = contentLayout.mRecyclerView;
@@ -285,7 +285,7 @@ public class ContentLayout extends FrameLayout {
             mTextView = contentLayout.mTextView;
             mLayoutManager = generateLayoutManager();
 
-            mViewTransition = new ViewTransition(mRefreshLayout, mProgressBar, mTipView);
+            mViewTransition = new ViewTransition(mRefreshLayout, mProgressView, mTipView);
             mViewTransition.showView(2, false);
 
             mRecyclerView.setLayoutManager(mLayoutManager);
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/PreviewLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/PreviewLayout.java
index f10b9ee1e..6c69b217b 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/PreviewLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/PreviewLayout.java
@@ -48,7 +48,7 @@ public final class PreviewLayout extends LinearLayout implements View.OnClickLis
     private int mCurrentPreviewPage = -1;
 
     private SimpleGridLayout mSimpleGridLayout;
-    private View mProgressBar;
+    private View mProgressView;
     private View mTopPrevious;
     private TextView mTopSelection;
     private View mTopNext;
@@ -93,7 +93,7 @@ public final class PreviewLayout extends LinearLayout implements View.OnClickLis
         mTopSelection = (TextView) viewGroup.getChildAt(2);
         mTopNext = viewGroup.getChildAt(4);
         mSimpleGridLayout = (SimpleGridLayout) getChildAt(1);
-        mProgressBar = getChildAt(2);
+        mProgressView = getChildAt(2);
         viewGroup = (ViewGroup) getChildAt(3);
         mBottomPrevious = viewGroup.getChildAt(0);
         mBottomSelection = (TextView) viewGroup.getChildAt(2);
@@ -114,7 +114,7 @@ public final class PreviewLayout extends LinearLayout implements View.OnClickLis
         AccurateClick.setOnAccurateClickListener(mTopSelection, this);
         AccurateClick.setOnAccurateClickListener(mBottomSelection, this);
 
-        mViewTransition = new ViewTransition(mSimpleGridLayout, mProgressBar);
+        mViewTransition = new ViewTransition(mSimpleGridLayout, mProgressView);
     }
 
     public void setData(PreviewSet[] previewSets, int gid, LayoutInflater inflater, Conaco conaco) {
diff --git a/app/src/main/res/anim/progress_indeterminate_material.xml b/app/src/main/res/anim/progress_indeterminate_material.xml
deleted file mode 100644
index f19f3dae3..000000000
--- a/app/src/main/res/anim/progress_indeterminate_material.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<set
-    xmlns:auto="http://schemas.android.com/apk/res-auto">
-
-    <objectAnimator
-        auto:duration="1333"
-        auto:interpolator="@anim/trim_start_interpolator"
-        auto:propertyName="trimPathStart"
-        auto:repeatCount="-1"
-        auto:valueFrom="0"
-        auto:valueTo="0.75"
-        auto:valueType="floatType"/>
-
-    <objectAnimator
-        auto:duration="1333"
-        auto:interpolator="@anim/trim_end_interpolator"
-        auto:propertyName="trimPathEnd"
-        auto:repeatCount="-1"
-        auto:valueFrom="0"
-        auto:valueTo="0.75"
-        auto:valueType="floatType"/>
-
-    <objectAnimator
-        auto:duration="1333"
-        auto:interpolator="@android:anim/linear_interpolator"
-        auto:propertyName="trimPathOffset"
-        auto:repeatCount="-1"
-        auto:valueFrom="0"
-        auto:valueTo="0.25"
-        auto:valueType="floatType"/>
-
-</set>
diff --git a/app/src/main/res/anim/progress_indeterminate_rotation_material.xml b/app/src/main/res/anim/progress_indeterminate_rotation_material.xml
deleted file mode 100644
index 61cd74fb7..000000000
--- a/app/src/main/res/anim/progress_indeterminate_rotation_material.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<objectAnimator
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:duration="6665"
-    auto:interpolator="@android:anim/linear_interpolator"
-    auto:propertyName="rotation"
-    auto:repeatCount="-1"
-    auto:valueFrom="0"
-    auto:valueTo="720"
-    auto:valueType="floatType"/>
diff --git a/app/src/main/res/anim/trim_end_interpolator.xml b/app/src/main/res/anim/trim_end_interpolator.xml
deleted file mode 100644
index f6e20f742..000000000
--- a/app/src/main/res/anim/trim_end_interpolator.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<pathInterpolator
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:pathData="C0.2,0 0.1,1 0.5, 1 L 1,1"/>
diff --git a/app/src/main/res/anim/trim_start_interpolator.xml b/app/src/main/res/anim/trim_start_interpolator.xml
deleted file mode 100644
index 428dd9f23..000000000
--- a/app/src/main/res/anim/trim_start_interpolator.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<pathInterpolator
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:pathData="L0.5,0 C 0.7,0 0.6,1 1, 1"/>
diff --git a/app/src/main/res/drawable/progress_large_material.xml b/app/src/main/res/drawable/progress_large_material.xml
deleted file mode 100644
index 6b8afea1e..000000000
--- a/app/src/main/res/drawable/progress_large_material.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!--suppress AndroidDomInspection -->
-<animated-vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:drawable="@drawable/vector_drawable_progress_bar_large">
-
-    <target
-        auto:name="progressBar"
-        auto:animation="@anim/progress_indeterminate_material"/>
-
-    <target
-        auto:name="root"
-        auto:animation="@anim/progress_indeterminate_rotation_material"/>
-
-</animated-vector>
diff --git a/app/src/main/res/drawable/progress_medium_material.xml b/app/src/main/res/drawable/progress_medium_material.xml
deleted file mode 100644
index d7523753d..000000000
--- a/app/src/main/res/drawable/progress_medium_material.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!--suppress AndroidDomInspection -->
-<animated-vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:drawable="@drawable/vector_drawable_progress_bar_medium" >
-
-    <target
-        auto:name="progressBar"
-        auto:animation="@anim/progress_indeterminate_material" />
-
-    <target
-        auto:name="root"
-        auto:animation="@anim/progress_indeterminate_rotation_material" />
-
-</animated-vector>
diff --git a/app/src/main/res/drawable/progress_small_material.xml b/app/src/main/res/drawable/progress_small_material.xml
deleted file mode 100644
index d2e1a2e32..000000000
--- a/app/src/main/res/drawable/progress_small_material.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!--suppress AndroidDomInspection -->
-<animated-vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    auto:drawable="@drawable/vector_drawable_progress_bar_small" >
-
-    <target
-        auto:name="progressBar"
-        auto:animation="@anim/progress_indeterminate_material" />
-
-    <target
-        auto:name="root"
-        auto:animation="@anim/progress_indeterminate_rotation_material" />
-
-</animated-vector>
diff --git a/app/src/main/res/drawable/vector_drawable_progress_bar_large.xml b/app/src/main/res/drawable/vector_drawable_progress_bar_large.xml
deleted file mode 100644
index 4f7e736a6..000000000
--- a/app/src/main/res/drawable/vector_drawable_progress_bar_large.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    auto:height="76dp"
-    auto:width="76dp"
-    auto:viewportHeight="48"
-    auto:viewportWidth="48"
-    auto:tint="@color/theme_accent"
-    tools:ignore="NewApi">
-
-    <group
-        auto:name="root"
-        auto:translateX="24.0"
-        auto:translateY="24.0">
-
-        <path
-            auto:name="progressBar"
-            auto:fillColor="#00000000"
-            auto:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            auto:strokeColor="@android:color/white"
-            auto:strokeLineCap="square"
-            auto:strokeLineJoin="miter"
-            auto:strokeWidth="4"
-            auto:trimPathEnd="0"
-            auto:trimPathOffset="0"
-            auto:trimPathStart="0"/>
-
-    </group>
-
-</vector>
diff --git a/app/src/main/res/drawable/vector_drawable_progress_bar_medium.xml b/app/src/main/res/drawable/vector_drawable_progress_bar_medium.xml
deleted file mode 100644
index 402b8312a..000000000
--- a/app/src/main/res/drawable/vector_drawable_progress_bar_medium.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    auto:height="48dp"
-    auto:width="48dp"
-    auto:viewportHeight="48"
-    auto:viewportWidth="48"
-    auto:tint="@color/theme_accent"
-    tools:ignore="NewApi">
-
-    <group
-        auto:name="root"
-        auto:translateX="24.0"
-        auto:translateY="24.0" >
-
-        <path
-            auto:name="progressBar"
-            auto:fillColor="#00000000"
-            auto:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            auto:strokeColor="@android:color/white"
-            auto:strokeLineCap="square"
-            auto:strokeLineJoin="miter"
-            auto:strokeWidth="4"
-            auto:trimPathEnd="0"
-            auto:trimPathOffset="0"
-            auto:trimPathStart="0"/>
-
-    </group>
-
-</vector>
diff --git a/app/src/main/res/drawable/vector_drawable_progress_bar_small.xml b/app/src/main/res/drawable/vector_drawable_progress_bar_small.xml
deleted file mode 100644
index 89da44719..000000000
--- a/app/src/main/res/drawable/vector_drawable_progress_bar_small.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    auto:height="16dp"
-    auto:width="16dp"
-    auto:viewportHeight="48"
-    auto:viewportWidth="48"
-    auto:tint="@color/theme_accent"
-    tools:ignore="NewApi">
-
-    <group
-        auto:name="root"
-        auto:translateX="24.0"
-        auto:translateY="24.0">
-
-        <path
-            auto:name="progressBar"
-            auto:fillColor="#00000000"
-            auto:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            auto:strokeColor="@android:color/white"
-            auto:strokeLineCap="square"
-            auto:strokeLineJoin="miter"
-            auto:strokeWidth="4"
-            auto:trimPathEnd="0"
-            auto:trimPathOffset="0"
-            auto:trimPathStart="0"/>
-
-    </group>
-
-</vector>
diff --git a/app/src/main/res/layout-land/activity_start.xml b/app/src/main/res/layout-land/activity_start.xml
deleted file mode 100644
index a6054bcf0..000000000
--- a/app/src/main/res/layout-land/activity_start.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014-2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:background="?attr/colorPrimary">
-
-    <Space
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:id="@+id/text_welcome"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="2"
-        android:gravity="center"
-        android:textSize="32sp"
-        android:textColor="@color/primary_text_dark"
-        android:text="@string/tip_welcome"/>
-
-    <ImageView
-        android:id="@+id/image_mascot"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="6"
-        android:scaleType="fitCenter"
-        android:contentDescription="@null"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
deleted file mode 100644
index 5a0f70eb6..000000000
--- a/app/src/main/res/layout/activity_start.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014-2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="?attr/colorPrimary">
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:id="@+id/text_welcome"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="2"
-        android:gravity="center"
-        android:textSize="32sp"
-        android:textColor="@color/primary_text_dark"
-        android:text="@string/tip_welcome"/>
-
-    <ImageView
-        android:id="@+id/image_mascot"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="6"
-        android:scaleType="fitCenter"
-        android:contentDescription="@null"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_gallery.xml b/app/src/main/res/layout/item_gallery.xml
deleted file mode 100644
index b810c854b..000000000
--- a/app/src/main/res/layout/item_gallery.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:contentDescription="@null"/>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:layout_gravity="center_horizontal"
-            android:textSize="28sp"/>
-
-        <com.hippo.widget.ProgressView
-            android:id="@+id/progress"
-            style="@style/ProgressView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"/>
-
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/scene_gallery.xml b/app/src/main/res/layout/scene_gallery.xml
deleted file mode 100644
index 382f2a0c4..000000000
--- a/app/src/main/res/layout/scene_gallery.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml
index eceae815d..942a003f6 100644
--- a/app/src/main/res/layout/scene_gallery_detail.xml
+++ b/app/src/main/res/layout/scene_gallery_detail.xml
@@ -129,9 +129,9 @@
 
     </ScrollView>
 
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/ProgressBar"
+    <com.hippo.widget.ProgressView
+        android:id="@+id/progress_view"
+        style="@style/ProgressView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"/>
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index d122c3be3..2d1caa796 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -20,8 +20,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:auto="http://schemas.android.com/apk/res-auto">
 
-    <ProgressBar
-        style="@style/ProgressBar"
+    <com.hippo.widget.ProgressView
+        style="@style/ProgressView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"/>
diff --git a/app/src/main/res/layout/widget_float_label_edit_text.xml b/app/src/main/res/layout/widget_float_label_edit_text.xml
deleted file mode 100644
index a6340543b..000000000
--- a/app/src/main/res/layout/widget_float_label_edit_text.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<com.hippo.widget.PrefixEditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-</com.hippo.widget.PrefixEditText>
diff --git a/app/src/main/res/layout/widget_preview_layout.xml b/app/src/main/res/layout/widget_preview_layout.xml
index 302639e6d..532f5f160 100644
--- a/app/src/main/res/layout/widget_preview_layout.xml
+++ b/app/src/main/res/layout/widget_preview_layout.xml
@@ -30,8 +30,8 @@
         android:paddingRight="32dp"
         auto:itemMargin="8dp"/>
 
-    <ProgressBar
-        style="@style/ProgressBar"
+    <com.hippo.widget.ProgressView
+        style="@style/ProgressView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/raw/file_image.svg b/app/src/main/res/raw/file_image.svg
deleted file mode 100644
index 95534aac1..000000000
--- a/app/src/main/res/raw/file_image.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24.00 24.00">
-	<path fill-opacity="0.54" fill="#000000" d="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M6,20H15L18,20V12L14,16L12,14L6,20M8,9A2,2 0 0,0 6,11A2,2 0 0,0 8,13A2,2 0 0,0 10,11A2,2 0 0,0 8,9Z" />
-</svg>
diff --git a/app/src/main/res/raw/file_image_off.svg b/app/src/main/res/raw/file_image_off.svg
deleted file mode 100644
index f3a2817ca..000000000
--- a/app/src/main/res/raw/file_image_off.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="-47 88 24 24">
-<g>
-	<path fill-opacity="0.54" fill="#000000" d="M-28.9,100v4.9l2,2.5V96l-6-6h-8l9.8,12.2L-28.9,100z M-33.9,91.5l5.5,5.5h-5.5V91.5z"/>
-	<path fill-opacity="0.54" fill="#000000" d="M-43.7,89l-1.3,1l2,2.6V108c0,1.1,0.9,2,2,2h12l1.6,2l1.3-1L-43.7,89z M-39.3,97l2.2,2.8c-0.3,0.7-1,1.2-1.8,1.2c-1.1,0-2-0.9-2-2C-40.9,98-40.2,97.2-39.3,97z M-31.9,108h-9l5.8-5.8l4.6,5.8H-31.9z"/>
-</g>
-</svg>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index ad18c5884..000000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2015 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Progress Bar -->
-    <style name="ProgressBar" parent="android:Widget.Material.ProgressBar">
-    </style>
-
-    <style name="ProgressBar.Small" parent="android:Widget.Material.ProgressBar.Small">
-    </style>
-
-    <style name="ProgressBar.Large" parent="android:Widget.Material.ProgressBar.Large">
-    </style>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7a47284a..4c06b1407 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -77,18 +77,6 @@
     </style>
 
     <!-- Progress Bar -->
-    <style name="ProgressBar" parent="android:Widget.ProgressBar">
-        <item name="android:indeterminateDrawable">@drawable/progress_medium_material</item>
-    </style>
-
-    <style name="ProgressBar.Small" parent="android:Widget.ProgressBar.Small">
-        <item name="android:indeterminateDrawable">@drawable/progress_small_material</item>
-    </style>
-
-    <style name="ProgressBar.Large" parent="android:Widget.ProgressBar.Large">
-        <item name="android:indeterminateDrawable">@drawable/progress_large_material</item>
-    </style>
-
     <style name="ProgressView">
         <item name="color">?attr/colorAccent</item>
         <item name="indeterminate">true</item>