From 3785564cab9225dd52906ba3f36262256a7747e5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 12:21:11 +0400 Subject: [PATCH 1/8] fix card offsets wonky select highlighting --- res/layout/headlines_fragment.xml | 1 + res/layout/headlines_row.xml | 5 +++-- res/layout/headlines_row_selected.xml | 3 ++- res/layout/headlines_row_selected_unread.xml | 3 ++- res/layout/headlines_row_unread.xml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index d3effae6..5df36557 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -10,6 +10,7 @@ android:layoutAnimation="@anim/layout_headline" android:dividerHeight="0dp" android:divider="@null" + android:paddingTop="3dp" android:layout_height="match_parent" > diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index c4ea2c76..937f02fc 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -3,9 +3,10 @@ android:id="@+id/headlines_row" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingTop="6dp" + android:paddingBottom="3dp" android:paddingLeft="6dp" - android:paddingRight="6dp" > + android:paddingRight="6dp" + android:paddingTop="3dp" > + android:paddingTop="3dp" > + android:paddingTop="3dp" > + android:paddingTop="3dp" > Date: Mon, 9 Sep 2013 12:22:26 +0400 Subject: [PATCH 2/8] make read dark theme cards a bit brighter --- res/values-v11/style.xml | 2 +- res/values/style.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index b1c0e4ef..5e1c4cfb 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -53,7 +53,7 @@ @android:color/black @color/ics_cyan #202020 - #101010 + #151515 @color/ics_cyan @android:color/primary_text_dark @android:color/black 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 @@ @android:color/black @color/ics_cyan #202020 - #101010 + #151515 @color/ics_cyan @android:color/primary_text_dark @android:color/black From 736c2233cf210caebee0df47936124b941ba207c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 12:42:27 +0400 Subject: [PATCH 3/8] 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(-) 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" > - - + android:orientation="horizontal" + android:paddingTop="3dp" > @@ -87,8 +80,15 @@ + android:gravity="center_vertical" > + + + android:orientation="horizontal" > + android:textSize="16sp" /> - - + android:orientation="horizontal" + android:paddingTop="3dp" > @@ -88,8 +80,15 @@ + android:gravity="center_vertical" > + + + android:orientation="horizontal" > - - + android:orientation="horizontal" + android:paddingTop="3dp" > @@ -88,8 +81,15 @@ + android:gravity="center_vertical" > + + + android:orientation="horizontal" > - - + android:orientation="horizontal" + android:paddingTop="3dp" > @@ -88,8 +81,15 @@ + android:gravity="center_vertical" > + + #303030 #C46262 #4684ff - #1c1d1e + #1c1d1e \ No newline at end of file From 92d63150a060d8bbdc2739a9ebc9ca551fb271ba Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 13:34:53 +0400 Subject: [PATCH 4/8] sepia theme fixes; update overflow icons to use modern holo style; enable overflow icons for feed items --- res/drawable-hdpi/ic_action_overflow.png | Bin 0 -> 2935 bytes .../ic_mailbox_collapsed_holo_dark.png | Bin 274 -> 0 bytes .../ic_mailbox_collapsed_holo_light.png | Bin 350 -> 0 bytes res/drawable/headline_row.xml | 19 ++++++++++++++++++ res/drawable/headline_row_selected.xml | 19 ++++++++++++++++++ res/drawable/headline_row_selected_sepia.xml | 19 ++++++++++++++++++ res/drawable/headline_row_sepia.xml | 19 ++++++++++++++++++ res/drawable/headline_row_unread.xml | 19 ++++++++++++++++++ res/drawable/headline_row_unread_sepia.xml | 19 ++++++++++++++++++ res/layout/feeds_row.xml | 5 +---- res/layout/feeds_row_selected.xml | 5 +---- res/layout/headlines_row.xml | 17 +++++++++------- res/layout/headlines_row_selected.xml | 10 ++++----- res/layout/headlines_row_selected_unread.xml | 10 ++++----- res/layout/headlines_row_unread.xml | 10 ++++----- res/values-v11/style.xml | 11 +++++----- src/org/fox/ttrss/FeedCategoriesFragment.java | 3 --- src/org/fox/ttrss/FeedsFragment.java | 3 --- src/org/fox/ttrss/HeadlinesFragment.java | 10 ++++----- .../OfflineFeedCategoriesFragment.java | 3 --- .../ttrss/offline/OfflineFeedsFragment.java | 3 --- .../offline/OfflineHeadlinesFragment.java | 6 +++--- 22 files changed, 152 insertions(+), 58 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_overflow.png delete mode 100644 res/drawable-hdpi/ic_mailbox_collapsed_holo_dark.png delete mode 100644 res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png create mode 100644 res/drawable/headline_row.xml create mode 100644 res/drawable/headline_row_selected.xml create mode 100644 res/drawable/headline_row_selected_sepia.xml create mode 100644 res/drawable/headline_row_sepia.xml create mode 100644 res/drawable/headline_row_unread.xml create mode 100644 res/drawable/headline_row_unread_sepia.xml diff --git a/res/drawable-hdpi/ic_action_overflow.png b/res/drawable-hdpi/ic_action_overflow.png new file mode 100644 index 0000000000000000000000000000000000000000..0612f431e0cd4200098c64763babe8fe9e732fd9 GIT binary patch literal 2935 zcmV--3yAcIP)004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U( 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 M)78&qol`;+0J@x9N&o-= diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png deleted file mode 100644 index 2c395b800c887cbb2d7399f95ee2530754bcc40a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mn3BBRT^Rni_n+Ah2>S z4={E+nQaFWEGuwK2hw1@49XUHUO-Nor;B5V#`)H>hJ1${1eg!p6t#aOeckoR|NRb& z9%u+DI^0>OEv{^>Q`CCEWRpTm=8a7XFEel0E>blA{&=gRQq`x;U*^{=6#eOt{Yg*M zGTXOfo`9`l^&!`eSu)A1TSs4+9F=JSWhQv!Nl!A8&ykOBT7;dOH!?pi&B9U zgOP!up{{|Yu7P2Qp`n$bxs`#5t^trVI9On^4@E<6eoAIqCAtPvD`PW=hP5ZWz5+E! vf@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJeg_(RK(!v>gTe~DWM4f(w1$T diff --git a/res/drawable/headline_row.xml b/res/drawable/headline_row.xml new file mode 100644 index 00000000..45235231 --- /dev/null +++ b/res/drawable/headline_row.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_selected.xml b/res/drawable/headline_row_selected.xml new file mode 100644 index 00000000..1f30f42f --- /dev/null +++ b/res/drawable/headline_row_selected.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_selected_sepia.xml b/res/drawable/headline_row_selected_sepia.xml new file mode 100644 index 00000000..0ed5da7a --- /dev/null +++ b/res/drawable/headline_row_selected_sepia.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_sepia.xml b/res/drawable/headline_row_sepia.xml new file mode 100644 index 00000000..5e2aad22 --- /dev/null +++ b/res/drawable/headline_row_sepia.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_unread.xml b/res/drawable/headline_row_unread.xml new file mode 100644 index 00000000..14840998 --- /dev/null +++ b/res/drawable/headline_row_unread.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/headline_row_unread_sepia.xml b/res/drawable/headline_row_unread_sepia.xml new file mode 100644 index 00000000..f062fb7e --- /dev/null +++ b/res/drawable/headline_row_unread_sepia.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index e52de2c2..35cef732 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -58,9 +58,6 @@ android:layout_height="wrap_content" android:layout_weight="0" android:background="@null" - android:paddingLeft="6dp" - android:paddingTop="6dp" - android:visibility="gone" - android:src="@drawable/ic_mailbox_collapsed_holo_light" /> + android:src="@drawable/ic_action_overflow" /> \ No newline at end of file diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml index 7876d150..0d145b23 100644 --- a/res/layout/feeds_row_selected.xml +++ b/res/layout/feeds_row_selected.xml @@ -58,9 +58,6 @@ android:layout_height="wrap_content" android:layout_weight="0" android:background="@null" - android:paddingLeft="6dp" - android:paddingTop="6dp" - android:visibility="gone" - android:src="@drawable/ic_mailbox_collapsed_holo_light" /> + android:src="@drawable/ic_action_overflow" /> \ No newline at end of file diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index ac371724..92b0d3cc 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -1,12 +1,14 @@ + android:paddingTop="3dp" + tools:ignore="HardcodedText" > + android:paddingBottom="2dp" + android:paddingLeft="6dp" + android:paddingRight="6dp" + android:paddingTop="6dp" > - + android:src="@drawable/ic_action_overflow" /> diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index e370d32f..c88c0a83 100644 --- a/res/layout/headlines_row_selected.xml +++ b/res/layout/headlines_row_selected.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:background="?headlineSelectedBackground" android:orientation="vertical" - android:padding="6dp" > + android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > - + android:src="@drawable/ic_action_overflow" /> diff --git a/res/layout/headlines_row_selected_unread.xml b/res/layout/headlines_row_selected_unread.xml index 2305a4f3..764571d4 100644 --- a/res/layout/headlines_row_selected_unread.xml +++ b/res/layout/headlines_row_selected_unread.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:background="?headlineSelectedBackground" android:orientation="vertical" - android:padding="6dp" > + android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > - + android:src="@drawable/ic_action_overflow" /> diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 22f9c452..141b1736 100644 --- a/res/layout/headlines_row_unread.xml +++ b/res/layout/headlines_row_unread.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:background="?headlineUnreadBackground" android:orientation="vertical" - android:padding="6dp" > + android:paddingTop="6dp" android:paddingLeft="6dp" android:paddingRight="6dp" android:paddingBottom="2dp" > > - + android:src="@drawable/ic_action_overflow" /> diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 5e1c4cfb..d2adf334 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -7,9 +7,9 @@ @drawable/shadow_headlines #f0f0f0 @android:color/transparent - #88b0f0 - #ffffff - #f0f0f0 + @drawable/headline_row_selected + @drawable/headline_row_unread + @drawable/headline_row #88b0f0 @android:color/primary_text_light #ffffff @@ -32,8 +32,9 @@ @drawable/shadow_feeds_sepia @drawable/shadow_headlines_sepia @drawable/paper_sepia - #f2eae8 - #E5B0A0 + @drawable/headline_row_unread_sepia + @drawable/headline_row_sepia + @drawable/headline_row_selected_sepia #E5B0A0 @drawable/paper_sepia @drawable/counter_background_sepia diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index 34b21922..559a72d4 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -415,9 +415,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); - ib.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 9eae321b..fc5996f0 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -542,9 +542,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); - ib.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 16a0f64d..53bedc59 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -795,13 +795,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, }); } - ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); + ImageView iv = (ImageView) v.findViewById(R.id.article_menu_button); - if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); + if (iv != null) { + //if (m_activity.isDarkTheme()) + // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); - ib.setOnClickListener(new OnClickListener() { + iv.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { getActivity().openContextMenu(v); diff --git a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index ad229919..682cf3e6 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -288,9 +288,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); - ib.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java index 98996858..69a07595 100644 --- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -322,9 +322,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button); if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); - ib.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index da929569..afa08b40 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -645,11 +645,11 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis }); } - ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); + ImageView ib = (ImageView) v.findViewById(R.id.article_menu_button); if (ib != null) { - if (m_activity.isDarkTheme()) - ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); + //if (m_activity.isDarkTheme()) + // ib.setImageResource(R.drawable.ic_mailbox_collapsed_holo_dark); ib.setOnClickListener(new OnClickListener() { @Override From e01bec481565d35e772439c8f61c2d5d8aa71220 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 13:40:46 +0400 Subject: [PATCH 5/8] brighten read headline rows in sepia/light themes --- res/drawable/headline_row.xml | 2 +- res/drawable/headline_row_sepia.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/drawable/headline_row.xml b/res/drawable/headline_row.xml index 45235231..c928013e 100644 --- a/res/drawable/headline_row.xml +++ b/res/drawable/headline_row.xml @@ -11,7 +11,7 @@ - + diff --git a/res/drawable/headline_row_sepia.xml b/res/drawable/headline_row_sepia.xml index 5e2aad22..5fcb7aa1 100644 --- a/res/drawable/headline_row_sepia.xml +++ b/res/drawable/headline_row_sepia.xml @@ -11,7 +11,7 @@ - + From 9da4f1e5f7dcac93176795b65b24cde9a0a901ea Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 13:52:16 +0400 Subject: [PATCH 6/8] 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(-) 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 @@ by %1$s %1$d unread articles Headline text size + Mark all articles in %1$s as read? 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; From 75a13228b1207a618f705b0fe37c4fdf8ea15253 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 9 Sep 2013 13:56:54 +0400 Subject: [PATCH 7/8] bump version --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e6c63139..e147e3e1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="198" + android:versionName="1.11" > Date: Tue, 10 Sep 2013 13:46:44 +0900 Subject: [PATCH 8/8] Update Japanese translation Add new string and fix typo. --- res/values-ja/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 5cd5bc28..8f1e4c9a 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -195,9 +195,10 @@ ライトテーマはHoneycombではサポートされていません スクロールしたら既読にする ヘッドラインをスクロールしたら既読にする - %1$d 件の記事を既読にしますか？ + %1$d 件の記事を既読にしますか？ 記事を既読にする際に確認する by %1$s %1$d 件の未読記事 ヘッドラインの文字サイズ + %1$s の全ての記事を既読にしますか？