iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable swipe to dismiss if auto mark as read is enabled

Browse Source
This commit is contained in:
Andrew Dolgov 2017-05-31 16:52:25 +03:00
parent 3b1a0b9cb6
commit 9e7021a717
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -371,7 +371,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
m_animationAdapter.setAbsListView(m_list); m_animationAdapter.setAbsListView(m_list);
m_list.setAdapter(m_animationAdapter); 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, TimedUndoAdapter swipeUndoAdapter = new TimedUndoAdapter(m_adapter, m_activity,
new OnDismissCallback() { new OnDismissCallback() {

2
org.fox.ttrss/src/main/res/xml/preferences.xml
View File

@ -86,6 +86,7 @@
<org.fox.ttrss.util.LessBrokenSwitchPreference <org.fox.ttrss.util.LessBrokenSwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:dependency="headlines_mark_read_scroll"
android:key="headlines_swipe_to_dismiss" android:key="headlines_swipe_to_dismiss"
android:summary="@string/pref_headlines_swipe_to_dismiss_long" android:summary="@string/pref_headlines_swipe_to_dismiss_long"
android:title="@string/pref_headlines_swipe_to_dismiss" /> android:title="@string/pref_headlines_swipe_to_dismiss" />
@ -103,6 +104,7 @@
<org.fox.ttrss.util.LessBrokenSwitchPreference <org.fox.ttrss.util.LessBrokenSwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:disableDependentsState="true"
android:key="headlines_mark_read_scroll" android:key="headlines_mark_read_scroll"
android:summary="@string/pref_headlines_mark_read_scroll_long" android:summary="@string/pref_headlines_mark_read_scroll_long"
android:title="@string/pref_headlines_mark_read_scroll" /> android:title="@string/pref_headlines_mark_read_scroll" />