Merge pull request #845 from SamWhited/material

Add materials theme for v21 devices
This commit is contained in:
Daniel Gultsch 2015-01-07 15:57:27 +01:00
commit af1410b02a
4 changed files with 20 additions and 4 deletions

View File

@ -3,5 +3,6 @@ android:
components: components:
- platform-tools - platform-tools
- tools - tools
- build-tools-21.1.2
- build-tools-19.1.0 - build-tools-19.1.0
- android-19 - android-21

View File

@ -40,12 +40,12 @@ dependencies {
} }
android { android {
compileSdkVersion 19 compileSdkVersion 21
buildToolsVersion "19.1" buildToolsVersion "21.1.2"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 19 targetSdkVersion 21
versionCode 41 versionCode 41
versionName "0.10" versionName "0.10"
} }

View File

@ -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>

View File

@ -3,6 +3,7 @@
<color name="primary" type="color">#ff259b24</color> <color name="primary" type="color">#ff259b24</color>
<color name="primarydark" type="color">#ff0a7e07</color> <color name="primarydark" type="color">#ff0a7e07</color>
<color name="accent">#ff0091ea</color>
<color name="primarytext" type="color">#de000000</color> <color name="primarytext" type="color">#de000000</color>
<color name="secondarytext" type="color">#8a000000</color> <color name="secondarytext" type="color">#8a000000</color>
<color name="ondarktext" type="color">#fffafafa</color> <color name="ondarktext" type="color">#fffafafa</color>