From 30ad3a8eda4e6be6c479aace9851ebbd7aec2134 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 9 Sep 2013 12:22:26 +0400
Subject: make read dark theme cards a bit brighter

---
 res/values/style.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/style.xml b/res/values/style.xml
index fec0dcac..4a8e93ba 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -53,7 +53,7 @@
 		<item name="articleBackground">@android:color/black</item>
 		<item name="headlineSelectedBackground">@color/ics_cyan</item>
 		<item name="headlineUnreadBackground">#202020</item>
-		<item name="headlineNormalBackground">#101010</item>
+		<item name="headlineNormalBackground">#151515</item>
 		<item name="feedsSelectedBackground">@color/ics_cyan</item>
         <item name="feedlistTextColor">@android:color/primary_text_dark</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
-- 
cgit v1.2.3-54-g00ecf


From 736c2233cf210caebee0df47936124b941ba207c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 9 Sep 2013 12:42:27 +0400
Subject: move selection checkbox to the bottom left of headline row

---
 res/layout/headlines_row.xml                 | 26 ++++++++++++-------------
 res/layout/headlines_row_selected.xml        | 29 ++++++++++++++--------------
 res/layout/headlines_row_selected_unread.xml | 26 ++++++++++++-------------
 res/layout/headlines_row_unread.xml          | 26 ++++++++++++-------------
 res/values/resources.xml                     |  2 +-
 5 files changed, 54 insertions(+), 55 deletions(-)

(limited to 'res/values')

diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml
index 937f02fc..ac371724 100644
--- a/res/layout/headlines_row.xml
+++ b/res/layout/headlines_row.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="6dp" >
+            android:orientation="horizontal" >
 
             <TextView
                 android:id="@+id/title"
@@ -43,14 +42,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
-            <CheckBox
-                android:id="@+id/selected"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:focusable="false" />
+            android:orientation="horizontal"
+            android:paddingTop="3dp" >
 
             <TextView
                 android:id="@+id/feed_title"
@@ -79,7 +72,7 @@
             android:id="@+id/excerpt"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="6dp"
+            android:paddingTop="3dp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp" />
@@ -87,8 +80,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="6dp" >
+            android:gravity="center_vertical" >
+
+            <CheckBox
+                android:id="@+id/selected"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="-6dp"
+                android:layout_weight="0"
+                android:focusable="false" />
 
             <TextView
                 android:id="@+id/author"
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml
index dedb8ad6..e370d32f 100644
--- a/res/layout/headlines_row_selected.xml
+++ b/res/layout/headlines_row_selected.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="6dp" >
+            android:orientation="horizontal" >
 
             <TextView
                 android:id="@+id/title"
@@ -34,8 +33,7 @@
                 android:singleLine="false"
                 android:text="Sample entry title"
                 android:textColor="?attr/headlineSelectedTextColor"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:textSize="16sp" />
         </LinearLayout>
 
         <LinearLayout
@@ -44,14 +42,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
-            <CheckBox
-                android:id="@+id/selected"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:focusable="false" />
+            android:orientation="horizontal"
+            android:paddingTop="3dp" >
 
             <TextView
                 android:id="@+id/feed_title"
@@ -80,7 +72,7 @@
             android:id="@+id/excerpt"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="6dp"
+            android:paddingTop="3dp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp" />
@@ -88,8 +80,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="6dp" >
+            android:gravity="center_vertical" >
+
+            <CheckBox
+                android:id="@+id/selected"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="-6dp"
+                android:layout_weight="0"
+                android:focusable="false" />
 
             <TextView
                 android:id="@+id/author"
diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml
index befa408f..2305a4f3 100644
--- a/res/layout/headlines_row_selected_unread.xml
+++ b/res/layout/headlines_row_selected_unread.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="6dp" >
+            android:orientation="horizontal" >
 
             <TextView
                 android:id="@+id/title"
@@ -44,14 +43,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
-            <CheckBox
-                android:id="@+id/selected"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:focusable="false" />
+            android:orientation="horizontal"
+            android:paddingTop="3dp" >
 
             <TextView
                 android:id="@+id/feed_title"
@@ -80,7 +73,7 @@
             android:id="@+id/excerpt"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="6dp"
+            android:paddingTop="3dp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineSelectedExcerptTextColor"
             android:textSize="13sp" />
