From 45bb59dba8850d67025a83244a80a1d69d59276b Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 6 Jan 2015 21:37:49 -0500
Subject: Add materials theme

---
 build.gradle                       |  6 +++---
 src/main/res/values-v21/themes.xml | 14 ++++++++++++++
 src/main/res/values/colors.xml     |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/main/res/values-v21/themes.xml

diff --git a/build.gradle b/build.gradle
index 29cb3840e..87e352475 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,12 +40,12 @@ dependencies {
 }
 
 android {
-	compileSdkVersion 19
-	buildToolsVersion "19.1"
+	compileSdkVersion 21
+	buildToolsVersion "21.1.2"
 
 	defaultConfig {
 		minSdkVersion 14
-		targetSdkVersion 19
+		targetSdkVersion 21
 		versionCode 41
 		versionName "0.10"
 	}
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
new file mode 100644
index 000000000..fddab4663
--- /dev/null
+++ b/src/main/res/values-v21/themes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primarydark</item>
+        <item name="android:colorAccent">@color/accent</item>
+
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 908b8b89a..c21650a5d 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
 
     <color name="primary" type="color">#ff259b24</color>
     <color name="primarydark" type="color">#ff0a7e07</color>
+    <color name="accent">#ff0091ea</color>
     <color name="primarytext" type="color">#de000000</color>
     <color name="secondarytext" type="color">#8a000000</color>
     <color name="ondarktext" type="color">#fffafafa</color>
-- 
cgit v1.2.3


From 312f95b73d9e2e1a0e3f21ea7c297263ec05987b Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 6 Jan 2015 21:51:37 -0500
Subject: Update travis config to use current build tools

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cb01fd952..e11c02c57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,6 @@ android:
   components:
     - platform-tools
     - tools
+    - build-tools-21.1.2
     - build-tools-19.1.0
-    - android-19
+    - android-21
-- 
cgit v1.2.3