diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-22 23:52:29 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-22 23:52:29 +0100 |
commit | e20c6add4398ffc0137fc637bb9897c2cd09cb18 (patch) | |
tree | b72dfa0bf3a6f2ff22735bd61dadbf389739d2c2 /OpenKeychain/src/main/res/values | |
parent | f852cb74499eb82eed2b82ae3192b35fae57f276 (diff) | |
download | open-keychain-e20c6add4398ffc0137fc637bb9897c2cd09cb18.tar.gz open-keychain-e20c6add4398ffc0137fc637bb9897c2cd09cb18.tar.bz2 open-keychain-e20c6add4398ffc0137fc637bb9897c2cd09cb18.zip |
Fix multi select and more colors
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 8 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 006b9b9b5..895273967 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -14,16 +14,16 @@ <!-- Other colors --> <color name="primary_light">#C8E6C9</color> - <color name="fab">#2196F3</color> + <color name="fab">@color/accent</color> <color name="fab_pressed">#1976D2</color> <color name="primary_text">#212121</color> <color name="secondary_text">#727272</color> <color name="icons">#FFFFFF</color> <color name="divider">#B6B6B6</color> - <!-- set to text colors --> - <color name="emphasis">#212121</color> - <color name="emphasis_dark">#727272</color> + <color name="header_text">#212121</color> + <!-- item selection, search highlight --> + <color name="emphasis">@color/accent</color> <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 03ccce85e..f05bdb0ff 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -26,7 +26,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/emphasis</item> + <item name="android:textColor">@color/header_text</item> <item name="android:textSize">14sp</item> </style> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 147bd8d4c..da616492c 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -12,12 +12,14 @@ <item name="android:windowNoTitle">true</item> <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> + <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> + <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> <!-- Navigation Drawer library --> <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> <!-- ...but light popup menu (white background) --> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="drawerColor">#fafafa</item> |