Fix #1329

Docile-Alligator · Feb 6, 2023 · c7882b1 · c7882b1
1 parent e69f778
commit c7882b1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...ain/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java b/...ain/java/ml/docilealligator/infinityforreddit/settings/CustomizeBottomAppBarFragment.java
@@ -181,6 +181,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             mainActivityOption2 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption2));
             mainActivityOption3 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption3));
             mainActivityOption4 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption4));
+
+            mainActivityFAB = mainActivityFAB >= 9 ? mainActivityFAB - 2 : mainActivityFAB - 1;
         } else {
             fabOptions = resources.getStringArray(R.array.settings_bottom_app_bar_fab_options);
         }
@@ -258,8 +260,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                         mainActivityFAB = i;
                         int optionToSaveToPreference;
                         if (accountName == null) {
-                            if (i == 7) {
-                                optionToSaveToPreference = 9;
+                            if (i >= 7) {
+                                optionToSaveToPreference = i + 2;
                             } else {
                                 optionToSaveToPreference = i + 1;
                             }
@@ -295,6 +297,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             otherActivitiesOption2 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption2));
             otherActivitiesOption3 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption3));
             otherActivitiesOption4 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption4));
+            otherActivitiesFAB = otherActivitiesFAB >= 9 ? otherActivitiesFAB - 2 : otherActivitiesFAB - 1;
         }
 
         otherActivitiesFABTextView.setText(fabOptions[otherActivitiesFAB]);
@@ -370,8 +373,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                         otherActivitiesFAB = i;
                         int optionToSaveToPreference;
                         if (accountName == null) {
-                            if (i == 7) {
-                                optionToSaveToPreference = 9;
+                            if (i >= 7) {
+                                optionToSaveToPreference = i + 2;
                             } else {
                                 optionToSaveToPreference = i + 1;
                             }