diff options
| author | Thialfihar <thi@thialfihar.org> | 2015-06-26 11:08:26 +0200 |
|---|---|---|
| committer | Thialfihar <thi@thialfihar.org> | 2015-07-21 20:50:32 +0200 |
| commit | 13983be7998ea28cc4b8882e1b45eff5ca4986a6 (patch) | |
| tree | 58cd1963fb4b7106ca7e81ed1c6c19e5217e9e79 /OpenKeychain/src/main/res/values | |
| parent | 58cb6bb4b70795213f9609682c68d0025e0bab56 (diff) | |
| download | open-keychain-13983be7998ea28cc4b8882e1b45eff5ca4986a6.tar.gz open-keychain-13983be7998ea28cc4b8882e1b45eff5ca4986a6.tar.bz2 open-keychain-13983be7998ea28cc4b8882e1b45eff5ca4986a6.zip | |
Make header text and tertiary text color themeable
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 5 |
4 files changed, 10 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml index ce110418e..1755756fb 100644 --- a/OpenKeychain/src/main/res/values/attrs.xml +++ b/OpenKeychain/src/main/res/values/attrs.xml @@ -4,5 +4,7 @@ <attr name="colorFab" format="color" /> <attr name="colorFabPressed" format="color" /> <attr name="colorEmphasis" format="color" /> + <attr name="colorHeaderText" format="color" /> + <attr name="colorTertiaryText" format="color" /> </declare-styleable> </resources> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index b6b46ec8c..3d9e3e1ed 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -4,11 +4,7 @@ <color name="icons">#FFFFFF</color> <color name="transparent">#00FFFFFF</color> - <color name="header_text">#212121</color> - <color name="bg_gray">#cecbce</color> - <color name="tertiary_text_light">#808080</color> - <color name="alert">#ffdd3333</color> <color name="holo_gray_bright">#33CCCCCC</color> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index c7b326b7a..e21e3749c 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -7,7 +7,7 @@ <item name="android:layout_marginTop">16dp</item> <item name="android:paddingLeft">16dp</item> <item name="android:textStyle">normal</item> - <item name="android:textColor">@color/header_text</item> + <item name="android:textColor">?attr/colorHeaderText</item> <item name="android:textSize">17sp</item> </style> @@ -17,7 +17,7 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:paddingLeft">8dp</item> <item name="android:textStyle">bold</item> - <item name="android:textColor">@color/header_text</item> + <item name="android:textColor">?attr/colorHeaderText</item> <item name="android:textSize">14sp</item> </style> @@ -34,4 +34,4 @@ <item name="android:background">?android:attr/listDivider</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 823622269..a9a12966a 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -10,6 +10,9 @@ <item name="colorFabPressed">#1976d2</item> <item name="colorEmphasis">#2196f3</item> + <item name="colorHeaderText">#212121</item> + <item name="colorTertiaryText">#808080</item> + <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> @@ -28,6 +31,8 @@ <item name="colorFabPressed">#1976d2</item> <item name="colorEmphasis">#2196f3</item> + <item name="colorHeaderText">#a0a0a0</item> + <item name="colorTertiaryText">#808080</item> <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> |