diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-07 15:57:27 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-07 15:57:27 +0100 |
| commit | af1410b02a88a4948bb0f24ccf0f9e3c455bd11f (patch) | |
| tree | 798c78e21ae2f5a0dd7b3d846f71b83215ff96c2 | |
| parent | ef525fb10e672b23219fdf180d310de9f6ce59d3 (diff) | |
| parent | 312f95b73d9e2e1a0e3f21ea7c297263ec05987b (diff) | |
Merge pull request #845 from SamWhited/material
Add materials theme for v21 devices
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 14 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 |
4 files changed, 20 insertions, 4 deletions
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 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> |