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

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-31 18:49:54 +01:00
parent 5466d1e980 e651a39279
commit 0b6dc65c97
49 changed files with 3226 additions and 1375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/res/values/colors.xml
View File

@@ -19,13 +19,12 @@
<color name="primary">#4CAF50</color>
<color name="primary_dark">#388E3C</color>
<color name="primary_light">#C8E6C9</color>
<color name="accent">#536DFE</color>
<color name="accent">#00BCD4</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>

2
OpenKeychain/src/main/res/values/dimens.xml
View File

@@ -1,5 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="drawer_size">240dp</dimen>
<dimen name="drawer_content_padding">0dp</dimen>
</resources>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -489,6 +489,7 @@
<string name="api_settings_package_name">"Package Name"</string>
<string name="api_settings_package_signature">"SHA-256 of Package Signature"</string>
<string name="api_settings_accounts">"Accounts"</string>
<string name="api_settings_allowed_keys">"Allowed Keys"</string>
<string name="api_settings_settings">"Settings"</string>
<string name="api_settings_key">"Account key:"</string>
<string name="api_settings_accounts_empty">"No accounts attached to this app."</string>

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

@@ -3,18 +3,22 @@
<style name="KeychainTheme" parent="KeychainTheme.Base" />
<style name="KeychainTheme.Base" parent="HoloKeychainTheme">
<!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
<style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimary</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="searchViewStyle">@style/MySearchViewStyle</item>
<item name="colorAccent">@color/accent</item>
<!-- Navigation Drawer library -->
<item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
<item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
<!-- dark action bar... -->
<item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</item>
<!-- ...but light popup menu (white background) -->
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="drawerColor">#fafafa</item>
<item name="singleAccount">false</item>
<item name="sectionStyle">@style/MaterialSectionTheme.Light</item>