Jelajahi Sumber

Merge branch 'left-right-toolbar-border'

Wayne 5 tahun lalu
induk
melakukan
0d4aa0e1e3

+ 7 - 25
reader/src/main/res/drawable/bg_reader_tool_bar_left.xml

@@ -1,40 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#04000000" />
+        <shape android:shape="rectangle" >
+            <solid android:color="#E1E1E1" />
             <corners
-                android:topRightRadius="6dp"
-                android:bottomRightRadius="6dp"
+                android:topRightRadius="4dp"
+                android:bottomRightRadius="4dp"
                 />
         </shape>
     </item>
+
     <item
-        android:top="0dp"
+        android:top="1dp"
         android:right="1dp"
         android:bottom="1dp"
         android:left="0dp"
         >
-        <shape android:shape="rectangle">
-            <solid android:color="#0E000000" />
-            <corners
-                android:topRightRadius="5dp"
-                android:bottomRightRadius="5dp"
-                />
-        </shape>
-    </item>
-
-    <item
-        android:top="0dp"
-        android:right="2dp"
-        android:bottom="2dp"
-        android:left="0dp"
-        >
-        <shape android:shape="rectangle">
-            <padding
-                android:right="2dp"
-                android:bottom="2dp"
-                />
+        <shape android:shape="rectangle" >
             <solid android:color="@color/reader_left_toolbar_bg" />
             <corners
                 android:topRightRadius="4dp"

+ 12 - 9
reader/src/main/res/drawable/bg_reader_tool_bar_left_expand.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/reader_left_toolbar_bg" />
+        <shape android:shape="rectangle" >
+            <solid android:color="#E1E1E1" />
         </shape>
     </item>
-    <item android:right="-1dp" >
-        <shape>
-            <solid android:color="@android:color/transparent" />
-            <stroke
-                android:width="2dp"
-                android:color="#0E000000" />
+
+    <item
+        android:top="1dp"
+        android:right="1dp"
+        android:bottom="1dp"
+        android:left="0dp"
+        >
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/reader_left_toolbar_bg" />
         </shape>
     </item>
-</layer-list>
+</layer-list>

+ 10 - 27
reader/src/main/res/drawable/bg_reader_tool_bar_right.xml

@@ -1,45 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#04000000" />
+        <shape android:shape="rectangle" >
+            <solid android:color="#E1E1E1" />
             <corners
-                android:topLeftRadius="6dp"
-                android:bottomLeftRadius="6dp"
+                android:topLeftRadius="4dp"
+                android:bottomLeftRadius="4dp"
                 />
         </shape>
     </item>
+
     <item
-        android:top="0dp"
+        android:top="1dp"
         android:right="0dp"
         android:bottom="1dp"
         android:left="1dp"
         >
-        <shape android:shape="rectangle">
-            <solid android:color="#0E000000" />
-            <corners
-                android:topLeftRadius="5dp"
-                android:bottomLeftRadius="5dp"
-                />
-        </shape>
-    </item>
-
-    <item
-        android:top="0dp"
-        android:right="0dp"
-        android:bottom="2dp"
-        android:left="2dp"
-        >
-        <shape android:shape="rectangle">
-            <padding
-                android:left="2dp"
-                android:bottom="2dp"
-                />
-            <solid android:color="@color/reader_right_toolbar_bg" />
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/reader_left_toolbar_bg" />
             <corners
                 android:topLeftRadius="4dp"
                 android:bottomLeftRadius="4dp"
                 />
         </shape>
     </item>
-</layer-list>
+</layer-list>
+