cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style dialog buttons

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-12 17:00:09 +02:00
parent a7392eb99d
commit 65517f0d06
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/AndroidManifest.xml
View File

@@ -701,7 +701,7 @@
--> -->
<activity <activity
android:name=".ui.NfcOperationActivity" android:name=".ui.NfcOperationActivity"
android:theme="@style/KeychainTheme.YubiKeyDialog" android:theme="@style/KeychainTheme.LightSecurityTokenDialog"
android:allowTaskReparenting="true" android:allowTaskReparenting="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:taskAffinity=":Nfc" /> android:taskAffinity=":Nfc" />

16
OpenKeychain/src/main/res/values/themes.xml
View File

@@ -37,6 +37,9 @@
<!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 -->
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="searchViewStyle">@style/MySearchViewStyle</item> <item name="searchViewStyle">@style/MySearchViewStyle</item>
<!-- style dialogs -->
<item name="alertDialogTheme">@style/KeychainTheme.LightDialog</item>
</style> </style>
<style name="DarkBaseTheme" parent="MaterialDrawerTheme.ActionBar"> <style name="DarkBaseTheme" parent="MaterialDrawerTheme.ActionBar">
@@ -77,6 +80,9 @@
<!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 -->
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="searchViewStyle">@style/MySearchViewStyle</item> <item name="searchViewStyle">@style/MySearchViewStyle</item>
<!-- style dialogs -->
<item name="alertDialogTheme">@style/KeychainTheme.DarkDialog</item>
</style> </style>
<style name="LightTheme" parent="LightBaseTheme"> <style name="LightTheme" parent="LightBaseTheme">
@@ -105,7 +111,15 @@
<!--<item name="suggestionRowLayout">...</item>--> <!--<item name="suggestionRowLayout">...</item>-->
</style> </style>
<style name="KeychainTheme.YubiKeyDialog" parent="@style/Theme.AppCompat.Light.Dialog.MinWidth"> <style name="KeychainTheme.LightDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">#7bad45</item>
</style>
<style name="KeychainTheme.DarkDialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">#268bd2</item>
</style>
<style name="KeychainTheme.LightSecurityTokenDialog" parent="Theme.AppCompat.Light.Dialog.MinWidth">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>