@@ -88,8 +81,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="6dp" >
+            android:gravity="center_vertical" >
+
+            <CheckBox
+                android:id="@+id/selected"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="-6dp"
+                android:layout_weight="0"
+                android:focusable="false" />
 
             <TextView
                 android:id="@+id/author"
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index 50eb582e..22f9c452 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -21,8 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingLeft="6dp" >
+            android:orientation="horizontal" >
 
             <TextView
                 android:id="@+id/title"
@@ -44,14 +43,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
-            <CheckBox
-                android:id="@+id/selected"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:focusable="false" />
+            android:orientation="horizontal"
+            android:paddingTop="3dp" >
 
             <TextView
                 android:id="@+id/feed_title"
@@ -80,7 +73,7 @@
             android:id="@+id/excerpt"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="6dp"
+            android:paddingTop="3dp"
             android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
             android:textColor="?headlineExcerptTextColor"
             android:textSize="13sp" />
@@ -88,8 +81,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="6dp" >
+            android:gravity="center_vertical" >
+
+            <CheckBox
+                android:id="@+id/selected"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="-6dp"
+                android:layout_weight="0"
+                android:focusable="false" />
 
             <TextView
                 android:id="@+id/author"
diff --git a/res/values/resources.xml b/res/values/resources.xml
index f32ec5b7..7e1b097e 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -10,5 +10,5 @@
 	<color name="unread_counter_background_dark">#303030</color>
 	<color name="unread_counter_background_sepia">#C46262</color>
 	<color name="unread_counter_background_selected_light">#4684ff</color>
-	<color name="feeds_dark_gray">#1c1d1e</color>
+	<color name="feeds_dark_gray">#1c1d1e</color>	
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 9da4f1e5f7dcac93176795b65b24cde9a0a901ea Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 9 Sep 2013 13:52:16 +0400
Subject: confirm if necessary catching up feed from context menu

---
 res/values/strings.xml                        |  1 +
 src/org/fox/ttrss/FeedCategoriesFragment.java | 34 +++++++++++++++++++++++++--
 src/org/fox/ttrss/FeedsFragment.java          | 33 ++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 4 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a05188d8..e4ef4831 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,4 +200,5 @@
     <string name="author_formatted">by %1$s</string>
     <string name="n_unread_articles">%1$d unread articles</string>
     <string name="pref_headline_font_size">Headline text size</string>
+    <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
 </resources>
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 559a72d4..f2c6d522 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -13,7 +13,10 @@ import org.fox.ttrss.types.FeedCategoryList;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
@@ -125,9 +128,36 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 			return true;
 		case R.id.catchup_category:
 			if (true) {
-				FeedCategory cat = getCategoryAtPosition(info.position);
+				final FeedCategory cat = getCategoryAtPosition(info.position);
 				if (cat != null) {
-					m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
+										
+					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
+						AlertDialog.Builder builder = new AlertDialog.Builder(
+								m_activity)
+								.setMessage(getString(R.string.context_confirm_catchup, cat.title))
+								.setPositiveButton(R.string.catchup,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+	
+												m_activity.catchupFeed(new Feed(cat.id, cat.title, true));											
+												
+											}
+										})
+								.setNegativeButton(R.string.dialog_cancel,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+		
+											}
+										});
+		
+						AlertDialog dlg = builder.create();
+						dlg.show();						
+					} else {
+						m_activity.catchupFeed(new Feed(cat.id, cat.title, true));
+					}
+
 				}
 			}
 			return true;
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index fc5996f0..cc851cd4 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -19,7 +19,10 @@ import org.fox.ttrss.types.FeedList;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.graphics.Bitmap;
@@ -156,9 +159,35 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 			return true;
 		case R.id.catchup_feed:
 			if (true) {
-				Feed feed = getFeedAtPosition(info.position);
+				final Feed feed = getFeedAtPosition(info.position);
+				
 				if (feed != null) {
-					m_activity.catchupFeed(feed);
+					if (m_prefs.getBoolean("confirm_headlines_catchup", true)) {
+						AlertDialog.Builder builder = new AlertDialog.Builder(
+								m_activity)
+								.setMessage(getString(R.string.context_confirm_catchup, feed.title))
+								.setPositiveButton(R.string.catchup,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+	
+												m_activity.catchupFeed(feed);											
+												
+											}
+										})
+								.setNegativeButton(R.string.dialog_cancel,
+										new Dialog.OnClickListener() {
+											public void onClick(DialogInterface dialog,
+													int which) {
+		
+											}
+										});
+		
+						AlertDialog dlg = builder.create();
+						dlg.show();						
+					} else {
+						m_activity.catchupFeed(feed);
+					}
 				}
 			}
 			return true;
-- 
cgit v1.2.3-54-g00ecf