From dbe686598068a714fa2e8c5de3f337a8ee729204 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 13 Feb 2015 01:08:38 +0300
Subject: widget: default to showing fresh articles instead of global unread

---
 org.fox.ttrss/src/main/AndroidManifest.xml                         | 4 ++--
 .../src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java    | 7 +++++--
 org.fox.ttrss/src/main/res/layout/widget_small.xml                 | 2 +-
 org.fox.ttrss/src/main/res/values/strings.xml                      | 2 ++
 org.fox.ttrss/src/main/res/xml/preferences.xml                     | 7 +++++++
 5 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 53651d68..bc2cee9f 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="307"
-    android:versionName="1.87" >
+    android:versionCode="308"
+    android:versionName="1.88" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
index 40f7d100..9c49ea2d 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
@@ -62,7 +62,9 @@ public class WidgetUpdateService extends Service {
 	    			// Toast: need configure
 	    			
 	   		} else {
-	
+
+                final int feedId = m_prefs.getBoolean("widget_show_fresh", true) ? -6 : 0;
+
 	   			SimpleLoginManager loginManager = new SimpleLoginManager() {
 					
 					@Override
@@ -98,6 +100,7 @@ public class WidgetUpdateService extends Service {
 						HashMap<String, String> umap = new HashMap<String, String>() {
 				   				{
 				   					put("op", "getUnread");
+                                    put("feed_id", String.valueOf(feedId));
 				   					put("sid", fSessionId);
 				   				}
 				   			};
@@ -127,7 +130,7 @@ public class WidgetUpdateService extends Service {
     	} catch (Exception e) {
     		e.printStackTrace();
     		
-	    	view.setTextViewText(R.id.counter, getString(R.string.app_name));
+	    	view.setTextViewText(R.id.counter, "?");
 	        manager.updateAppWidget(thisWidget, view);  					
 	
     	}
diff --git a/org.fox.ttrss/src/main/res/layout/widget_small.xml b/org.fox.ttrss/src/main/res/layout/widget_small.xml
index 1242cef5..21620e87 100644
--- a/org.fox.ttrss/src/main/res/layout/widget_small.xml
+++ b/org.fox.ttrss/src/main/res/layout/widget_small.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center"
             android:gravity="center_horizontal"
-            android:text="123"
+            android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@android:color/primary_text_dark"
             android:textSize="13sp" />
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 86479ca2..177b331f 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -217,4 +217,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Build timestamp</string>
     <string name="crash_dialog_text">Unfortunately, Tiny Tiny RSS has stopped. Submit crash report to tt-rss.org?</string>
+    <string name="prefs_widget_show_fresh">Show Fresh articles</string>
+    <string name="prefs_widget_show_fresh_summary">Instead of total unread display amount of Fresh articles</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index e4dfe5ab..3bc7225a 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -171,6 +171,13 @@
             android:summary="@string/offline_image_cache_enabled_summary"
             android:title="@string/offline_image_cache_enabled" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="Widget" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="widget_show_fresh"
+            android:title="@string/prefs_widget_show_fresh"
+            android:summary="@string/prefs_widget_show_fresh_summary" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/debugging" >
         <CheckBoxPreference
             android:defaultValue="true"
-- 
cgit v1.2.3