Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Christian Schabesberger 2019-01-23 16:12:21 +01:00
commit 9269dcc984
38 changed files with 353 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/styles.xml
View file

@ -56,6 +56,7 @@
<item name="ic_list">@drawable/ic_list_black_24dp</item>
<item name="ic_grid">@drawable/ic_grid_black_24dp</item>
<item name="ic_delete">@drawable/ic_delete_black_24dp</item>
<item name="ic_settings_update">@drawable/ic_settings_update_black</item>
<item name="separator_color">@color/light_separator_color</item>
<item name="contrast_background_color">@color/light_contrast_background_color</item>
@ -118,6 +119,7 @@
<item name="ic_list">@drawable/ic_list_white_24dp</item>
<item name="ic_grid">@drawable/ic_grid_white_24dp</item>
<item name="ic_delete">@drawable/ic_delete_white_24dp</item>
<item name="ic_settings_update">@drawable/ic_settings_update_white</item>
<item name="separator_color">@color/dark_separator_color</item>
<item name="contrast_background_color">@color/dark_contrast_background_color</item>