From 8c1376fc432c1b8983afe4bbebe703f1722d6cd0 Mon Sep 17 00:00:00 2001
From: Aryan <109228835+Aryan-Sagavekar@users.noreply.github.com>
Date: Mon, 13 Mar 2023 00:47:21 +0530
Subject: [PATCH] changed the updateButtonsVisibility() function

Signed-off-by: Aryan <sagavekararyan@gmail.com>
---
 .../maplayer/MapButtonsController.java        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/android/src/app/organicmaps/maplayer/MapButtonsController.java b/android/src/app/organicmaps/maplayer/MapButtonsController.java
index a6270d72de..eacb7754ae 100644
--- a/android/src/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/src/app/organicmaps/maplayer/MapButtonsController.java
@@ -13,19 +13,18 @@ import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
-
-import com.google.android.material.badge.BadgeDrawable;
-import com.google.android.material.badge.BadgeUtils;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import app.organicmaps.R;
 import app.organicmaps.downloader.MapManager;
 import app.organicmaps.downloader.UpdateInfo;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.util.Config;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageController;
-import app.organicmaps.util.Config;
-import app.organicmaps.util.UiUtils;
+import com.google.android.material.badge.BadgeDrawable;
+import com.google.android.material.badge.BadgeUtils;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -242,8 +241,14 @@ public class MapButtonsController extends Fragment
 
   public void updateButtonsVisibility()
   {
-    updateButtonsVisibility(mInnerLeftButtonsFrame.getTranslationY(), mInnerLeftButtonsFrame);
-    updateButtonsVisibility(mInnerRightButtonsFrame.getTranslationY(), mInnerRightButtonsFrame);
+    if (mInnerLeftButtonsFrame != null)
+    {
+      updateButtonsVisibility(mInnerLeftButtonsFrame.getTranslationY(), mInnerLeftButtonsFrame);
+    }
+    if (mInnerRightButtonsFrame != null)
+    {
+      updateButtonsVisibility(mInnerRightButtonsFrame.getTranslationY(), mInnerRightButtonsFrame);
+    }
   }
 
   private void updateButtonsVisibility(final float translation, @Nullable View parent)
@@ -269,7 +274,10 @@ public class MapButtonsController extends Fragment
   public void showMapButtons(boolean show)
   {
     if (show)
+    {
       UiUtils.show(mFrame);
+      updateButtonsVisibility();
+    }
     else
       UiUtils.hide(mFrame);
     mOnBottomButtonsHeightChangedListener.OnBottomButtonsHeightChanged();