From 14d00037b2e8481a2e7a26746208bd29d46ee537 Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Wed, 27 Jan 2021 13:37:32 +0200
Subject: [PATCH] Pull request review

---
 .../base/MenuBottomSheetDialogFragment.java   |  9 +++------
 .../monitoring/TripRecordingBottomSheet.java  | 19 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
index 0afa81a300..9f97a07563 100644
--- a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
@@ -372,8 +372,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	private void setupDismissButton() {
 		dismissButton = buttonsContainer.findViewById(R.id.dismiss_button);
-		android.widget.LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getDismissButtonHeight());
-		dismissButton.setLayoutParams(lp);
+		dismissButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getDismissButtonHeight()));
 		int buttonTextId = getDismissButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), buttonTextId);
@@ -390,8 +389,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	private void setupRightButton() {
 		rightButton = buttonsContainer.findViewById(R.id.right_bottom_button);
-		android.widget.LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getRightButtonHeight());
-		rightButton.setLayoutParams(lp);
+		rightButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getRightButtonHeight()));
 		int buttonTextId = getRightBottomButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, rightButton, getRightBottomButtonType(), buttonTextId);
@@ -414,8 +412,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	protected void setupThirdButton() {
 		thirdButton = buttonsContainer.findViewById(R.id.third_button);
-		android.widget.LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getThirdButtonHeight());
-		thirdButton.setLayoutParams(lp);
+		thirdButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getThirdButtonHeight()));
 		int buttonTextId = getThirdBottomButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, thirdButton, getThirdBottomButtonType(), buttonTextId);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java b/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
index 1cb23e7ba9..533d9f151d 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
@@ -54,7 +54,6 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 	private SwitchCompat confirmEveryRun;
 	private TextView intervalValueView;
 	private LinearLayout container;
-	private LinearLayout expandHideIntervalContainer;
 	private View divider;
 	private boolean infoExpanded;
 
@@ -97,7 +96,7 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 		});
 
 		divider = itemView.findViewById(R.id.second_divider);
-		expandHideIntervalContainer = itemView.findViewById(R.id.interval_view_container);
+		LinearLayout expandHideIntervalContainer = itemView.findViewById(R.id.interval_view_container);
 		upDownBtn = itemView.findViewById(R.id.up_down_button);
 		expandHideIntervalContainer.setOnClickListener(new View.OnClickListener() {
 
@@ -167,13 +166,9 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 		basicItem.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				if (showTrackOnMapButton.isChecked()) {
-					showTrackOnMapButton.setChecked(false);
-					app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), false, false);
-				} else {
-					showTrackOnMapButton.setChecked(true);
-					app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), true, false);
-				}
+				boolean checked = !showTrackOnMapButton.isChecked();
+				showTrackOnMapButton.setChecked(checked);
+				app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), checked, false);
 			}
 		});
 		UiUtilities.setupCompoundButton(showTrackOnMapButton, nightMode, PROFILE_DEPENDENT);
@@ -234,15 +229,13 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 	private void toggleInfoView() {
 		infoExpanded = !infoExpanded;
 		ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) divider.getLayoutParams();
-		if (getMapActivity() != null) {
-			final int dp8 = AndroidUtils.dpToPx(getMapActivity(), 8f);
-			final int dp16 = AndroidUtils.dpToPx(getMapActivity(), 16f);
+			final int dp8 = AndroidUtils.dpToPx(app, 8f);
+			final int dp16 = AndroidUtils.dpToPx(app, 16f);
 			if (infoExpanded) {
 				AndroidUtils.setMargins(marginParams, 0, dp16, 0, dp8);
 			} else {
 				AndroidUtils.setMargins(marginParams, 0, 0, 0, dp8);
 			}
-		}
 		AndroidUiHelper.updateVisibility(container, infoExpanded);
 		updateUpDownBtn();
 	}