diff options
| author | Andrew Dolgov <[email protected]> | 2017-05-31 16:52:25 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-05-31 16:52:25 +0300 |
| commit | 9e7021a717b2c0dbe2f56c85c52ffcb3e064a138 (patch) | |
| tree | 2657842e3b7a816d4193ddfc406abbb5f7dd7a6a /org.fox.ttrss | |
| parent | 3b1a0b9cb61a214439c06bfba2c81ad771d145e8 (diff) | |
disable swipe to dismiss if auto mark as read is enabled
Diffstat (limited to 'org.fox.ttrss')
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 2 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/xml/preferences.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 44f10a00..9e9cf243 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -371,7 +371,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, m_animationAdapter.setAbsListView(m_list); m_list.setAdapter(m_animationAdapter); - if (enableSwipeToDismiss) { + if (enableSwipeToDismiss && !m_prefs.getBoolean("headlines_mark_read_scroll", false)) { TimedUndoAdapter swipeUndoAdapter = new TimedUndoAdapter(m_adapter, m_activity, new OnDismissCallback() { diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 43ed1bb0..050f7763 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -86,6 +86,7 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="true" + android:dependency="headlines_mark_read_scroll" android:key="headlines_swipe_to_dismiss" android:summary="@string/pref_headlines_swipe_to_dismiss_long" android:title="@string/pref_headlines_swipe_to_dismiss" /> @@ -103,6 +104,7 @@ <org.fox.ttrss.util.LessBrokenSwitchPreference android:defaultValue="false" + android:disableDependentsState="true" android:key="headlines_mark_read_scroll" android:summary="@string/pref_headlines_mark_read_scroll_long" android:title="@string/pref_headlines_mark_read_scroll" /> |