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

Once again: Colors and header image

Browse Source
This commit is contained in:
Dominik Schürmann
2015-02-22 21:16:40 +01:00
parent 6008b65bbd
commit d0be3bd7ea
102 changed files with 5626 additions and 1383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable/drawer_header.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 48 KiB

2
OpenKeychain/src/main/res/layout/drawer_custom_header.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="@color/colorPrimary">
android:background="@color/primary">
<TextView
android:layout_width="wrap_content"

16
OpenKeychain/src/main/res/layout/key_list_fragment.xml
View File

@@ -52,8 +52,8 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
fab:fab_addButtonColorNormal="@color/fab"
fab:fab_addButtonColorPressed="@color/fab_pressed"
fab:fab_addButtonColorNormal="@color/primary"
fab:fab_addButtonColorPressed="@color/primary_dark"
fab:fab_addButtonSize="normal"
fab:fab_addButtonPlusIconColor="@color/icons"
fab:fab_expandDirection="up"
@@ -67,8 +67,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/qrcode"
fab:fab_colorNormal="@color/fab"
fab:fab_colorPressed="@color/fab_pressed"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Scan QR Code"
fab:fab_size="mini" />
@@ -77,8 +77,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_cloud_search_24px"
fab:fab_colorNormal="@color/fab"
fab:fab_colorPressed="@color/fab_pressed"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Search Cloud"
fab:fab_size="mini" />
@@ -87,8 +87,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_folder_white_24dp"
fab:fab_colorNormal="@color/fab"
fab:fab_colorPressed="@color/fab_pressed"
fab:fab_colorNormal="@color/primary"
fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Import from File"
fab:fab_size="mini" />

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

@@ -1,27 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--<color name="colorPrimary">@color/material_deep_teal_500</color>-->
<!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>-->
<!-- Main theme colors -->
<!-- TODO: -->
<!-- green colors from OpenKeychain logo bottom right -->
<!-- your app branding color for the app bar -->
<color name="primary">#7bad45</color>
<!-- darker variant for the status bar and contextual app bars -->
<color name="primary_dark">#6c983d</color>
<!-- theme UI controls like checkboxes and text fields -->
<color name="accent">#2196F3</color>
<color name="colorSecondary">@color/material_deep_teal_200</color>
<color name="colorSecondaryDark">@color/material_deep_teal_500</color>
<!--<color name="windowBackgroundColor">#333333</color>-->
<color name="black_translucent">#80000000</color>
<!-- Other colors -->
<!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
<color name="colorPrimary">#8bc34a</color>
<color name="colorPrimaryDark">#558b2f</color>
<!-- TODO: -->
<color name="primary">#8bc34a</color>
<color name="primary_dark">#558b2f</color>
<color name="primary_light">#C8E6C9</color>
<color name="accent">#00BCD4</color>
<color name="fab">#00BCD4</color>
<color name="fab_pressed">#0097A7</color>
<color name="fab">#2196F3</color>
<color name="fab_pressed">#1976D2</color>
<color name="primary_text">#212121</color>
<color name="secondary_text">#727272</color>
<color name="icons">#FFFFFF</color>
@@ -39,26 +33,26 @@
<color name="holo_gray_bright">#33CCCCCC</color>
<!-- FAB -->
<!-- floating action buttons -->
<color name="black_semi_transparent">#B2000000</color>
<color name="background">#e5e5e5</color>
<color name="half_black">#808080</color>
<color name="white">#fafafa</color>
<color name="white_pressed">#f1f1f1</color>
<color name="pink">#e91e63</color>
<color name="pink_pressed">#ec407a</color>
<!--
http://www.google.com/design/spec/style/color.html#color-color-palette
light = normal color
dark = 900
exception: green
-->
<color name="android_red_light">#f44336</color>
<color name="android_red_dark">#b71c1c</color>
<color name="android_orange_light">#ff9800</color>
<color name="android_orange_dark">#e65100</color>
<color name="android_green_light">#4caf50</color>
<color name="android_green_dark">#1b5e20</color>
<color name="android_green_light">@color/primary</color>
<color name="android_green_dark">@color/primary_dark</color>
<color name="android_purple_light">#673ab7</color>
<color name="android_purple_dark">#311b92</color>

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

@@ -5,8 +5,8 @@
<!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
<style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowNoTitle">true</item>