Docile-Alligator 2023-02-06 13:08:16 -05:00
parent e69f778de4
commit c7882b1f65

View File

@ -181,6 +181,8 @@ public class CustomizeBottomAppBarFragment extends Fragment {
mainActivityOption2 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption2)); mainActivityOption2 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption2));
mainActivityOption3 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption3)); mainActivityOption3 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption3));
mainActivityOption4 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption4)); mainActivityOption4 = mainActivityOptionAnonymousValuesList.indexOf(Integer.toString(mainActivityOption4));
mainActivityFAB = mainActivityFAB >= 9 ? mainActivityFAB - 2 : mainActivityFAB - 1;
} else { } else {
fabOptions = resources.getStringArray(R.array.settings_bottom_app_bar_fab_options); fabOptions = resources.getStringArray(R.array.settings_bottom_app_bar_fab_options);
} }
@ -258,8 +260,8 @@ public class CustomizeBottomAppBarFragment extends Fragment {
mainActivityFAB = i; mainActivityFAB = i;
int optionToSaveToPreference; int optionToSaveToPreference;
if (accountName == null) { if (accountName == null) {
if (i == 7) { if (i >= 7) {
optionToSaveToPreference = 9; optionToSaveToPreference = i + 2;
} else { } else {
optionToSaveToPreference = i + 1; optionToSaveToPreference = i + 1;
} }
@ -295,6 +297,7 @@ public class CustomizeBottomAppBarFragment extends Fragment {
otherActivitiesOption2 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption2)); otherActivitiesOption2 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption2));
otherActivitiesOption3 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption3)); otherActivitiesOption3 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption3));
otherActivitiesOption4 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption4)); otherActivitiesOption4 = otherActivitiesOptionAnonymousValuesList.indexOf(Integer.toString(otherActivitiesOption4));
otherActivitiesFAB = otherActivitiesFAB >= 9 ? otherActivitiesFAB - 2 : otherActivitiesFAB - 1;
} }
otherActivitiesFABTextView.setText(fabOptions[otherActivitiesFAB]); otherActivitiesFABTextView.setText(fabOptions[otherActivitiesFAB]);
@ -370,8 +373,8 @@ public class CustomizeBottomAppBarFragment extends Fragment {
otherActivitiesFAB = i; otherActivitiesFAB = i;
int optionToSaveToPreference; int optionToSaveToPreference;
if (accountName == null) { if (accountName == null) {
if (i == 7) { if (i >= 7) {
optionToSaveToPreference = 9; optionToSaveToPreference = i + 2;
} else { } else {
optionToSaveToPreference = i + 1; optionToSaveToPreference = i + 1;
} }