From 483707956375ec8868125274ca17c779730fe094 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 16 May 2015 04:18:37 +0800
Subject: [PATCH] Remove useless stuff

---
 .../java/com/hippo/app/StatsActivity.java     |  2 +-
 .../hippo/ehviewer/widget/SearchLayout.java   |  4 +-
 .../res/drawable/ic_android_debug_bridge.xml  | 41 ------------------
 app/src/main/res/drawable/ic_happy.xml        | 39 -----------------
 app/src/main/res/drawable/ic_menu.xml         | 40 -----------------
 .../main/res/drawable/rounded_rectangle.xml   | 25 -----------
 app/src/main/res/drawable/vector_search.xml   | 39 -----------------
 app/src/main/res/layout/fragment_list.xml     | 43 -------------------
 app/src/main/res/layout/fragment_search.xml   | 20 ---------
 app/src/main/res/layout/search_tag.xml        | 23 ----------
 app/src/main/res/layout/widget_app_bar.xml    | 36 ----------------
 app/src/main/res/layout/widget_search_bar.xml |  1 -
 .../main/res/values-sw600dp-land/dimens.xml   | 23 ----------
 app/src/main/res/values-sw600dp/dimens.xml    | 15 -------
 app/src/main/res/values/dimens.xml            | 24 +----------
 app/src/main/res/values/drawables.xml         |  4 --
 app/src/main/res/values/pathdata.xml          |  3 --
 app/src/main/res/values/styles.xml            |  8 ----
 18 files changed, 4 insertions(+), 386 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_android_debug_bridge.xml
 delete mode 100644 app/src/main/res/drawable/ic_happy.xml
 delete mode 100644 app/src/main/res/drawable/ic_menu.xml
 delete mode 100644 app/src/main/res/drawable/rounded_rectangle.xml
 delete mode 100644 app/src/main/res/drawable/vector_search.xml
 delete mode 100644 app/src/main/res/layout/fragment_list.xml
 delete mode 100644 app/src/main/res/layout/fragment_search.xml
 delete mode 100644 app/src/main/res/layout/search_tag.xml
 delete mode 100644 app/src/main/res/layout/widget_app_bar.xml
 delete mode 100644 app/src/main/res/values-sw600dp-land/dimens.xml

diff --git a/app/src/main/java/com/hippo/app/StatsActivity.java b/app/src/main/java/com/hippo/app/StatsActivity.java
index 53ac0a21d..3160cfa7d 100644
--- a/app/src/main/java/com/hippo/app/StatsActivity.java
+++ b/app/src/main/java/com/hippo/app/StatsActivity.java
@@ -73,7 +73,7 @@ public abstract class StatsActivity extends AppCompatActivity {
                 ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.TOP | Gravity.RIGHT;
         lp.topMargin = resources.getDimensionPixelOffset(R.dimen.stats_text_view_padding_top);
-        lp.rightMargin = resources.getDimensionPixelOffset(R.dimen.stats_text_view_padding_top);
+        lp.rightMargin = resources.getDimensionPixelOffset(R.dimen.stats_text_view_padding_right);
         return lp;
     }
 
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 85e042643..989ad1503 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java
@@ -38,6 +38,7 @@ import com.hippo.effect.ripple.RippleSalon;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.data.ListUrlBuilder;
 import com.hippo.scene.SimpleDialog;
+import com.hippo.util.UiUtils;
 import com.hippo.util.ViewUtils;
 import com.hippo.widget.recyclerview.EasyRecyclerView;
 import com.hippo.widget.recyclerview.MonoRecyclerView;
@@ -126,8 +127,7 @@ public class SearchLayout extends MonoRecyclerView implements CompoundButton.OnC
         // Search Container
         mSearchPaddingTopOrigin = getPaddingTop();
         // Original padding bottom and the padding bottom to make it above fab
-        mSearchPaddingBottomOrigin = getPaddingBottom() +
-                mResources.getDimensionPixelSize(R.dimen.content_padding_bottom);
+        mSearchPaddingBottomOrigin = getPaddingBottom() + UiUtils.dp2pix(context, 72); // TODO
         setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), mSearchPaddingBottomOrigin);
 
         // Create normal view
