From b6cc1d57fad0659159bb12178110c5774cf4c4ed Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Thu, 19 Dec 2024 14:08:06 +0300 Subject: [PATCH] [android] Show a toast every time FS mode is entered Signed-off-by: Konstantin Pastbin --- .../src/main/java/app/organicmaps/MwmActivity.java | 14 +++----------- .../src/main/java/app/organicmaps/util/Config.java | 13 ------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index d64562190f..a7d4bb8c0e 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -1287,7 +1287,9 @@ public class MwmActivity extends BaseMwmFragmentActivity if (isFullscreen()) { closePlacePage(); - showFullscreenToastIfNeeded(); + // Show the toast every time so that users don't forget and don't get trapped in the FS mode. + // TODO(pastk): there are better solutions, see https://github.com/organicmaps/organicmaps/issues/9344 + Toast.makeText(this, R.string.long_tap_toast, Toast.LENGTH_LONG).show(); } } @@ -1309,16 +1311,6 @@ public class MwmActivity extends BaseMwmFragmentActivity Framework.nativeGetChoosePositionMode() == Framework.ChoosePositionMode.NONE; } - private void showFullscreenToastIfNeeded() - { - // Show the toast only once so new behaviour doesn't confuse users - if (!Config.wasLongTapToastShown(this)) - { - Toast.makeText(this, R.string.long_tap_toast, Toast.LENGTH_LONG).show(); - Config.setLongTapToastShown(this, true); - } - } - @Override public boolean onTouch(View view, MotionEvent event) { diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java index 18760a93e1..14eccbcead 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/util/Config.java @@ -35,7 +35,6 @@ public final class Config private static final String KEY_MISC_AGPS_TIMESTAMP = "AGPSTimestamp"; private static final String KEY_DONATE_URL = "DonateUrl"; private static final String KEY_PREF_SEARCH_HISTORY = "SearchHistoryEnabled"; - private static final String KEY_PREF_LONG_TAP_TOAST_SHOWN = "LongTapToastShown"; /** * The total number of app launches. @@ -417,18 +416,6 @@ public final class Config .apply(); } - public static boolean wasLongTapToastShown(@NonNull Context context) - { - return MwmApplication.prefs(context).getBoolean(KEY_PREF_LONG_TAP_TOAST_SHOWN, false); - } - - public static void setLongTapToastShown(@NonNull Context context, Boolean newValue) - { - MwmApplication.prefs(context).edit() - .putBoolean(KEY_PREF_LONG_TAP_TOAST_SHOWN, newValue) - .apply(); - } - public static boolean isSearchHistoryEnabled() { return getBool(KEY_PREF_SEARCH_HISTORY, true);