diff options
author | Andrew Dolgov <[email protected]> | 2013-04-16 13:04:28 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-16 13:04:28 +0400 |
commit | 18eebe9b4eac4ac15d7e5ea552e614dc5a450be7 (patch) | |
tree | fc33c3b8dddcfc97ec1b7752ded1064829103435 | |
parent | ef07afec72e181e0b0cec06493c14daf443ea7b9 (diff) |
resize own icons, add share icon
-rw-r--r-- | res/drawable-hdpi/ic_menu_attaches_light.png | bin | 1543 -> 1461 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_share_light.png | bin | 0 -> 1606 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_attaches_light.png | bin | 2098 -> 1873 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_publish_light.png | bin | 1608 -> 1760 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_share_light.png | bin | 0 -> 1780 bytes | |||
-rw-r--r-- | res/drawable/s_menu_attaches_light.svg | 20 | ||||
-rw-r--r-- | res/drawable/s_menu_publish_light.svg | 12 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 2 | ||||
-rw-r--r-- | res/menu/offline_menu.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 8 |
11 files changed, 25 insertions, 21 deletions
diff --git a/res/drawable-hdpi/ic_menu_attaches_light.png b/res/drawable-hdpi/ic_menu_attaches_light.png Binary files differindex 962c9d70..8bf8cb78 100644 --- a/res/drawable-hdpi/ic_menu_attaches_light.png +++ b/res/drawable-hdpi/ic_menu_attaches_light.png diff --git a/res/drawable-hdpi/ic_share_light.png b/res/drawable-hdpi/ic_share_light.png Binary files differnew file mode 100644 index 00000000..c329f58d --- /dev/null +++ b/res/drawable-hdpi/ic_share_light.png diff --git a/res/drawable-xhdpi/ic_menu_attaches_light.png b/res/drawable-xhdpi/ic_menu_attaches_light.png Binary files differindex 03099f58..a3e253fa 100644 --- a/res/drawable-xhdpi/ic_menu_attaches_light.png +++ 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 differindex 386b4347..8c82c450 100644 --- a/res/drawable-xhdpi/ic_menu_publish_light.png +++ b/res/drawable-xhdpi/ic_menu_publish_light.png diff --git a/res/drawable-xhdpi/ic_share_light.png b/res/drawable-xhdpi/ic_share_light.png Binary files differnew file mode 100644 index 00000000..15549b04 --- /dev/null +++ b/res/drawable-xhdpi/ic_share_light.png diff --git a/res/drawable/s_menu_attaches_light.svg b/res/drawable/s_menu_attaches_light.svg index b822729d..0396f73f 100644 --- a/res/drawable/s_menu_attaches_light.svg +++ b/res/drawable/s_menu_attaches_light.svg @@ -14,11 +14,11 @@ height="16.000000px" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.4 r9939" 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="360" - inkscape:export-ydpi="360" + inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-hdpi\ic_menu_attaches_light.png" + inkscape:export-xdpi="270" + inkscape:export-ydpi="270" version="1.1"> <defs id="defs4"> @@ -105,12 +105,12 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="-5.4631567" - inkscape:cy="8.3641285" + inkscape:cx="6.7689862" + inkscape:cy="8.4534142" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1920" - inkscape:window-height="1138" + inkscape:window-width="1600" + inkscape:window-height="1137" inkscape:window-x="-8" inkscape:window-y="-8" showguides="true" @@ -134,8 +134,8 @@ inkscape:groupmode="layer" id="layer1"> <path - 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" + style="opacity:0.8;fill:none;stroke:#ffffff;stroke-width:0.91846919;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="M 7.2696546,3.9045172 C 6.5854893,4.9968981 5.9013237,6.089279 5.2171584,7.1816599 4.5329929,8.274041 3.7726219,9.3283183 3.0884565,10.420698 c -0.1294185,0.40488 0.8824391,1.576607 1.4709363,1.997356 0.6126586,0.412697 2.3969867,0.892836 2.7292147,0.778128 0.926183,-1.425517 1.9285718,-2.81293 2.8547545,-4.238445 C 11.069544,7.5322205 11.995728,6.1067037 12.921911,4.6811871 12.953651,4.2699709 12.176585,3.5406145 11.645037,3.1943024 11.065166,2.8318829 10.229025,2.7110765 9.9779075,2.8318829 9.2383431,4.0091148 8.4987784,5.1863463 7.7592138,6.363578 7.0196493,7.5408098 6.2800847,8.7180415 5.5405199,9.8952727 c -0.052078,0.2008543 0.288791,0.4615083 0.4331863,0.5769393 0.1622057,0.09665 0.6063076,0.321425 0.8197671,0.238681 C 7.2378124,10.054393 7.6821511,9.3978941 8.12649,8.7413931 8.5708291,8.0848927 9.0151679,7.4283922 9.4595067,6.7718918" id="path3814" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccc" /> diff --git a/res/drawable/s_menu_publish_light.svg b/res/drawable/s_menu_publish_light.svg index de7bf32c..a0d818e2 100644 --- a/res/drawable/s_menu_publish_light.svg +++ b/res/drawable/s_menu_publish_light.svg @@ -12,11 +12,11 @@ height="16" id="RSSicon" viewBox="0 0 32 32" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.4 r9939" 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="360" - inkscape:export-ydpi="360"> + inkscape:export-xdpi="475.98999" + inkscape:export-ydpi="475.98999"> <metadata id="metadata34"> <rdf:RDF> @@ -38,8 +38,8 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1138" + inkscape:window-width="1600" + inkscape:window-height="1137" id="namedview32" showgrid="false" inkscape:zoom="23.953242" @@ -107,7 +107,7 @@ <path style="opacity:0.8;fill:#ffffff;fill-opacity:1;filter:url(#filter3031)" d="m 4.09375,1.15625 c -1.6297285,0 -2.9375,1.3077715 -2.9375,2.9375 l 0,7.8125 c 0,1.629728 1.3077715,2.9375 2.9375,2.9375 l 7.8125,0 c 1.629728,0 2.9375,-1.307772 2.9375,-2.9375 l 0,-7.8125 c 0,-1.6297285 -1.307772,-2.9375 -2.9375,-2.9375 l -7.8125,0 z M 3.5,3.1875 a 9.3601078,9.3601078 0 0 1 9.375,9.34375 l -1.875,0 A 7.4880862,7.4880862 0 0 0 3.5,5.0625 l 0,-1.875 z m 0,3.15625 a 6.2044143,6.2044143 0 0 1 6.21875,6.1875 l -1.8125,0 A 4.3858791,4.3858791 0 0 0 3.5,8.15625 l 0,-1.8125 z m 1.28125,3.625 c 0.7089524,0 1.28125,0.572298 1.28125,1.28125 0,0.708952 -0.5722976,1.28125 -1.28125,1.28125 C 4.0722976,12.53125 3.5,11.958952 3.5,11.25 3.5,10.541048 4.0722976,9.96875 4.78125,9.96875 z" - transform="matrix(1.9023974,0,0,1.9023974,0.78082108,0.78082108)" + transform="matrix(1.7681938,0,0,1.7681938,1.8544501,1.8544501)" id="rect20" inkscape:connector-curvature="0" /> </svg> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 34190322..7d41f16f 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -113,7 +113,7 @@ android:title="@string/attachments_prompt"/> <item android:id="@+id/share_article" - android:icon="@android:drawable/ic_menu_share" + android:icon="@drawable/ic_share_light" android:showAsAction="ifRoom" android:title="@string/share_article"/> <!-- android:actionProviderClass="android.widget.ShareActionProvider" --> diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index bc7d3397..a4dbd0f1 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -63,7 +63,7 @@ <item android:id="@+id/share_article" android:actionProviderClass="android.widget.ShareActionProvider" - android:icon="@android:drawable/ic_menu_share" + android:icon="@drawable/ic_share_light" android:showAsAction="" android:title="@string/share_article"/> <item diff --git a/res/values/strings.xml b/res/values/strings.xml index 4c0e8922..a24ab9a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -47,7 +47,7 @@ <string name="context_selection_toggle_marked">(Un)Star</string> <string name="context_selection_toggle_published">(Un)Publish</string> <string name="context_selection_toggle_unread">(Un)Read</string> - <string name="article_set_unread">Set unread</string> + <string name="article_set_unread">Article set unread</string> <string name="article_mark_read_above">Mark above read</string> <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string> <string name="login_summary">Your tt-rss login. Not needed for single user mode</string> diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 874a6a13..d398843b 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -971,7 +971,7 @@ public class OnlineActivity extends CommonActivity { a.unread = true;
saveArticleUnread(a);
if (hf != null) hf.notifyUpdated();
- if (ap != null) ap.notifyUpdated();
+ //if (ap != null) ap.notifyUpdated();
}
return true;
case R.id.set_labels:
@@ -1194,7 +1194,11 @@ public class OnlineActivity extends CommonActivity { @SuppressWarnings({ "unchecked", "serial" })
public void saveArticleUnread(final Article article) {
- ApiRequest req = new ApiRequest(getApplicationContext());
+ ApiRequest req = new ApiRequest(getApplicationContext()) {
+ protected void onPostExecute(JsonElement result) {
+ toast(R.string.article_set_unread);
+ }
+ };
HashMap<String, String> map = new HashMap<String, String>() {
{
|