diff --git a/app/src/main/res/drawable/ic_android_debug_bridge.xml b/app/src/main/res/drawable/ic_android_debug_bridge.xml
deleted file mode 100644
index 507290d24..000000000
--- a/app/src/main/res/drawable/ic_android_debug_bridge.xml
+++ /dev/null
@@ -1,41 +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.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    tools:targetApi="21"
-
-    auto:width="24dp"
-    auto:height="24dp"
-    auto:viewportWidth="24"
-    auto:viewportHeight="24"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        auto:pathData="@string/pd_android_debug_bridge"
-        auto:fillColor="@color/primary_drawable_light"
-
-        android:pathData="@string/pd_android_debug_bridge"
-        android:fillColor="@color/primary_drawable_light"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_happy.xml b/app/src/main/res/drawable/ic_happy.xml
deleted file mode 100644
index df127d1dd..000000000
--- a/app/src/main/res/drawable/ic_happy.xml
+++ /dev/null
@@ -1,39 +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.
-  -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    tools:targetApi="21"
-
-    auto:width="24dp"
-    auto:height="24dp"
-    auto:viewportWidth="24"
-    auto:viewportHeight="24"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        auto:pathData="@string/pd_happy"
-        auto:fillColor="@color/primary_drawable_light"
-
-        android:pathData="@string/pd_happy"
-        android:fillColor="@color/primary_drawable_light"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
deleted file mode 100644
index d2e25b65a..000000000
--- a/app/src/main/res/drawable/ic_menu.xml
+++ /dev/null
@@ -1,40 +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.
-  -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    tools:targetApi="21"
-
-    auto:width="24dp"
-    auto:height="24dp"
-    auto:viewportWidth="24"
-    auto:viewportHeight="24"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        auto:pathData="@string/pd_menu"
-        auto:fillColor="@color/primary_drawable_light"
-
-        android:pathData="@string/pd_menu"
-        android:fillColor="@color/primary_drawable_light"/>
-
-</vector>
diff --git a/app/src/main/res/drawable/rounded_rectangle.xml b/app/src/main/res/drawable/rounded_rectangle.xml
deleted file mode 100644
index 3f8fbdc73..000000000
--- a/app/src/main/res/drawable/rounded_rectangle.xml
+++ /dev/null
@@ -1,25 +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.
-  -->
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:radius="2dp" />
-    <solid
-        android:color="@android:color/white" />
-
-</shape>
diff --git a/app/src/main/res/drawable/vector_search.xml b/app/src/main/res/drawable/vector_search.xml
deleted file mode 100644
index f21dbc25c..000000000
--- a/app/src/main/res/drawable/vector_search.xml
+++ /dev/null
@@ -1,39 +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.
-  -->
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    tools:targetApi="21"
-
-    auto:width="24dp"
-    auto:height="24dp"
-    auto:viewportWidth="24"
-    auto:viewportHeight="24"
-
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        auto:pathData="@string/pd_search"
-        auto:fillColor="#8A000000"
-
-        android:pathData="@string/pd_search"
-        android:fillColor="#8A000000"/>
-
-</vector>
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
deleted file mode 100644
index 13ecb22d0..000000000
--- a/app/src/main/res/layout/fragment_list.xml
+++ /dev/null
@@ -1,43 +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.
-  -->
-<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/haha"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_happy"/>
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Click"
-        android:id="@+id/test_button"
-        android:layout_gravity="right|center_vertical"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="Small Text"
-        android:id="@+id/bbbbbb"
-        android:layout_gravity="center_horizontal|top"/>
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
deleted file mode 100644
index 7972affe9..000000000
--- a/app/src/main/res/layout/fragment_search.xml
+++ /dev/null
@@ -1,20 +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.ehviewer.widget.SearchLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/search_tag.xml b/app/src/main/res/layout/search_tag.xml
deleted file mode 100644
index 4cee6390f..000000000
--- a/app/src/main/res/layout/search_tag.xml
+++ /dev/null
@@ -1,23 +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.FloatLabelEditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:auto="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/search_edit_tag"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:hint="@string/search_hint_tag"
-    auto:labelAppearance="@style/TextAppearance.FloatLabelEditText.Lable.Single"/>
diff --git a/app/src/main/res/layout/widget_app_bar.xml b/app/src/main/res/layout/widget_app_bar.xml
deleted file mode 100644
index cef5d763f..000000000
--- a/app/src/main/res/layout/widget_app_bar.xml
+++ /dev/null
@@ -1,36 +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.
-  -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/appbar_size"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/ab_navigation_icon"
-        android:layout_width="@dimen/appbar_size"
-        android:layout_height="@dimen/appbar_size"
-        android:contentDescription="@null"/>
-
-    <TextView
-        android:id="@+id/ab_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="@dimen/keyline_margin"
-        android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index 727aaa0be..53b2c3dde 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -51,7 +51,6 @@
                 android:layout_height="56dp"
                 android:layout_gravity="right|center_vertical"
                 android:padding="14dp"
