From f3a7bcbfd394368ac048e67045ea375f6776e461 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 3 Feb 2016 22:41:42 +0800
Subject: [PATCH] Use LinearLayout divider

---
 .../res/drawable/divider_gallery_detail.xml   | 27 +++++++++++++
 app/src/main/res/drawable/spacer_keyline.xml  | 29 ++++++++++++++
 .../res/layout/gallery_detail_actions.xml     |  4 +-
 .../res/layout/gallery_detail_comments.xml    |  5 ++-
 .../res/layout/gallery_detail_content.xml     | 39 ++-----------------
 .../res/layout/gallery_detail_previews.xml    |  5 ++-
 .../main/res/layout/gallery_detail_tags.xml   |  3 +-
 7 files changed, 70 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/res/drawable/divider_gallery_detail.xml
 create mode 100644 app/src/main/res/drawable/spacer_keyline.xml

diff --git a/app/src/main/res/drawable/divider_gallery_detail.xml b/app/src/main/res/drawable/divider_gallery_detail.xml
new file mode 100644
index 000000000..557dfc2a8
--- /dev/null
+++ b/app/src/main/res/drawable/divider_gallery_detail.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 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.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="@color/divider"/>
+
+    <size
+        android:height="1dp"/>
+
+</shape>
diff --git a/app/src/main/res/drawable/spacer_keyline.xml b/app/src/main/res/drawable/spacer_keyline.xml
new file mode 100644
index 000000000..1742ab6ea
--- /dev/null
+++ b/app/src/main/res/drawable/spacer_keyline.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 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.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size
+        android:width="@dimen/keyline_margin"
+        android:height="@dimen/keyline_margin"/>
+
+    <solid
+        android:color="@android:color/transparent"/>
+
+</shape>
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index 3c2d776c3..c9e3e8f00 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -20,7 +20,9 @@
     android:id="@+id/actions"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingTop="@dimen/keyline_margin"
+    android:paddingBottom="@dimen/keyline_margin">
 
     <HorizontalScrollView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/gallery_detail_comments.xml b/app/src/main/res/layout/gallery_detail_comments.xml
index ff22fac3c..5f201bc5d 100644
--- a/app/src/main/res/layout/gallery_detail_comments.xml
+++ b/app/src/main/res/layout/gallery_detail_comments.xml
@@ -20,14 +20,15 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="@dimen/keyline_margin">
+    android:padding="@dimen/keyline_margin"
+    android:divider="@drawable/spacer_keyline"
+    android:showDividers="middle">
 
     <TextView
         android:id="@+id/comments_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-
         android:textColor="@color/colorAccent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_content.xml b/app/src/main/res/layout/gallery_detail_content.xml
index a6f098364..97059ab10 100644
--- a/app/src/main/res/layout/gallery_detail_content.xml
+++ b/app/src/main/res/layout/gallery_detail_content.xml
@@ -26,57 +26,26 @@
         layout="@layout/gallery_detail_header"/>
 
     <LinearLayout
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/below_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:divider="@drawable/divider_gallery_detail"
+        android:showDividers="middle"
+        android:dividerPadding="@dimen/keyline_margin">
 
         <include
             layout="@layout/gallery_detail_info"/>
 
-        <com.hippo.ehviewer.widget.DividerView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/keyline_margin"
-            android:paddingRight="@dimen/keyline_margin"
-            android:paddingBottom="@dimen/keyline_margin"
-            app:dividerHeight="1dp"
-            app:dividerColor="@color/divider"/>
-
         <include
             layout="@layout/gallery_detail_actions"/>
 
-        <com.hippo.ehviewer.widget.DividerView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/keyline_margin"
-            app:dividerHeight="1dp"
-            app:dividerColor="@color/divider"/>
-
         <include
             layout="@layout/gallery_detail_tags"/>
 
-        <com.hippo.ehviewer.widget.DividerView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/keyline_margin"
-            android:paddingRight="@dimen/keyline_margin"
-            android:paddingTop="@dimen/keyline_margin"
-            app:dividerHeight="1dp"
-            app:dividerColor="@color/divider"/>
-
         <include
             layout="@layout/gallery_detail_comments"/>
 
-        <com.hippo.ehviewer.widget.DividerView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/keyline_margin"
-            android:paddingRight="@dimen/keyline_margin"
-            app:dividerHeight="1dp"
-            app:dividerColor="@color/divider"/>
-
         <include
             layout="@layout/gallery_detail_previews"/>
 
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index af9a70398..7831adb0d 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -21,14 +21,15 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="@dimen/keyline_margin">
+    android:padding="@dimen/keyline_margin"
+    android:divider="@drawable/spacer_keyline"
+    android:showDividers="middle">
 
     <com.hippo.widget.SimpleGridLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/grid_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         app:columnCount="3"
         app:itemMargin="16dp"/>
 
diff --git a/app/src/main/res/layout/gallery_detail_tags.xml b/app/src/main/res/layout/gallery_detail_tags.xml
index 6caaf784f..d0978b155 100644
--- a/app/src/main/res/layout/gallery_detail_tags.xml
+++ b/app/src/main/res/layout/gallery_detail_tags.xml
@@ -21,8 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/keyline_margin"
-    android:paddingRight="@dimen/keyline_margin">
+    android:padding="@dimen/keyline_margin">
 
     <TextView
         android:id="@+id/no_tags"