Fix multi select and more colors

This commit is contained in:
Dominik Schürmann
2015-02-22 23:52:29 +01:00
parent f852cb7449
commit e20c6add43
16 changed files with 18 additions and 20 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 399 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 465 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 971 B

View File

@@ -6,6 +6,6 @@
android:height="2dp"
android:width="1000dp" />
<solid android:color="@color/emphasis" />
<solid android:color="@color/header_text" />
</shape>

View File

@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:text="@string/none"
android:layout_gravity="center_vertical"
android:textColor="@color/emphasis" />
android:textColor="@color/header_text" />
</LinearLayout>
<LinearLayout

View File

@@ -4,26 +4,23 @@
<item
android:id="@+id/menu_key_list_multi_encrypt"
android:icon="@drawable/ic_action_secure"
android:icon="@drawable/ic_lock_white_24dp"
android:title="@string/menu_encrypt_to" />
<item
android:id="@+id/menu_key_list_multi_export"
android:icon="@drawable/ic_action_import_export"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_list_multi_delete"
android:icon="@drawable/ic_action_discard"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_delete_key" />
<item
android:id="@+id/menu_key_list_multi_select_all"
android:icon="@drawable/ic_action_select_all"
android:showAsAction="never"
tools:ignore="AppCompatResource"
android:title="@string/menu_select_all" />

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>