From f425cf995a6e89b2cde29ecf20498538be1d877b Mon Sep 17 00:00:00 2001
From: George Venios <veniosg@gmail.com>
Date: Mon, 3 Aug 2015 00:27:29 +0100
Subject: [PATCH] Made styles, themes and colours more closely follow material
 design guidelines.

---
 src/main/res/values/attrs.xml  |  5 +++++
 src/main/res/values/colors.xml |  2 --
 src/main/res/values/styles.xml | 27 +++++++++++++++++++++++++++
 src/main/res/values/themes.xml |  7 +++++--
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/main/res/values/attrs.xml
 create mode 100644 src/main/res/values/styles.xml

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..365b2d02
--- /dev/null
+++ b/src/main/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="textAppearanceListItemPrimary" format="reference"/>
+    <attr name="textAppearanceListItemSecondary" format="reference"/>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index e254c4a2..be1996dd 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -4,8 +4,6 @@
     <color name="primary_dark">#0288D1</color>
     <color name="primary_light">#B3E5FC</color>
     <color name="accent">#FF9100</color>
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
 
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
new file mode 100644
index 00000000..51311401
--- /dev/null
+++ b/src/main/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Widget styles -->
+    <eat-comment />
+
+    <style name="Widget.Syncthing.ListView" parent="Widget.AppCompat.ListView">
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:clipToPadding">false</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+        <item name="android:divider">@android:color/transparent</item>
+    </style>
+
+    <!-- Text appearances -->
+    <eat-comment />
+
+    <style name="TextAppearance.Syncthing.ListItemPrimary" parent="TextAppearance.AppCompat.Subhead">
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
+
+    <style name="TextAppearance.Syncthing.ListItemSecondary" parent="TextAppearance.AppCompat.Body1">
+        <item name="android:textColor">?android:textColorSecondary</item>
+    </style>
+
+    <style name="TextAppearance.Syncthing.ListItemSmall" parent="TextAppearance.AppCompat.Caption" />
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 6417ce75..e1627447 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,9 +8,12 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:textColorPrimary">@color/primary_text</item>
-        <item name="android:textColorSecondary">@color/secondary_text</item>
         <item name="actionBarTheme">@style/ThemeOverlay.Syncthing.ActionBar</item>
+        <item name="textAppearanceListItemPrimary">@style/TextAppearance.Syncthing.ListItemPrimary</item>
+        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Syncthing.ListItemSecondary</item>
+        <item name="textAppearanceListItemSmall">@style/TextAppearance.Syncthing.ListItemSmall</item>
+
+        <item name="android:listViewStyle">@style/Widget.Syncthing.ListView</item>
     </style>
 
     <style name="Theme.Syncthing" parent="Theme.Syncthing.Base"/>