From f1b0f828ace56640e898965bf8214b9f1a28b926 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 16:23:38 -0300
Subject: [PATCH] Fixing up name of the setting, and making it disabled by
 default

---
 .../org/joinmastodon/android/GlobalUserPreferences.java     | 6 +++---
 .../android/fragments/BaseStatusListFragment.java           | 3 +--
 .../joinmastodon/android/fragments/SettingsFragment.java    | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index b7c707d94..31eced774 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -33,7 +33,7 @@ public class GlobalUserPreferences{
 	public static boolean relocatePublishButton;
 	public static boolean reduceMotion;
 	public static boolean keepOnlyLatestNotification;
-	public static boolean disableFab;
+	public static boolean disableFabAutoHide;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -73,7 +73,7 @@ public class GlobalUserPreferences{
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", true);
 		reduceMotion=prefs.getBoolean("reduceMotion", false);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
-		disableFab=prefs.getBoolean("disableFab", false);
+		disableFabAutoHide=prefs.getBoolean("disableFabAutoHide", false);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
 		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
@@ -110,7 +110,7 @@ public class GlobalUserPreferences{
 				.putBoolean("enableDeleteNotifications", enableDeleteNotifications)
 				.putBoolean("reduceMotion", reduceMotion)
 				.putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
-				.putBoolean("disableFab", disableFab)
+				.putBoolean("disableFabAutoHide", disableFabAutoHide)
 				.putString("publishButtonText", publishButtonText)
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
index 76148ae84..49a81d60d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
@@ -13,7 +13,6 @@ import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
@@ -286,7 +285,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 				if(currentPhotoViewer!=null)
 					currentPhotoViewer.offsetView(-dx, -dy);
 
-				if (fab!=null && !GlobalUserPreferences.disableFab) {
+				if (fab!=null && GlobalUserPreferences.disableFabAutoHide) {
 					if (dy > 0 /*&& !isFirstLaunch*/) {
 						if (isScrollingUp /*&& !isFirstLaunch*/) {
 							fab.setVisibility(View.INVISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index fb33ccdcd..81fe364e3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -210,8 +210,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));
-		items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.disableFab, i->{
-			GlobalUserPreferences.disableFab=i.checked;
+		items.add(new SwitchItem(R.string.mo_hide_compose_button_while_scrolling_setting, R.drawable.ic_fluent_edit_24_regular, GlobalUserPreferences.disableFabAutoHide, i->{
+			GlobalUserPreferences.disableFabAutoHide =i.checked;
 			GlobalUserPreferences.save();
 			needAppRestart=true;
 		}));