From cd77d1c7ff20a43d9673619d4c0757f176287820 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 4 Oct 2013 10:23:18 +0200 Subject: [PATCH] Allow filter action to show in main action bar (and add an icon for the action). --- README.md | 5 +- README.md~ | 91 ++++++++++++++++++ .../drawable-hdpi/ic_action_filter_dark.png | Bin 0 -> 580 bytes .../drawable-hdpi/ic_action_filter_light.png | Bin 0 -> 678 bytes .../drawable-mdpi/ic_action_filter_dark.png | Bin 0 -> 404 bytes .../drawable-mdpi/ic_action_filter_light.png | Bin 0 -> 458 bytes .../drawable-xhdpi/ic_action_filter_dark.png | Bin 0 -> 521 bytes .../drawable-xhdpi/ic_action_filter_light.png | Bin 0 -> 552 bytes .../drawable-xxhdpi/ic_action_filter_dark.png | Bin 0 -> 915 bytes .../ic_action_filter_light.png | Bin 0 -> 993 bytes core/res/menu/activity_torrents.xml | 3 +- core/res/values/attrs.xml | 1 + core/res/values/changelog.xml | 3 + core/res/values/strings.xml | 2 +- core/res/values/styles.xml | 2 + 15 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 README.md~ create mode 100644 core/res/drawable-hdpi/ic_action_filter_dark.png create mode 100644 core/res/drawable-hdpi/ic_action_filter_light.png create mode 100644 core/res/drawable-mdpi/ic_action_filter_dark.png create mode 100644 core/res/drawable-mdpi/ic_action_filter_light.png create mode 100644 core/res/drawable-xhdpi/ic_action_filter_dark.png create mode 100644 core/res/drawable-xhdpi/ic_action_filter_light.png create mode 100644 core/res/drawable-xxhdpi/ic_action_filter_dark.png create mode 100644 core/res/drawable-xxhdpi/ic_action_filter_light.png diff --git a/README.md b/README.md index 8e6685f9..e52a4f8a 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ License You should have received a copy of the GNU General Public License along with Transdroid. If not, see . -Some code/libraries are used in the project: +Some code/libraries/resources are used in the project: * [ActionBarSherlock](http://actionbarsherlock.com/) Jake Wharton @@ -85,4 +85,7 @@ Some code/libraries are used in the project: * [CheckableRelativeLayout](http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/) Cédric Caron (MarvinLabs) Public Domain +* [Funnel icon](http://thenounproject.com/noun/funnel/#icon-No5608) + Naomi Atkinson from The Noun Project + Creative Commons Attribution 3.0 diff --git a/README.md~ b/README.md~ new file mode 100644 index 00000000..2fb71700 --- /dev/null +++ b/README.md~ @@ -0,0 +1,91 @@ +Transdroid +========== + +[www.transdroid.org](http://www.transdroid.org) +[Google+](https://plus.google.com/u/0/b/106240944422491053650/106240944422491053650) - [Twitter](https://twitter.com/transdroid) - [Old Google Code site](https://code.google.com/p/transdroid/) - [transdroid@2312.nl](transdroid@2312.nl) +"Manage your torrents from your Android device" + +![Screen shot of the main torretns listing screen](http://2312.nl/img/portfolio-transdroid/240x400-transdroid-main.png) + +Manage your torrents from your Android device with Transdroid. All popular clients are supported, including µTorrent, Transmission, rTorrent, Vuze, Deluge and BitTorrent 6. You can view and manage the running torrents and individual files. Adding is easy via the integrated search, RSS feeds or the barcode scanner. Monitor progress using the home screen widget or background alarm service. + +Transdroid was migrated from its Google Code Mercurial repo to GitHub with the 2.0-alpha3 tag and its .apk release. + +Contributions +============= + +Code and design contributions are very welcome. You might want to contact me via social networks (G+, Twitter) or e-mail first. Please note all code will be GNU GPL v3 licensed. + +Please respect the coding standards for easier merging. master contains the current release version of Transdroid while dev contains the active development version. However, larger, new features are developed in their own branch. + +Code structure +============== + +Transdroid is currently developed in Eclipse, against Android 4.3 (API level 18). To support lite and full version of the app, the core UI is contained in a separate Android library project. The torrent client adapters are also in a seperate project, called Transdroid Connect, but this is a classic Java project. If the Connect project is updated, a fresh .jar needs to be exported (currently manually) to core/libs/transdroid.jar. + +* core - Contains the core Android library project with UI, services, resources, etc. +* full - Full app version (website release) through AndroidManifest.xml configuration +* lite - Lite version (for Play Store, without search and RSS) through AndroidManifest.xml configuration +* external - Local copies of required external Android libraries +* lib - The Torrent Connect project containing torrent client communication code + +Developed By +============ + +Designed and developed by [Eric Kok](eric@2312.nl) of [2312 development](http://2312.nl). Contributions by various others (see commit log). + +License +======= + + Copyright 2010-2013 Eric Kok et al. + + Transdroid is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Transdroid is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Transdroid. If not, see . + +Some code/libraries/resources are used in the project: + +* [ActionBarSherlock](http://actionbarsherlock.com/) + Jake Wharton + Apache License, Version 2.0 +* [AndroidAnnotations](http://androidannotations.org/) + Pierre-Yves Ricau (eBusinessInformations) et al. + Apache License, Version 2.0 +* [Crouton](https://github.com/keyboardsurfer/Crouton) + Code: Benjamin Weiss (Neofonie Mobile Gmbh) et al. + Idea: Cyril Mottier + Apache License, Version 2.0 +* [Base16Encoder](http://openjpa.apache.org/) + Marc Prud'hommeaux + Apache OpenJPA +* MultipartEntity + Apache Software Foundation + Apache License, Version 2.0 +* RssParser ([learning-android](http://github.com/digitalspaghetti/learning-android)) + Tane Piper + Public Domain +* [Base64](http://iharder.net/base64) + Robert Harder + Public Domain +* [android-xmlrpc](http://code.google.com/p/android-xmlrpc/) + pskink et al. + Apache License, Version 2.0 +* [android-ColorPickerPreference](https://github.com/attenzione/android-ColorPickerPreference) + Daniel Nilsson and Sergey Margaritov + Apache License, Version 2.0 +* [CheckableRelativeLayout](http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/) + Cédric Caron (MarvinLabs) + Public Domain +* [Funnel icon](http://thenounproject.com/noun/funnel/#icon-No5608) + designed by Naomi Atkinson + from The Noun Project + diff --git a/core/res/drawable-hdpi/ic_action_filter_dark.png b/core/res/drawable-hdpi/ic_action_filter_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..afca489b01cb37d1eb5711df8e480e564835d91b GIT binary patch literal 580 zcmV-K0=xZ*P)lu~kVaPTJ( zNeSySHBam1*_qjyU0bvDYiHZv%c_{VvqP01cX`wgtHVe%Wya&5l6%=HG&sRu}zGKCj92G zp_D}&6K@&#kH6x^3XqvdTZ9t4QU+@3$wV{b1#Hl9CQd{gcK%%@j#369B3c+PVf`wL z8~B_uXCC-B)wx;%WH|{DC9F?1h@#&aezQ98S|t>PpqyH{E@QolaB*(uILrY58s}Jl zUpoVla3_+2+GOWz@r*MN5z)rDf^}<(xWc~({Ilk~AMS|- z$i{BxyoPlt!rb6D1^knue?vDb0;Grz&Q+{42I`jklfXYDg-_fA^#DAb#sypqSQYp! z8}MF$&wzzGvev}1k$n&7CdFqUx?}z^s#`z!`x5dcWKcHIDZYe!3FWYa%Dhe=B;@{{ zo@Nh-KMw2IJ_0`TCg2+26~OOof!Ee?odNNOZ4=v7{Z*(d(4~NTU={%vAMnl&7Xl`r zJ;XMEe{n`G7q%^6fOQ`MziDski-51tF1o1DMY0QIkwu|UvI!)R{4EJI;HIRsw9rLqyGjU2 z%p!|Gd|?SOn8YliJ3);liq(E2j10xDLlSWe z_)q_WZvhg(%s!v*wb^WbPKY%uq|s=cBoc`aDA?#$lp;XQAE*c_JaqzE119`_{~JY7 zo*CBW4uzV{=4m`0-@&Edly#^RXw?dZLX)LZX&I-pl;RvQXLh^&T_h5zQ*)UF=tQjG z+)G`A7?%Wmm<68ILTwJW+x^I9v#r2RGeo$qVX)25a=9GNWHMFOddw5h7BEVL2t4-$ z^dcM%#~L7}Sv%KSTv0BH#o}9@&TH#&Pe3c+a=9!{r*jn|rdUJ({xYA>Z|8EkUo3fl z#|jHj3kHKh3*I&$;t2%?@HdFtj7FnE@WK|-!+Ja(o7HMv$7hdwh`6m(DqHDvx=az< zE5?usXp7*!X&&c`Jr@0n`NyV#PmZAicmPCmqyW(liss7+h;~pkf9xml2aG=oKn&bODgXcg M07*qoM6N<$g1@OL!~g&Q literal 0 HcmV?d00001 diff --git a/core/res/drawable-mdpi/ic_action_filter_dark.png b/core/res/drawable-mdpi/ic_action_filter_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..603ca5493790e471b0c7338928a9132293571db2 GIT binary patch literal 404 zcmV;F0c-w=P)U9b#jc`v$|xEufy zF9YH*Dmh{m(3~!y1O5}`0FWYJD1aPM1;jxVI$|AAe;YQ-LFVGk1wcnI0oBw1u|JuP z*a+0u0<`=eF8u_vA`kI0wgS~R0xkcGPai=CK%;{NNVfv93z3f415{TH zwEPbt^+Y)U>IgPaTmrEp0YmqL(hkt_UxX|tmlXv@Y*On0YSaa9fQEotJEuwYHL`kg yE29daAya{tf2PE8vMVD>Eu}aFMjb%S5C8z~bA%z`S2e2u0000_`nq07G>DnKNfr0L}VOtOG#m7=a-X4W#WTbi^T`&zEAe9Bc^z z!x;?>4B~)3uqMY5zz{ro;lhPQxGX2e0U$L@z=WB=$jE3xiX;C2|9=9Q;1&S&{KKb@ zPzb>EG6SO{1;{Zb(h+BY!9EA5_Aepz#5#b%!NGy$^XJd0K%W`n^${cEd0t-L*#{0B z_(RBYVxs_V4#*LoK7Gmn3h3c5{1P7@-wa|cC)oiY4cgk;Y#baM6M!MXg6s%j8u|0% z$B%-mSFipe#^*3KL`MO#p}_Po1;}SZv*;Hv-g8K?oU9N4X&QCFXb6mkz-S0y3jttB z`0ec3vjqcE5CJWJ0@3 zIhu`)jia7Ff4zyo*(#Um&#{9AYj&)~w1;1RNsfFcTxZx(^9GF4qw{lmP# zkU+X?>V5UPr)$z;=ASfk{R;x117=QuOJL>(;3hb^1cqTahD%O5b;^B8>0wvy5&(M$ zaE9xsGYC(}_Ywg9OaR8oa6xYnMB+znlMdL>>j;8ayb3@kPEd(g185wAT6`9OMj>R0 z&j!#KglzF90F6K}i8lkN48bhk1wbVTF5=w)6o%j?-W5P02(IGY0R%&E7asy32ttVX zFaXXF!o-IHaDosjJ{*7%Lb&)M0Jb1J7hIPXRs#c@E$~NO*MMNsvcj_5y5%*bNFdOw%y7 z!zO%+$!v$&4y)SX70v;N3WH@2ZE+8Hg_?5!c*|C$nAj44Z{&T0>ki_76dFuJTLDnC z>f6L>1NcQUSEZ}o3V?Scasj))m^^HpT*Col)gN(PL;RO9fAjRx09Gwjz19*q#f@)K z^-puz90L?{fMd?Cp$NbgXNSS)fDVi1nlc^WinGIDbU=qib4~dl-Gc{Es0s3X00000 LNkvXXu0mjfQ1RQK literal 0 HcmV?d00001 diff --git a/core/res/drawable-xhdpi/ic_action_filter_light.png b/core/res/drawable-xhdpi/ic_action_filter_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d9575c20131c85bc0b209146dd061f4bad780e59 GIT binary patch literal 552 zcmV+@0@wYCP)S@{#KT>l0DPys6^fGx1{0>B|Sy9JUY*=@JmU5J&^_x-V|s^iq! zX919Nlx5k)FbroQL5QL#FN)%x);w?ljQ&AEP!<0xOe3p7K+qAd3&8tI&=qe2z*`6= z;!Oc~2fIDGTS^rOLQ2-=-%=F%M)_no+GVXOc>}pmGGo77Rz?gOV zh3K*Cx_w>OpUm~M-CYBC^&#tvYytY$`FY#6ho)&h*l80C;H&}!*DM+e07P*H7z`B< qVA4dFj0zCN8DKC}K!8aTUGfjHaY;}ciEoAg0000V2<*1aSW-5dppazTf|YMbvtwK zm7I_MGiFFj&7ASJsdK-hfuNy~VL_mok*VPY2NT1KKE=FZXM9~;SmYltOP=>&U#oOy z*6ro**1p;t@I`0NuF$`=p;x~c9G>>iiIZpH;_MH)oE&j1LJEurS(@6f^G#?-U^;j> zo87~~pz*=Ot;{M4GaNpAxW%}ZGh%I+^^DJXANFkKtIwBc`>i@z`yQh}0S9x8lXbMw z1*T2?1^w3*AGn{~E5;omKE0)0AfKf^HdUE%(uekj-iNzcJPze^>ix)L(rC#XKaqo(PRFXe(lZ*rekw2tYWdMc_nBPYsmYq zMeD}+}U!I?#6ssNL{kAo3s;s<9|m5Bme_Aw3{S_*z> zvaoo1FxvMv1Re^E$zM1(W$(BC()b5ejPd$4O8v=N{{OWOnRFYrm_N&{x#Mgdcxk;t zb;BFi1NGq-+NFF|6Yg;8aK3!7+^T8W>7EV3L5KXc6E+E7v;S=U%!b)+(SN^X$>~-0 zFZ&kkFFTa{r~Z!S1KkJn3$HCGoz5T?6`jbrp>WYsm4>!!VG&F@b22nJ7cAT=I*mbE zJ<5wIBO|v}^}w;tX_M%!G_I+E`H$7FJ-qIJL*6sZV|dBSQ4ue{Hup#zYt4bT_uZ;F ze%R+~Bn8=WRj^GlXZ%;nb7@mxwa|q#tLAIHa&-t^y-%GnzQFjm?wqgxt!G5tW7IDU zuC{m`KXvY|otJdEBG&)1&M0U6AFVg%>E=vd2l3VWj;1?=uij_Mm|tb_I=Yr){^29? z57zvTs@t{gqViYc1-vc$BE1^==kMOmvP19}mj`*wKTMPF^%Yz;U2X}?Yz&^RelF{r G5}E)OvxTGp literal 0 HcmV?d00001 diff --git a/core/res/drawable-xxhdpi/ic_action_filter_light.png b/core/res/drawable-xxhdpi/ic_action_filter_light.png new file mode 100644 index 0000000000000000000000000000000000000000..085b2c863830d89a1e68262da8791ee163a85eb5 GIT binary patch literal 993 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U|!+r;uum9_jZnLcd(;KoB7FQ z1>Fl=6@aNA`~1X@{E3%9@U{T~tc2yRalEVuFB@;}nk7 zE|V+tmh4d2^!(YK;`3*o#B#hjG_(Af-T5;o?@dtI-Yy@^WO@0f;ZHdhiF_uG28Lv& zW0xPZI5ZeCK7Luqq;OzH!^bZci~ zOUB<@qu!?3&EG#QWzmJ~@YPpuA58c#W!-20N!fSZ9H#Jd8lJj+s9$NDC9Dp+tveK2Kx zvo&h%-=8&g-D;U?JB>>=Y>U>KI&aJEw=U&7?!2CGr(>@5@rMr|wifNIv7UZ9)^_`i zgH2zn{wA8uww3EYZohTfaxI0ZE$f9gHLSnY^vL>{IcMa-^F9s!>Wbb!W^#RSbh`Gz zSp2~z7VaNvOfgduSnvBZcnj$~oXu6>*koE$%s5Rbrr~`H12^Zo1LbZGTP9>}tqNEf z^6t|5@GW`2&3DQ#zx?v>$&{jHHvHOgf0uGx(=v1YQZ~K2)#)MM+Y6^Xj}>OWG+lZ5 zY0=M)dv>4ZTD$E&r^$HnXqIPz;J#p8jeVCdO?#kKlg@g??~vfu#mt`43O~}Xl=a1A zS$}+8xQ_Lx`1K4ExeNEFt1xA}*&esP+<(SGGa05U7d|y9HXQd{%QYC8&Ef*JW)1t! zezW6u{}#HCyCPgitlxU>Ih*P&dnB7h9CrU>uRVRWyKevgHiI=48ab<+L_XAQjIfdB zYmd*Fpf=l7g3<2nuN{j5SSq%@ZWaWp7ytU}x!spv|4r5A`yWsjD)9NAROffC^zN!} zehyn+zx+7KZr`u22mi~s(?4DPp{CFg`~GgRL&olV=8W;qFTTdvabAD@Rk|ejYn6$V z?xgZ?dpC=}G7s3DZfYqy9P_u4VmiW+$|#`lSY3{nF{xz}1IL7q!u@RwhE9 + diff --git a/core/res/values/changelog.xml b/core/res/values/changelog.xml index 392ffe79..5adbbe17 100644 --- a/core/res/values/changelog.xml +++ b/core/res/values/changelog.xml @@ -17,6 +17,9 @@ --> +Transdroid 2.0.0\n +- UI improvements for Lite version\n +\n Transdroid 2.0.0-alpha4\n - Fixed parallel command execution issues (primarily Transmission)\n \n diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml index e3c335c3..4991ea10 100644 --- a/core/res/values/strings.xml +++ b/core/res/values/strings.xml @@ -363,7 +363,7 @@ \u00A9 Eric Kok, 2312 development Published under GNU General Public License v3 Some code/libraries are used in the project: - ActionBarSherlock\n \u00A0 http://actionbarsherlock.com/\n \u00A0 Jake Wharton \n \u00A0 Apache License, Version 2.0\nAndroidAnnotations\n \u00A0 http://androidannotations.org/\n \u00A0 Pierre-Yves Ricau (eBusinessInformations) et al. \n \u00A0 Apache License, Version 2.0\nCrouton\n \u00A0 https://github.com/keyboardsurfer/Crouton\n \u00A0 Code: Benjamin Weiss (Neofonie Mobile Gmbh) et al. \n \u00A0 Idea: Cyril Mottier \n \u00A0 Apache License, Version 2.0\nBase16Encoder\n \u00A0 http://openjpa.apache.org/\n \u00A0 Marc Prud\'hommeaux \n \u00A0 Apache OpenJPA\n MultipartEntity \n \u00A0 Apache Software Foundation \n \u00A0 Apache License, Version 2.0\nRssParser (learning-android)\n \u00A0 http://github.com/digitalspaghetti/learning-android\n \u00A0 Tane Piper \n \u00A0 Public Domain\nBase64\n \u00A0 http://iharder.net/base64\n \u00A0 Robert Harder \n \u00A0 Public Domain\nandroid-xmlrpc\n \u00A0 http://code.google.com/p/android-xmlrpc/\n \u00A0 pskink et al. \n \u00A0 Apache License, Version 2.0\nandroid-ColorPickerPreference\n \u00A0 https://github.com/attenzione/android-ColorPickerPreference\n \u00A0 Daniel Nilsson and Sergey Margaritov \n \u00A0 Apache License, Version 2.0\nCheckableRelativeLayout\n \u00A0 http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/\n \u00A0 Cédric Caron (MarvinLabs)\n \u00A0 Public Domain + ActionBarSherlock\n \u00A0 http://actionbarsherlock.com/\n \u00A0 Jake Wharton \n \u00A0 Apache License, Version 2.0\nAndroidAnnotations\n \u00A0 http://androidannotations.org/\n \u00A0 Pierre-Yves Ricau (eBusinessInformations) et al. \n \u00A0 Apache License, Version 2.0\nCrouton\n \u00A0 https://github.com/keyboardsurfer/Crouton\n \u00A0 Code: Benjamin Weiss (Neofonie Mobile Gmbh) et al. \n \u00A0 Idea: Cyril Mottier \n \u00A0 Apache License, Version 2.0\nBase16Encoder\n \u00A0 http://openjpa.apache.org/\n \u00A0 Marc Prud\'hommeaux \n \u00A0 Apache OpenJPA\n MultipartEntity \n \u00A0 Apache Software Foundation \n \u00A0 Apache License, Version 2.0\nRssParser (learning-android)\n \u00A0 http://github.com/digitalspaghetti/learning-android\n \u00A0 Tane Piper \n \u00A0 Public Domain\nBase64\n \u00A0 http://iharder.net/base64\n \u00A0 Robert Harder \n \u00A0 Public Domain\nandroid-xmlrpc\n \u00A0 http://code.google.com/p/android-xmlrpc/\n \u00A0 pskink et al. \n \u00A0 Apache License, Version 2.0\nandroid-ColorPickerPreference\n \u00A0 https://github.com/attenzione/android-ColorPickerPreference\n \u00A0 Daniel Nilsson and Sergey Margaritov \n \u00A0 Apache License, Version 2.0\nCheckableRelativeLayout\n \u00A0 http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/\n \u00A0 Cédric Caron (MarvinLabs)\n \u00A0 Public Domain\nFunnel icon\n \u00A0 http://thenounproject.com/noun/funnel/#icon-No5608\n \u00A0 Naomi Atkinson from The Noun Project\n \u00A0 Creative Commons Attribution 3.0 Manage your torrents from your Android device diff --git a/core/res/values/styles.xml b/core/res/values/styles.xml index 4fe309bc..c8436e9d 100644 --- a/core/res/values/styles.xml +++ b/core/res/values/styles.xml @@ -22,6 +22,7 @@ @color/background_light @drawable/ic_action_discard_light + @drawable/ic_action_filter_light @drawable/ic_action_labels_light @drawable/ic_action_new_light @drawable/ic_action_pause_light @@ -51,6 +52,7 @@ @color/background_dark @drawable/ic_action_discard_dark + @drawable/ic_action_filter_dark @drawable/ic_action_labels_dark @drawable/ic_action_new_dark @drawable/ic_action_pause_dark