commit b9e799359669f208ec4bd734a05814016e7d44c7 Author: Fabio Mazza Date: Thu May 21 17:53:04 2026 +0200 Fix floating action button diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java index 449c60a..e90e6df 100644 --- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java +++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java @@ -534,6 +534,8 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen } } private void updateShowingFragmentKindInternal(@NonNull FragmentKind newKind){ + if(BuildConfig.DEBUG) + Log.d(DEBUG_TAG, "Updating fragment kind, new: "+newKind+", current: "+showingFragmentKind); if(showingFragmentKind == null){ showingFragmentKind = newKind; showingMainFragmentFromOther = false; @@ -606,7 +608,7 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen var fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG); if(fragment instanceof MainScreenFragment mainFrag){ if(!mainFrag.isVisible()){ - showMainFragment(fraMan, mainFrag, false); + showMainFragment(fraMan, mainFrag, addToBackStack); } mainFrag.showButtonsFragmentIfNotNearby(addToBackStack); } else{ @@ -654,7 +656,6 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) .setReorderingAllowed(false); ft.commit(); - } private void showLinesFragment(@NonNull FragmentManager fragmentManager, boolean addToBackStack, @Nullable Bundle fragArgs){ @@ -689,7 +690,10 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen @Override public void showFloatingActionButton(boolean yes) { - //TODO + var frag = getMainFragmentIfVisible(); + if(frag!=null){ + frag.showFloatingActionButton(yes); + } } /* @@ -790,18 +794,16 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen @Override public void openLineFromStop(String routeGtfsId, @Nullable String stopIDFrom){ - readyGUIfor(FragmentKind.LINES); - FragmentTransaction tr = getSupportFragmentManager().beginTransaction(); tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class, LinesDetailFragment.Companion.makeArgs(routeGtfsId, stopIDFrom)); tr.addToBackStack("LineFromStop-"+routeGtfsId); tr.commit(); + } @Override public void openLineFromVehicle(String routeGtfsId, @Nullable String optionalPatternId, @Nullable Bundle args) { - readyGUIfor(FragmentKind.LINES); FragmentTransaction tr = getSupportFragmentManager().beginTransaction(); tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class, @@ -816,7 +818,7 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen var fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG); if(fragment instanceof MainScreenFragment mainFrag){ if(!mainFrag.isVisible()){ - showMainFragment(fraMan, mainFrag, false); + showMainFragment(fraMan, mainFrag, true); } mainFrag.openNearbyStopsFragment(); } else{ diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java index 5d90339..1282296 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java +++ b/app/src/main/java/it/reyboz/bustorino/fragments/MainScreenFragment.java @@ -613,7 +613,7 @@ public class MainScreenFragment extends BarcodeFragment implements FragmentList pendingStopID = null; } - mListener.readyGUIfor(FragmentKind.MAIN_SCREEN_FRAGMENT); + //mListener.readyGUIfor(FragmentKind.MAIN_SCREEN_FRAGMENT); //fragmentHelper.setBlockAllActivities(false); @@ -778,7 +778,11 @@ public class MainScreenFragment extends BarcodeFragment implements FragmentList @Override public void showFloatingActionButton(boolean yes) { - mListener.showFloatingActionButton(yes); + //mListener.showFloatingActionButton(yes); + if(yes) + floatingActionButton.setVisibility(View.VISIBLE); + else + floatingActionButton.setVisibility(View.GONE); } /**