[FAB] Fixed FAB Button visibility issue

(cherry picked from commit f6d6bd4)

Author: OffRange

app/src/main/java/de/davis/passwordmanager/ui/BaseMainActivity.java

@@ -32,8 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         getFAB().setOnClickListener(v -> new AddBottomSheet().show(getSupportFragmentManager(), "add-bottom-sheet"));
 
-
-        float screenWidthDp = getResources().getConfiguration().smallestScreenWidthDp;
+        float screenWidthDp = getResources().getConfiguration().screenWidthDp;
         if(screenWidthDp >= 600)
             return;
 
@@ -42,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private View getFAB(){
-        float screenWidthDp = getResources().getConfiguration().smallestScreenWidthDp;
+        float screenWidthDp = getResources().getConfiguration().screenWidthDp;
         return screenWidthDp >= 600 ? findViewById(R.id.add_rail) : findViewById(R.id.add);
     }
 }

app/src/main/java/de/davis/passwordmanager/ui/BottomSectionHandler.java

@@ -60,7 +60,7 @@ public BottomSectionHandler(NavigationBarView navigationBarView, ExtendedFloatin
     }
 
     public void handle(){
-        scrollingViewModel.getVisibility().observe(activity, visible -> extendedFAB.setVisibility(visible ? View.VISIBLE : View.GONE));
+        scrollingViewModel.getFabVisibility().observe(activity, visible -> extendedFAB.setVisibility(visible ? View.VISIBLE : View.GONE));
         scrollingViewModel.getConsumedY().observe(activity, consumed -> {
             if(consumed < 0 && !extendedFAB.isExtended()) {
                 extendedFAB.extend();

app/src/main/java/de/davis/passwordmanager/ui/callbacks/SlidingBackPaneManager.java

@@ -29,7 +29,7 @@ private void updateState(){
     @Override
     public void handleOnBackPressed() {
         slidingPaneLayout.closePane();
-        scrollingViewModel.setVisibility(true);
+        scrollingViewModel.setFabVisibility(true);
     }
 
     @Override

app/src/main/java/de/davis/passwordmanager/ui/dashboard/DashboardFragment.java

@@ -52,7 +52,7 @@ public class DashboardFragment extends Fragment implements SearchView.OnQueryTex
     private DashboardViewModel viewModel;
     private ScrollingViewModel scrollingViewModel;
 
-    private boolean oldState = true;
+    private boolean shouldShowBtn = true;
 
     @Nullable
     @Override
@@ -93,7 +93,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         dashboardAdapter.applyWithTracker(binding.listPane.recyclerView);
 
         BasicViewHolder.OnItemClickedListener onItemClickedListener = element -> {
-            scrollingViewModel.setVisibility(false);
+            scrollingViewModel.setFabVisibility(false);
             binding.listPane.searchView.hide();
             Bundle bundle = new Bundle();
             bundle.putSerializable("element", element);
@@ -169,20 +169,20 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
             return;
 
         onItemClickedListener.onClicked(element);
-        oldState = false;
+        shouldShowBtn = false;
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        oldState = Boolean.TRUE.equals(scrollingViewModel.getVisibility().getValue());
-        scrollingViewModel.setVisibility(false);
+        shouldShowBtn = Boolean.TRUE.equals(scrollingViewModel.getFabVisibility().getValue());
+        scrollingViewModel.setFabVisibility(false);
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        scrollingViewModel.setVisibility(oldState);
+    public void onStart() {
+        super.onStart();
+        scrollingViewModel.setFabVisibility(shouldShowBtn);
     }
 
     private void addMenu(DashboardAdapter dashboardAdapter){
@@ -222,6 +222,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
         if(binding == null)
             return;
         outState.putCharSequence("searchbar_hint", binding.listPane.searchBar.getHint());
+        outState.putBoolean("shouldShowBtn", shouldShowBtn);
     }
 
     @Override
@@ -232,6 +233,7 @@ public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
             return;
 
         binding.listPane.searchBar.setHint(savedInstanceState.getCharSequence("searchbar_hint", getString(android.R.string.search_go)));
+        shouldShowBtn = savedInstanceState.getBoolean("shouldShowBtn");
     }
 
     private void showBottomSheet(){

app/src/main/java/de/davis/passwordmanager/ui/viewmodels/ScrollingViewModel.java

@@ -7,21 +7,21 @@
 public class ScrollingViewModel extends ViewModel {
 
     private final MutableLiveData<Integer> consumedY = new MutableLiveData<>();
-    private final MutableLiveData<Boolean> visibility = new MutableLiveData<>();
+    private final MutableLiveData<Boolean> fabVisibility = new MutableLiveData<>();
 
     public void setConsumedY(int consumed){
         consumedY.setValue(consumed);
     }
 
-    public void setVisibility(boolean visible){
-        visibility.setValue(visible);
+    public void setFabVisibility(boolean visible){
+        fabVisibility.setValue(visible);
     }
 
     public LiveData <Integer> getConsumedY() {
         return consumedY;
     }
 
-    public MutableLiveData<Boolean> getVisibility() {
-        return visibility;
+    public MutableLiveData<Boolean> getFabVisibility() {
+        return fabVisibility;
     }
 }