Allow filter action to show in main action bar (and add an icon for the action).

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 <http://www.gnu.org/licenses/>.
     
-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
 

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 <http://www.gnu.org/licenses/>.
+    
+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
+

core/res/menu/activity_torrents.xml

@@ -75,7 +75,8 @@
 	</item>
 	<item
 		android:id="@+id/action_filter"
-		android:showAsAction="never"
+		android:icon="?attr/ic_action_filter"
+		android:showAsAction="ifRoom"
 		android:title="@string/action_filter"
 		android:orderInCategory="905"/>
 	<item

core/res/values/attrs.xml

@@ -23,6 +23,7 @@
 	
 	<!-- Themeable drawables, such as action bar icons -->
 	<attr name="ic_action_discard" format="reference"/>
+	<attr name="ic_action_filter" format="reference"/>
 	<attr name="ic_action_labels" format="reference"/>
 	<attr name="ic_action_new" format="reference"/>
 	<attr name="ic_action_pause" format="reference"/>

core/res/values/changelog.xml

@@ -17,6 +17,9 @@
 -->
 <resources>
 <string name="system_changelog">
+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

core/res/values/strings.xml

@@ -363,7 +363,7 @@
 	<string name="system_developer" translatable="false">\u00A9 Eric Kok, 2312 development</string>
 	<string name="system_license" translatable="false">Published under GNU General Public License v3</string>
 	<string name="system_librarieslabel">Some code/libraries are used in the project:</string>
-	<string name="system_libraries" translatable="false">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</string>
+	<string name="system_libraries" translatable="false">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</string>
 	<string name="system_description">Manage your torrents from your Android device</string>
 
 </resources>

core/res/values/styles.xml

@@ -22,6 +22,7 @@
 		<item name="android:windowBackground">@color/background_light</item>
 		
 		<item name="ic_action_discard">@drawable/ic_action_discard_light</item>
+		<item name="ic_action_filter">@drawable/ic_action_filter_light</item>
 		<item name="ic_action_labels">@drawable/ic_action_labels_light</item>
 		<item name="ic_action_new">@drawable/ic_action_new_light</item>
 		<item name="ic_action_pause">@drawable/ic_action_pause_light</item>
@@ -51,6 +52,7 @@
 		<item name="android:windowBackground">@color/background_dark</item>
 		
 		<item name="ic_action_discard">@drawable/ic_action_discard_dark</item>
+		<item name="ic_action_filter">@drawable/ic_action_filter_dark</item>
 		<item name="ic_action_labels">@drawable/ic_action_labels_dark</item>
 		<item name="ic_action_new">@drawable/ic_action_new_dark</item>
 		<item name="ic_action_pause">@drawable/ic_action_pause_dark</item>