diff options
-rw-r--r-- | res/drawable-hdpi/ic_menu_attaches.png | bin | 2098 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_attaches_light.png | bin | 0 -> 1543 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_marked.png | bin | 1726 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_publish.png | bin | 1438 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_publish_light.png | bin | 0 -> 1219 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_attaches_light.png | bin | 0 -> 3147 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_publish_light.png | bin | 0 -> 2323 bytes | |||
-rw-r--r-- | res/drawable/s_menu_attaches_light.svg (renamed from res/drawable/s_menu_attaches.svg) | 18 | ||||
-rw-r--r-- | res/drawable/s_menu_publish_light.svg (renamed from res/drawable/s_menu_publish.svg) | 16 | ||||
-rw-r--r-- | res/menu/headlines_action_menu.xml | 5 | ||||
-rw-r--r-- | res/menu/headlines_context_menu.xml | 5 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 11 | ||||
-rw-r--r-- | res/menu/offline_menu.xml | 36 |
13 files changed, 35 insertions, 56 deletions
diff --git a/res/drawable-hdpi/ic_menu_attaches.png b/res/drawable-hdpi/ic_menu_attaches.png Binary files differdeleted file mode 100644 index eccb0cbc..00000000 --- a/res/drawable-hdpi/ic_menu_attaches.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_attaches_light.png b/res/drawable-hdpi/ic_menu_attaches_light.png Binary files differnew file mode 100644 index 00000000..962c9d70 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_attaches_light.png diff --git a/res/drawable-hdpi/ic_menu_marked.png b/res/drawable-hdpi/ic_menu_marked.png Binary files differdeleted file mode 100644 index 4f0c07c8..00000000 --- a/res/drawable-hdpi/ic_menu_marked.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_publish.png b/res/drawable-hdpi/ic_menu_publish.png Binary files differdeleted file mode 100644 index de42e535..00000000 --- a/res/drawable-hdpi/ic_menu_publish.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_publish_light.png b/res/drawable-hdpi/ic_menu_publish_light.png Binary files differnew file mode 100644 index 00000000..72acf3dc --- /dev/null +++ b/res/drawable-hdpi/ic_menu_publish_light.png diff --git a/res/drawable-xhdpi/ic_menu_attaches_light.png b/res/drawable-xhdpi/ic_menu_attaches_light.png Binary files differnew file mode 100644 index 00000000..2dce9852 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_attaches_light.png diff --git a/res/drawable-xhdpi/ic_menu_publish_light.png b/res/drawable-xhdpi/ic_menu_publish_light.png Binary files differnew file mode 100644 index 00000000..47357a06 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_publish_light.png diff --git a/res/drawable/s_menu_attaches.svg b/res/drawable/s_menu_attaches_light.svg index d158f478..f7788b2e 100644 --- a/res/drawable/s_menu_attaches.svg +++ b/res/drawable/s_menu_attaches_light.svg @@ -15,10 +15,10 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.48.2 r9819" - sodipodi:docname="s_menu_attaches.svg" - inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-hdpi\ic_menu_attaches.png" - inkscape:export-xdpi="225" - inkscape:export-ydpi="225" + sodipodi:docname="s_menu_attaches_light.svg" + inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-xhdpi\ic_menu_attaches_light.png" + inkscape:export-xdpi="540" + inkscape:export-ydpi="540" version="1.1"> <defs id="defs4"> @@ -99,13 +99,13 @@ </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#454545" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0000000" + inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="1.501129" + inkscape:cx="-5.4631567" inkscape:cy="8.3641285" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -134,8 +134,8 @@ inkscape:groupmode="layer" id="layer1"> <path - style="fill:none;stroke:#888a85;stroke-width:1.26131642;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 6.9892642,2.3757495 C 6.0497128,3.8758958 5.110161,5.376042 4.1706096,6.8761883 3.231058,8.3763347 2.1868547,9.8241539 1.2473032,11.3243 1.0695751,11.880314 2.4591402,13.489424 3.2673124,14.067232 4.108665,14.63398 6.5590494,15.293346 7.015292,15.13582 8.2872017,13.178185 9.6637633,11.272876 10.935674,9.3152417 12.207582,7.3576065 13.479493,5.399971 14.751402,3.4423357 14.794991,2.8776202 13.72786,1.8760087 12.997895,1.4004248 12.201569,0.90272101 11.053313,0.73681972 10.708457,0.90272101 9.6928273,2.5193913 8.6771969,4.1360615 7.6615667,5.7527318 6.6459365,7.3694021 5.6303063,8.9860723 4.6146759,10.602743 c -0.071518,0.275829 0.3965912,0.633779 0.5948867,0.7923 0.2227539,0.132721 0.8326308,0.441406 1.1257707,0.327777 C 6.9455358,10.82126 7.555738,9.9197012 8.1659403,9.0181406 8.7761427,8.1165809 9.3863449,7.215021 9.9965471,6.3134614" + style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:1.01243579;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="M 7.1949345,3.4855171 C 6.4407737,4.6896572 5.6866126,5.8937972 4.9324518,7.0979373 4.1782908,8.3020776 3.3401279,9.4642157 2.585967,10.668355 2.4433079,11.114657 3.5586865,12.406261 4.2073916,12.870056 4.88273,13.324975 6.8496089,13.854236 7.2158265,13.727792 8.2367653,12.156434 9.3417063,10.627078 10.362645,9.0557211 11.383583,7.484363 12.404523,5.9130046 13.425461,4.3416464 13.460449,3.8883596 12.603883,3.0843843 12.017953,2.7026417 11.378757,2.3031439 10.457072,2.169978 10.180263,2.3031439 9.3650354,3.6008158 8.5498074,4.8984874 7.7345795,6.1961592 6.9193517,7.4938311 6.1041238,8.7915028 5.2888958,10.089174 c -0.057406,0.221403 0.3183365,0.508724 0.4775046,0.635965 0.1788006,0.106533 0.6683377,0.354309 0.9036357,0.2631 C 7.1598346,10.264574 7.6496327,9.5409097 8.139431,8.8172435 8.6292294,8.0935779 9.1190276,7.3699122 9.6088257,6.6462467" id="path3814" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccc" /> diff --git a/res/drawable/s_menu_publish.svg b/res/drawable/s_menu_publish_light.svg index babb507a..be000e77 100644 --- a/res/drawable/s_menu_publish.svg +++ b/res/drawable/s_menu_publish_light.svg @@ -13,10 +13,10 @@ id="RSSicon" viewBox="0 0 32 32" inkscape:version="0.48.2 r9819" - sodipodi:docname="s_menu_publish.svg" - inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-hdpi\ic_menu_publish.png" - inkscape:export-xdpi="225" - inkscape:export-ydpi="225"> + sodipodi:docname="s_menu_publish_light.svg" + inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-xhdpi\ic_menu_publish_light.png" + inkscape:export-xdpi="540" + inkscape:export-ydpi="540"> <metadata id="metadata34"> <rdf:RDF> @@ -30,7 +30,7 @@ </rdf:RDF> </metadata> <sodipodi:namedview - pagecolor="#ffffff" + pagecolor="#171717" bordercolor="#666666" borderopacity="1" objecttolerance="10" @@ -43,8 +43,8 @@ id="namedview32" showgrid="false" inkscape:zoom="23.953242" - inkscape:cx="-4.9762823" - inkscape:cy="10.694533" + inkscape:cx="6.9218983" + inkscape:cy="7.6051808" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" @@ -105,7 +105,7 @@ </filter> </defs> <path - style="fill:#4f9dfd;fill-opacity:1;filter:url(#filter3031)" + style="fill:#ffffff;fill-opacity:1;filter:url(#filter3031);opacity:0.80000000000000004" d="M 4.09375 1.15625 C 2.4640215 1.15625 1.15625 2.4640215 1.15625 4.09375 L 1.15625 11.90625 C 1.15625 13.535978 2.4640215 14.84375 4.09375 14.84375 L 11.90625 14.84375 C 13.535978 14.84375 14.84375 13.535978 14.84375 11.90625 L 14.84375 4.09375 C 14.84375 2.4640215 13.535978 1.15625 11.90625 1.15625 L 4.09375 1.15625 z M 3.5 3.1875 A 9.3601078 9.3601078 0 0 1 12.875 12.53125 L 11 12.53125 A 7.4880862 7.4880862 0 0 0 3.5 5.0625 L 3.5 3.1875 z M 3.5 6.34375 A 6.2044143 6.2044143 0 0 1 9.71875 12.53125 L 7.90625 12.53125 A 4.3858791 4.3858791 0 0 0 3.5 8.15625 L 3.5 6.34375 z M 4.78125 9.96875 C 5.4902024 9.96875 6.0625 10.541048 6.0625 11.25 C 6.0625 11.958952 5.4902024 12.53125 4.78125 12.53125 C 4.0722976 12.53125 3.5 11.958952 3.5 11.25 C 3.5 10.541048 4.0722976 9.96875 4.78125 9.96875 z " transform="scale(2,2)" id="rect20" /> diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml index 58cd900b..5764e179 100644 --- a/res/menu/headlines_action_menu.xml +++ b/res/menu/headlines_action_menu.xml @@ -3,17 +3,18 @@ <item android:id="@+id/selection_toggle_unread" android:showAsAction="ifRoom" + android:icon="@drawable/ic_undo_light" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_menu_marked" + android:icon="@drawable/ic_unimportant_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_publish" + android:icon="@drawable/ic_menu_publish_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> diff --git a/res/menu/headlines_context_menu.xml b/res/menu/headlines_context_menu.xml index 09cea090..2a445216 100644 --- a/res/menu/headlines_context_menu.xml +++ b/res/menu/headlines_context_menu.xml @@ -27,9 +27,8 @@ android:showAsAction="" android:title="@string/article_mark_read_above"/> <item - android:id="@+id/set_labels" - android:icon="@drawable/ic_menu_marked" - android:title="@string/article_set_labels"/> + android:id="@+id/set_labels" + android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" android:showAsAction="" diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 84adbc8e..d9a33b48 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -82,29 +82,28 @@ android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_menu_marked" + android:icon="@drawable/ic_unimportant_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_publish" + android:icon="@drawable/ic_menu_publish_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> <item android:id="@+id/selection_select_none" - android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" android:title="@string/selection_select_none"/> </group> <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_menu_marked" + android:icon="@drawable/ic_unimportant_light" android:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_menu_publish" + android:icon="@drawable/ic_menu_publish_light" android:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item @@ -120,7 +119,7 @@ android:title="@string/article_set_unread"/> <item android:id="@+id/toggle_attachments" - android:icon="@drawable/ic_menu_attaches" + android:icon="@drawable/ic_menu_attaches_light" android:showAsAction="ifRoom" android:title="@string/attachments_prompt"/> <item diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index 181cae90..bc7d3397 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -8,25 +8,17 @@ android:title="@string/go_online" android:visible="false"/> - <!-- - <item - android:id="@+id/back_to_categories" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="ifRoom|withText" - android:title="@string/back_to_categories"/> - --> - <item android:id="@+id/show_feeds" - android:icon="@android:drawable/ic_menu_agenda" - android:showAsAction="" + android:icon="@drawable/ic_list_light" + android:showAsAction="ifRoom" android:title="@string/menu_all_feeds"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" - android:icon="@android:drawable/ic_menu_search" + android:icon="@drawable/ic_search_light" android:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> <item @@ -36,11 +28,6 @@ android:id="@+id/headlines_select" android:showAsAction="" android:title="@string/headlines_select"/> - <!-- <item - android:id="@+id/close_feed" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="" - android:title="@string/close_feed"/> --> </group> <group android:id="@+id/menu_group_headlines_selection" > <item @@ -49,29 +36,28 @@ android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:icon="@drawable/ic_menu_marked" + android:icon="@drawable/ic_unimportant_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:icon="@drawable/ic_menu_publish" + android:icon="@drawable/ic_menu_publish_light" android:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> <item android:id="@+id/selection_select_none" - android:icon="@android:drawable/ic_menu_close_clear_cancel" android:showAsAction="" android:title="@string/selection_select_none"/> </group> <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" - android:icon="@drawable/ic_menu_marked" + android:icon="@drawable/ic_unimportant_light" android:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" - android:icon="@drawable/ic_menu_publish" + android:icon="@drawable/ic_menu_publish_light" android:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item @@ -82,22 +68,16 @@ android:title="@string/share_article"/> <item android:id="@+id/set_unread" - android:icon="@android:drawable/ic_menu_recent_history" + android:icon="@drawable/ic_undo_light" android:showAsAction="" android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" android:title="@string/article_mark_read_above"/> - <!-- <item - android:id="@+id/close_article" - android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="" - android:title="@string/close_article"/> --> </group> <item android:id="@+id/preferences" - android:icon="@android:drawable/ic_menu_preferences" android:showAsAction="" android:title="@string/preferences"/> |