summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/FeedCategoriesFragment.java37
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java36
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java10
-rw-r--r--src/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java3
-rw-r--r--src/org/fox/ttrss/offline/OfflineFeedsFragment.java3
-rw-r--r--src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java6
6 files changed, 71 insertions, 24 deletions
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 34b21922..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;
@@ -415,9 +445,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..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;
@@ -542,9 +571,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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-18 14:03:23 +0000