diff options
Diffstat (limited to 'app')
4 files changed, 13 insertions, 5 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java index 9cd7c229..078d782f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java @@ -30,6 +30,7 @@ import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import com.livefront.bridge.Bridge; +import com.r0adkll.slidr.Slidr; import com.r0adkll.slidr.model.SlidrInterface; import org.greenrobot.eventbus.EventBus; @@ -127,10 +128,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele applyCustomTheme(); - /*if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) { - mSlidrInterface = Slidr.attach(this); - }*/ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { Window window = getWindow(); @@ -157,8 +154,12 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele } } + boolean swipeBetweenPosts = mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_BETWEEN_POSTS, false); + if (!swipeBetweenPosts && mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) { + mSlidrInterface = Slidr.attach(this); + } postFragmentId = getIntent().getLongExtra(EXTRA_POST_FRAGMENT_ID, -1); - if (posts == null && postFragmentId > 0) { + if (swipeBetweenPosts && posts == null && postFragmentId > 0) { EventBus.getDefault().post(new NeedForPostListFromPostFragmentEvent(postFragmentId)); } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java index 6d219e31..335256cd 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java @@ -173,6 +173,7 @@ public class SharedPreferencesUtils { public static final String RESTORE_SETTINGS = "restore_settings"; public static final String SHOW_SUICIDE_PREVENTION_ACTIVITY = "show_suicide_prevention_activity"; public static final String LOVE_ANIMATION = "love_animation"; + public static final String SWIPE_BETWEEN_POSTS = "swipe_between_posts"; public static final String DEFAULT_PREFERENCES_FILE = "ml.docilealligator.infinityforreddit_preferences"; public static final String MAIN_PAGE_TABS_SHARED_PREFERENCES_FILE = "ml.docilealligator.infinityforreddit.main_page_tabs"; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3993d4ad..3295d811 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -544,6 +544,7 @@ <string name="settings_backup_settings_title">Backup Settings</string> <string name="settings_restore_settings_title">Restore Settings</string> <string name="settings_credits_love_animation_title">Love Animation</string> + <string name="settings_swipe_between_posts_title">Swipe Between Posts</string> <string name="no_link_available">Cannot get the link</string> diff --git a/app/src/main/res/xml/gestures_and_buttons_preferences.xml b/app/src/main/res/xml/gestures_and_buttons_preferences.xml index 02a37524..b5c30058 100644 --- a/app/src/main/res/xml/gestures_and_buttons_preferences.xml +++ b/app/src/main/res/xml/gestures_and_buttons_preferences.xml @@ -44,6 +44,11 @@ app:key="pull_to_refresh" app:title="@string/settings_pull_to_refresh_title" /> + <SwitchPreference + app:defaultValue="false" + app:key="swipe_between_posts" + app:title="@string/settings_swipe_between_posts_title" /> + <Preference app:title="@string/settings_swipe_action_title" app:fragment="ml.docilealligator.infinityforreddit.settings.SwipeActionPreferenceFragment" /> |