-                android:src="@drawable/ic_android_debug_bridge"
                 tools:ignore="RtlHardcoded"/>
 
             <com.hippo.ehviewer.widget.SearchEditText
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
deleted file mode 100644
index 1e0bdf1f1..000000000
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ /dev/null
@@ -1,23 +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>
-
-    <!-- Content -->
-    <dimen name="content_padding_start">152dp</dimen>
-    <dimen name="content_padding_end">152dp</dimen>
-    <dimen name="content_fab_margin_end">48dp</dimen>
-
-</resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 9e8082610..e766ed9ee 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -18,22 +18,10 @@
     <!-- Snackbar -->
     <dimen name="snackbar_interval">48dp</dimen>
 
-    <!-- Content -->
-    <dimen name="content_padding_start">52dp</dimen>
-    <dimen name="content_padding_end">52dp</dimen>
-    <dimen name="content_padding_top">@dimen/appbar_size</dimen>
-    <dimen name="content_padding_bottom">0dp</dimen>
-    <dimen name="content_fab_margin_start">0dp</dimen>
-    <dimen name="content_fab_margin_end">@dimen/keyline_margin</dimen>
-    <dimen name="content_fab_margin_top">196dp</dimen>
-    <dimen name="content_fab_margin_bottom">0dp</dimen>
-
     <!-- Search category -->
     <dimen name="search_category_padding_start">52dp</dimen>
     <dimen name="search_category_padding_end">52dp</dimen>
     <dimen name="search_category_padding_bottom">32dp</dimen>
-    <dimen name="search_category_interval">16dp</dimen>
-    <dimen name="search_category_min_height">252dp</dimen>
     <dimen name="search_category_title_height">64dp</dimen>
 
     <!-- Search item -->
@@ -46,9 +34,6 @@
     <!-- Keyline -->
     <dimen name="keyline_margin">24dp</dimen>
 
-    <!-- AppBar -->
-    <dimen name="appbar_height">224dp</dimen>
-
     <!-- CategoryTable -->
     <dimen name="category_table_item_height">48dp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 577f8d663..7723d50a8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,7 @@
 
     <!-- StatsActivity -->
     <dimen name="stats_text_view_padding_top">24dp</dimen>
-    <dimen name="stats_text_view_padding_right">16dp</dimen>
+    <dimen name="stats_text_view_padding_right">24dp</dimen>
 
     <!-- Snackbar -->
     <dimen name="snackbar_padding_left">24dp</dimen>
@@ -59,30 +59,14 @@
     <dimen name="search_layout_space">8dp</dimen>
     <dimen name="search_layout_space_vertical">8dp</dimen>
 
-    <!-- Content Layout Space -->
-    <dimen name="content_layout_space">8dp</dimen>
-    <dimen name="content_layout_space_vertical">8dp</dimen>
-
     <!-- Corner fab -->
     <dimen name="corner_fab_padding_right">16dp</dimen>
     <dimen name="corner_fab_padding_bottom">16dp</dimen>
 
-    <!-- Search Content -->
-    <dimen name="content_padding_start">0dp</dimen>
-    <dimen name="content_padding_end">0dp</dimen>
-    <dimen name="content_padding_top">0dp</dimen>
-    <dimen name="content_padding_bottom">72dp</dimen>
-    <dimen name="content_fab_margin_start">0dp</dimen>
-    <dimen name="content_fab_margin_end">@dimen/keyline_margin</dimen>
-    <dimen name="content_fab_margin_top">0dp</dimen>
-    <dimen name="content_fab_margin_bottom">@dimen/keyline_margin</dimen>
-
     <!-- Search category -->
     <dimen name="search_category_padding_start">16dp</dimen>
     <dimen name="search_category_padding_end">16dp</dimen>
     <dimen name="search_category_padding_bottom">8dp</dimen>
-    <dimen name="search_category_interval">8dp</dimen>
-    <dimen name="search_category_min_height">0dp</dimen>
     <dimen name="search_category_title_height">48dp</dimen>
 
     <!-- Search item -->
@@ -98,12 +82,6 @@
     <!-- Keyline -->
     <dimen name="keyline_margin">16dp</dimen>
 
