implement show all/show unread

tweak menu
theme tweaks
bump version

3 files changed, 5 insertions, 13 deletions

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index fb0bd1d7..3d73fe82 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -2,38 +2,32 @@
     <menu xmlns:android="http://schemas.android.com/apk/res/android">
     
     <item android:id="@+id/login"
-    	  android:visible="false"
           android:icon="@android:drawable/ic_menu_rotate"
           android:title="@string/login" 
           android:showAsAction="ifRoom|withText"/>
 
   
     <item android:id="@+id/show_feeds"
-    	  android:enabled="false"    	  
-          android:icon="@android:drawable/ic_menu_rotate"
+          android:icon="@android:drawable/ic_menu_agenda"
           android:title="@string/menu_all_feeds" 
           android:showAsAction=""/>
           
      <item android:id="@+id/close_article"
-     	  android:visible="false"
           android:icon="@android:drawable/ic_menu_close_clear_cancel"
           android:title="@string/close_article" 
           android:showAsAction="ifRoom|withText"/>
 
-          <item android:id="@+id/load_more_articles"
-     	  android:visible="false"
+     <item android:id="@+id/load_more_articles"
           android:icon="@android:drawable/ic_menu_more"
           android:title="@string/load_more_articles" 
           android:showAsAction="ifRoom|withText"/>
      
      <item android:id="@+id/show_all_articles"
-     	  android:visible="false"
           android:icon="@android:drawable/ic_menu_agenda"
           android:title="@string/show_all_articles" 
           android:showAsAction="ifRoom|withText"/>
      
      <item android:id="@+id/update_feeds"
-     	  android:enabled="false"
           android:icon="@android:drawable/ic_menu_rotate"
           android:title="@string/update_feeds" 
           android:showAsAction=""/>
@@ -45,13 +39,11 @@
           
 
      <item android:id="@+id/share_article"
-     	  android:visible="false"
           android:icon="@android:drawable/ic_menu_share"
           android:title="@string/share_article" 
           android:showAsAction="ifRoom"/>
                     
      <item android:id="@+id/logout"
-    	  android:visible="false"
           android:title="@string/logout" 
           android:showAsAction=""/>
     
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7933d3f3..c190ac3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,7 +33,7 @@
     <string name="share_article">Share article</string>
     <string name="could_not_decode_content">Could not decode content (UnsupportedEncodingException)</string>
     <string name="sort_feeds_by_unread">Sort feeds by unread count</string>
-    <string name="load_more_articles">More headlines...</string>
+    <string name="load_more_articles">Load more...</string>
     <string name="show_all_articles">Show all articles</string>
     <string name="show_unread_articles">Show unread articles</string>
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index 8615771b..56a0ee20 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -15,7 +15,7 @@
 		<item name="headlineSeparatorSelected">#DBC981</item>

 	</style>

 

-	<style name="LightCompatTheme" parent="android:Theme.Light">

+	<style name="LightCompatTheme" parent="android:Theme.Light.NoTitleBar">

 		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>

 		<item name="feedlistBackground">#fafafa</item>

 		<item name="unreadCounterColor">#0000ff</item>

@@ -47,7 +47,7 @@
 		<item name="headlineSeparatorSelected">#47478E</item>

 	</style>

 	

-	<style name="DarkCompatTheme" parent="android:Theme">

+	<style name="DarkCompatTheme" parent="android:Theme.Black.NoTitleBar">

 		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>

 		<item name="feedlistBackground">#101010</item>

 		<item name="unreadCounterColor">#303030</item>