From 71ac26980c53d8244fb43e1196cb529ea1ffbd8f Mon Sep 17 00:00:00 2001
From: yangyxd <yangyxd@126.com>
Date: Thu, 19 Mar 2020 17:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4"=E6=88=91=E7=9A=84"UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/widget/prefs/ColorPreference.kt    |  2 +-
 app/src/main/res/layout/view_preference_s.xml | 66 -------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 app/src/main/res/layout/view_preference_s.xml

diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
index 998e9c7c4..9b619c551 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/ColorPreference.kt
@@ -47,7 +47,7 @@ class ColorPreference(context: Context, attrs: AttributeSet) : Preference(contex
 
     init {
         isPersistent = true
-        layoutResource = io.legado.app.R.layout.view_preference_s
+        layoutResource = io.legado.app.R.layout.view_preference
 
         val a = context.obtainStyledAttributes(attrs, R.styleable.ColorPreference)
         showDialog = a.getBoolean(R.styleable.ColorPreference_cpv_showDialog, true)
diff --git a/app/src/main/res/layout/view_preference_s.xml b/app/src/main/res/layout/view_preference_s.xml
deleted file mode 100644
index 37a354c52..000000000
--- a/app/src/main/res/layout/view_preference_s.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/bg_prefs_color"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingTop="10dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="4dp"
-    android:minHeight="42dp"
-    android:clickable="true"
-    android:orientation="horizontal" >
-
-    <ImageView android:id="@+id/preference_icon"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_marginRight="16dp"
-        android:scaleType="fitCenter"
-        android:visibility="visible"
-        android:paddingTop="1dp"
-        android:layout_width="24dp"
-        android:layout_height="24dp" />
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_weight="1.0"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/preference_title"
-            android:paddingBottom="8dp"
-            android:singleLine="true"
-            android:textSize="16sp"
-            android:text="@string/title"
-            android:textColor="@color/tv_text_default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-
-        <TextView
-            android:id="@+id/preference_desc"
-            android:paddingBottom="8dp"
-            android:singleLine="true"
-            android:textSize="14sp"
-            android:textColor="@color/tv_text_summary"
-            android:text="@string/default1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/preference_widget"
-        android:layout_gravity="center"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"
-        android:gravity="right|center_vertical"
-        android:layout_width="32dp"
-        android:layout_height="32dp">
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file