-    <!-- AppBar -->
-    <dimen name="appbar_size">56dp</dimen>
-    <dimen name="appbar_height">@dimen/appbar_size</dimen>
-    <dimen name="appbar_shadow_height">8dp</dimen>
-    <dimen name="appbar_fab_margin_top">28dp</dimen>
-
     <!-- CategoryTable -->
     <dimen name="category_table_item_height">40dp</dimen>
     <dimen name="category_table_item_margin_half">@dimen/search_item_interval_half</dimen>
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index 89c124fca..9731c8a74 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -13,13 +13,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <resources>
 
     <drawable name="transparent">@android:color/transparent</drawable>
     <drawable name="theme_primary">@color/theme_primary</drawable>
-    <drawable name="theme_accent">@color/theme_accent</drawable>
-    <drawable name="ripple_material_light">@color/ripple_material_light</drawable>
-    <drawable name="ripple_material_dark">@color/ripple_material_dark</drawable>
 
 </resources>
diff --git a/app/src/main/res/values/pathdata.xml b/app/src/main/res/values/pathdata.xml
index 141da19e4..e8989e337 100644
--- a/app/src/main/res/values/pathdata.xml
+++ b/app/src/main/res/values/pathdata.xml
@@ -15,11 +15,8 @@
   -->
 <resources>
 
-    <string name="pd_happy" translatable="false">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</string>
     <string name="pd_sad" translatable="false">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</string>
     <string name="pd_search" translatable="false">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</string>
-    <string name="pd_menu" translatable="false">M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z</string>
-    <string name="pd_android_debug_bridge" translatable="false">M15,9A1,1 0 0,1 14,8A1,1 0 0,1 15,7A1,1 0 0,1 16,8A1,1 0 0,1 15,9M9,9A1,1 0 0,1 8,8A1,1 0 0,1 9,7A1,1 0 0,1 10,8A1,1 0 0,1 9,9M16.12,4.37L18.22,2.27L17.4,1.44L15.09,3.75C14.16,3.28 13.11,3 12,3C10.88,3 9.84,3.28 8.91,3.75L6.6,1.44L5.78,2.27L7.88,4.37C6.14,5.64 5,7.68 5,10V11H19V10C19,7.68 17.86,5.64 16.12,4.37M5,16C5,19.86 8.13,23 12,23A7,7 0 0,0 19,16V12H5V16Z</string>
     <string name="pd_help_circle" translatable="false">M15.07,11.25L14.17,12.17C13.45,12.89 13,13.5 13,15H11V14.5C11,13.39 11.45,12.39 12.17,11.67L13.41,10.41C13.78,10.05 14,9.55 14,9C14,7.89 13.1,7 12,7A2,2 0 0,0 10,9H8A4,4 0 0,1 12,5A4,4 0 0,1 16,9C16,9.88 15.64,10.67 15.07,11.25M13,19H11V17H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z</string>
     <string name="pd_arrow_up" translatable="false">M13,20H11V8L5.5,13.5L4.08,12.08L12,4.16L19.92,12.08L18.5,13.5L13,8V20Z</string>
     <string name="pd_go_to" translatable="false">M10.5,7A6.5,6.5 0 0,0 4,13.5A6.5,6.5 0 0,0 10.5,20H14V18H10.5C8,18 6,16 6,13.5C6,11 8,9 10.5,9H16.17L13.09,12.09L14.5,13.5L20,8L14.5,2.5L13.08,3.91L16.17,7H10.5M18,18H16V20H18V18Z</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a712bb32c..19327af7c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,14 +45,6 @@
         <item name="android:minHeight">@dimen/fab_size_fne_small</item>
     </style>
 
-    <style name="FloatingActionButton.Content">
-        <item name="android:layout_gravity">right|bottom</item>
-        <item name="android:layout_marginLeft">@dimen/content_fab_margin_start</item>
-        <item name="android:layout_marginRight">@dimen/content_fab_margin_end</item>
-        <item name="android:layout_marginTop">@dimen/content_fab_margin_top</item>
-        <item name="android:layout_marginBottom">@dimen/content_fab_margin_bottom</item>
-    </style>
-
     <!-- FloatLabelEditText -->
     <style name="TextAppearance.FloatLabelEditText.Lable" parent="TextAppearance.AppCompat.Small">
         <item name="android:textColor">@color/float_label_edit_text_light</item>