diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java index dc9fe0321..66be9a553 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java @@ -48,7 +48,7 @@ public class GlobalUserPreferences{ public static boolean spectatorMode; public static boolean autoHideFab; public static boolean defaultToUnlistedReplies; - public static boolean disableDoubleTapToSwipe; + public static boolean doubleTapToSwipe; public static boolean compactReblogReplyLine; public static boolean confirmBeforeReblog; public static boolean replyLineAboveHeader; @@ -119,7 +119,7 @@ public class GlobalUserPreferences{ autoHideFab=prefs.getBoolean("autoHideFab", true); compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true); defaultToUnlistedReplies=prefs.getBoolean("defaultToUnlistedReplies", false); - disableDoubleTapToSwipe=prefs.getBoolean("disableDoubleTapToSwipe", false); + doubleTapToSwipe =prefs.getBoolean("doubleTapToSwipe", true); replyLineAboveHeader=prefs.getBoolean("replyLineAboveHeader", true); compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true); confirmBeforeReblog=prefs.getBoolean("confirmBeforeReblog", false); @@ -180,7 +180,7 @@ public class GlobalUserPreferences{ .putString("publishButtonText", publishButtonText) .putBoolean("bottomEncoding", bottomEncoding) .putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies) - .putBoolean("disableDoubleTapToSwipe", disableDoubleTapToSwipe) + .putBoolean("doubleTapToSwipe", doubleTapToSwipe) .putBoolean("compactReblogReplyLine", compactReblogReplyLine) .putBoolean("replyLineAboveHeader", replyLineAboveHeader) .putBoolean("confirmBeforeReblog", confirmBeforeReblog) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java index b19dd8a4c..ed2851dc1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java @@ -505,7 +505,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab @Override public void scrollToTop(){ if (((ScrollableToTop) fragments[pager.getCurrentItem()]).isScrolledToTop() && - !GlobalUserPreferences.disableDoubleTapToSwipe && !newPostsBtnShown) { + GlobalUserPreferences.doubleTapToSwipe && !newPostsBtnShown) { int nextPage = (pager.getCurrentItem() + 1) % count; navigateTo(nextPage); return; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index 0cba032d2..06719c24d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -205,7 +205,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc @Override public void scrollToTop(){ - if (getFragmentForPage(pager.getCurrentItem()).isScrolledToTop() && !GlobalUserPreferences.disableDoubleTapToSwipe) { + if (getFragmentForPage(pager.getCurrentItem()).isScrolledToTop() && GlobalUserPreferences.doubleTapToSwipe) { int nextPage = (pager.getCurrentItem() + 1) % tabViews.length; pager.setCurrentItem(nextPage, true); return; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java index cba77e8af..ea21bf8b8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/settings/BehaviourFragment.java @@ -40,8 +40,8 @@ public class BehaviourFragment extends SettingsBaseFragment{ GlobalUserPreferences.save(); needAppRestart=true; })); - items.add(new SwitchItem(R.string.mo_disable_double_tap_to_swipe_between_tabs, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, GlobalUserPreferences.disableDoubleTapToSwipe, i->{ - GlobalUserPreferences.disableDoubleTapToSwipe=i.checked; + items.add(new SwitchItem(R.string.mo_double_tap_to_swipe_between_tabs, R.drawable.ic_fluent_double_tap_swipe_right_24_regular, GlobalUserPreferences.doubleTapToSwipe, i->{ + GlobalUserPreferences.doubleTapToSwipe=i.checked; GlobalUserPreferences.save(); needAppRestart=true; })); diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml index 76552f031..3d3f84033 100644 --- a/mastodon/src/main/res/values/strings_mo.xml +++ b/mastodon/src/main/res/values/strings_mo.xml @@ -11,7 +11,7 @@ Hide compose button while scrolling To get started, please enter your home instance’s domain name below. - + Moshidon v%1$s (%2$d) Add a note about this profile @@ -50,7 +50,7 @@ 7 days Open in App - Disable double tap to swipe between tabs + Double tap to swipe between tabs Use reblog action instead of bookmark action on notifications Download latest nightly release Load remote profile follows and followers