From 393f7c1abac21c652197cc99d155c594b9142f25 Mon Sep 17 00:00:00 2001
From: Zhang Hai <dreaming.in.code.zh@gmail.com>
Date: Fri, 30 Mar 2018 23:04:44 -0700
Subject: [PATCH] [Fix] Work around AppCompat divider bug for good; Fixes
 dividers in DialogWhenLarge on tablet.

---
 .../main/res/drawable/list_divider_dark.xml   | 13 ++++++++++++
 .../main/res/drawable/list_divider_light.xml  | 13 ++++++++++++
 app/src/main/res/values/themes.xml            | 20 +++++++++++--------
 3 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/list_divider_dark.xml
 create mode 100644 app/src/main/res/drawable/list_divider_light.xml

diff --git a/app/src/main/res/drawable/list_divider_dark.xml b/app/src/main/res/drawable/list_divider_dark.xml
new file mode 100644
index 00000000..fd633fd1
--- /dev/null
+++ b/app/src/main/res/drawable/list_divider_dark.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2018 Zhang Hai <Dreaming.in.Code.ZH@Gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#1fffffff" />
+    <size
+        android:height="1dp"
+        android:width="1dp" />
+</shape>
diff --git a/app/src/main/res/drawable/list_divider_light.xml b/app/src/main/res/drawable/list_divider_light.xml
new file mode 100644
index 00000000..ae87ab89
--- /dev/null
+++ b/app/src/main/res/drawable/list_divider_light.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2018 Zhang Hai <Dreaming.in.Code.ZH@Gmail.com>
+  ~ All Rights Reserved.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#1f000000" />
+    <size
+        android:height="1dp"
+        android:width="1dp" />
+</shape>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d9330345..b253b2e2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -78,6 +78,7 @@
         <!-- Fixes. -->
         <item name="actionBarTheme">@style/ThemeOverlay.Douya.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.Douya.Light</item>
+        <item name="android:listDivider">@drawable/list_divider_light</item>
 
         <item name="colorPrimary">@color/douya_primary</item>
         <item name="colorPrimaryDark">@color/douya_primary_dark</item>
@@ -91,6 +92,7 @@
 
         <!-- Fixes. -->
         <item name="actionBarTheme">@style/ThemeOverlay.Douya.Dark.ActionBar</item>
+        <item name="android:listDivider">@drawable/list_divider_dark</item>
 
         <item name="colorAccent">@color/douya_accent</item>
 
@@ -107,10 +109,9 @@
 
         <!-- Fixes. -->
         <item name="actionMenuTextAppearance">@style/TextAppearance.Douya.Widget.ActionBar.Menu</item>
-        <item name="android:textColorLink">?colorAccent</item>
-        <!-- NOTE: The following two framework attributes are v11. Anyway. -->
         <item name="dividerHorizontal">?android:dividerHorizontal</item>
         <item name="dividerVertical">?android:dividerVertical</item>
+        <item name="android:textColorLink">?colorAccent</item>
         <item name="toolbarStyle">@style/Widget.Douya.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Douya.Toolbar.Button.Navigation</item>
     </style>
@@ -124,10 +125,9 @@
 
         <!-- Fixes. -->
         <item name="actionMenuTextAppearance">@style/TextAppearance.Douya.Widget.ActionBar.Menu</item>
-        <item name="android:textColorLink">?colorAccent</item>
-        <!-- NOTE: The following two framework attributes are v11. Anyway. -->
         <item name="dividerHorizontal">?android:dividerHorizontal</item>
         <item name="dividerVertical">?android:dividerVertical</item>
+        <item name="android:textColorLink">?colorAccent</item>
         <item name="toolbarStyle">@style/Widget.Douya.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Douya.Toolbar.Button.Navigation</item>
     </style>
@@ -164,6 +164,8 @@
         <!-- Fixes. -->
         <item name="actionBarTheme">@style/ThemeOverlay.Douya.Dark.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.Douya.Light</item>
+        <item name="android:dividerHorizontal">@drawable/list_divider_light</item>
+        <item name="android:dividerVertical">@drawable/list_divider_light</item>
 
         <item name="colorPrimary">@color/douya_primary</item>
         <item name="colorPrimaryDark">@color/douya_primary_dark</item>
@@ -177,6 +179,8 @@
 
         <!-- Fixes. -->
         <item name="actionBarTheme">@style/ThemeOverlay.Douya.ActionBar</item>
+        <item name="android:dividerHorizontal">@drawable/list_divider_light</item>
+        <item name="android:dividerVertical">@drawable/list_divider_light</item>
 
         <item name="colorAccent">@color/douya_accent</item>
 
@@ -188,6 +192,8 @@
 
         <!-- Fixes. -->
         <item name="actionBarTheme">@style/ThemeOverlay.Douya.Dark.ActionBar</item>
+        <item name="android:dividerHorizontal">@drawable/list_divider_dark</item>
+        <item name="android:dividerVertical">@drawable/list_divider_dark</item>
 
         <item name="colorAccent">@color/douya_accent</item>
 
@@ -204,10 +210,9 @@
 
         <!-- Fixes. -->
         <item name="actionMenuTextAppearance">@style/TextAppearance.Douya.Widget.ActionBar.Menu</item>
-        <item name="android:textColorLink">?colorAccent</item>
-        <!-- NOTE: The following two framework attributes are v11. Anyway. -->
         <item name="dividerHorizontal">?android:dividerHorizontal</item>
         <item name="dividerVertical">?android:dividerVertical</item>
+        <item name="android:textColorLink">?colorAccent</item>
         <item name="toolbarStyle">@style/Widget.Douya.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Douya.Toolbar.Button.Navigation</item>
     </style>
@@ -221,10 +226,9 @@
 
         <!-- Fixes. -->
         <item name="actionMenuTextAppearance">@style/TextAppearance.Douya.Widget.ActionBar.Menu</item>
-        <item name="android:textColorLink">?colorAccent</item>
-        <!-- NOTE: The following two framework attributes are v11. Anyway. -->
         <item name="dividerHorizontal">?android:dividerHorizontal</item>
         <item name="dividerVertical">?android:dividerVertical</item>
+        <item name="android:textColorLink">?colorAccent</item>
         <item name="toolbarStyle">@style/Widget.Douya.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Douya.Toolbar.Button.Navigation</item>
     </style>