Merge pull request #10676 from osmandapp/Fix-UI-trip-recording

Fix UI trip recording

OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml

@@ -6,18 +6,18 @@
 	android:layout_height="wrap_content"
 	android:baselineAligned="false"
 	android:gravity="center_vertical"
-    android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height">
-    android:paddingStart="@dimen/content_padding"
-    android:paddingEnd="@dimen/content_padding"
-    android:paddingRight="@dimen/content_padding"
-    android:paddingLeft="@dimen/content_padding">
 
 	<LinearLayout
 		android:id="@+id/basic_item_body"
 		android:layout_width="0dp"
 		android:layout_height="match_parent"
 		android:layout_weight="1"
-        android:background="?attr/selectableItemBackground">
+		android:background="?attr/selectableItemBackground"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding">
 
 		<LinearLayout
 			android:layout_width="0dp"
@@ -46,8 +46,9 @@
 			android:layout_gravity="center_vertical"
 			android:layout_marginStart="@dimen/bottom_sheet_content_margin"
 			android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-            android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+			android:clickable="false"
-            android:layout_marginRight="@dimen/bottom_sheet_content_margin"
+			android:focusable="false"
+			android:focusableInTouchMode="false"
 			tools:checked="true" />
 
 	</LinearLayout>
@@ -73,6 +74,8 @@
 			android:layout_gravity="center"
 			android:layout_marginStart="@dimen/content_padding"
 			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
 			app:srcCompat="@drawable/ic_action_track_line_bold_color" />
 
 	</LinearLayout>

OsmAnd/res/layout/trip_recording_fragment.xml

@@ -32,6 +32,8 @@
 		android:background="?attr/dashboard_divider" />
 
 	<LinearLayout
+		android:id="@+id/interval_view_container"
+		android:background="?attr/selectableItemBackground"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_gravity="center_vertical"
@@ -40,6 +42,7 @@
 		android:paddingStart="@dimen/content_padding"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingTop="@dimen/bottom_sheet_content_margin"
+		android:paddingBottom="@dimen/bottom_sheet_content_margin"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding">
 
@@ -106,8 +109,6 @@
 		android:id="@+id/second_divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
-        android:layout_marginTop="@dimen/content_padding"
-        android:layout_marginBottom="@dimen/bottom_sheet_content_margin_small"
 		android:background="?attr/dashboard_divider" />
 
 </LinearLayout>

OsmAnd/src/net/osmand/plus/UiUtilities.java

@@ -636,7 +636,7 @@ public class UiUtilities {
 		int activeDisableColor = getColorWithAlpha(activeColor, 0.25f);
 		ColorStateList activeCsl = new ColorStateList(states, new int[] {activeColor, activeDisableColor});
 		int inactiveColor = ContextCompat.getColor(ctx, nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
-		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {inactiveColor, inactiveColor});
+		ColorStateList inactiveCsl = new ColorStateList(states, new int[] {activeDisableColor, inactiveColor});
 		slider.setTrackActiveTintList(activeCsl);
 		slider.setTrackInactiveTintList(inactiveCsl);
 		slider.setHaloTintList(activeCsl);

OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java

@@ -268,6 +268,18 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 		dismissButtonStringRes = stringRes;
 	}
 
+	protected int getDismissButtonHeight(){
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height_small);
+	}
+
+	protected int getRightButtonHeight(){
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height_small);
+	}
+
+	protected int getThirdButtonHeight(){
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height_small);
+	}
+
 	protected DialogButtonType getDismissButtonType() {
 		return DialogButtonType.SECONDARY;
 	}
@@ -360,6 +372,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	private void setupDismissButton() {
 		dismissButton = buttonsContainer.findViewById(R.id.dismiss_button);
+		dismissButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getDismissButtonHeight()));
 		int buttonTextId = getDismissButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), buttonTextId);
@@ -376,6 +389,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	private void setupRightButton() {
 		rightButton = buttonsContainer.findViewById(R.id.right_bottom_button);
+		rightButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getRightButtonHeight()));
 		int buttonTextId = getRightBottomButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, rightButton, getRightBottomButtonType(), buttonTextId);
@@ -398,6 +412,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
 
 	protected void setupThirdButton() {
 		thirdButton = buttonsContainer.findViewById(R.id.third_button);
+		thirdButton.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getThirdButtonHeight()));
 		int buttonTextId = getThirdBottomButtonTextId();
 		if (buttonTextId != DEFAULT_VALUE) {
 			UiUtilities.setupDialogButton(nightMode, thirdButton, getThirdBottomButtonType(), buttonTextId);

OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.ImageView;
@@ -18,10 +19,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.slider.RangeSlider;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.NavigationService;
 import net.osmand.plus.OsmandApplication;
@@ -49,9 +52,9 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 
 	private ImageView upDownBtn;
 	private SwitchCompat confirmEveryRun;
-	private RangeSlider intervalSlider;
 	private TextView intervalValueView;
 	private LinearLayout container;
+	private View divider;
 	private boolean infoExpanded;
 
 	@Override
@@ -92,8 +95,10 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 			}
 		});
 
+		divider = itemView.findViewById(R.id.second_divider);
+		LinearLayout expandHideIntervalContainer = itemView.findViewById(R.id.interval_view_container);
 		upDownBtn = itemView.findViewById(R.id.up_down_button);
-		upDownBtn.setOnClickListener(new View.OnClickListener() {
+		expandHideIntervalContainer.setOnClickListener(new View.OnClickListener() {
 
 			@Override
 			public void onClick(View v) {
@@ -108,8 +113,11 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 		updateIntervalLegend();
 
 		container = itemView.findViewById(R.id.always_ask_and_range_slider_container);
-		intervalSlider = itemView.findViewById(R.id.interval_slider);
+		RangeSlider intervalSlider = itemView.findViewById(R.id.interval_slider);
 		intervalSlider.setValueTo(secondsLength + minutesLength - 1);
+		int currentModeColorRes = app.getSettings().getApplicationMode().getIconColorInfo().getColor(nightMode);
+		int currentModeColor = ContextCompat.getColor(app, currentModeColorRes);
+		UiUtilities.setupSlider(intervalSlider, nightMode, currentModeColor, true);
 		container.setVisibility(View.GONE);
 		intervalSlider.addOnChangeListener(new RangeSlider.OnChangeListener() {
 
@@ -126,6 +134,7 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 				updateIntervalLegend();
 			}
 		});
+
 		for (int i = 0; i < secondsLength + minutesLength; i++) {
 			if (i < secondsLength) {
 				if (settings.SAVE_GLOBAL_TRACK_INTERVAL.get() <= SECONDS[i] * 1000) {
@@ -151,13 +160,15 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 			}
 		});
 
-		SwitchCompat showTrackOnMapButton = showTrackOnMapView.findViewById(R.id.switch_button);
+		final SwitchCompat showTrackOnMapButton = showTrackOnMapView.findViewById(R.id.switch_button);
 		showTrackOnMapButton.setChecked(app.getSelectedGpxHelper().getSelectedCurrentRecordingTrack() != null);
-		showTrackOnMapButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+		View basicItem = itemView.findViewById(R.id.basic_item_body);
-
+		basicItem.setOnClickListener(new View.OnClickListener() {
 			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			public void onClick(View v) {
-				app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), isChecked, false);
+				boolean checked = !showTrackOnMapButton.isChecked();
+				showTrackOnMapButton.setChecked(checked);
+				app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), checked, false);
 			}
 		});
 		UiUtilities.setupCompoundButton(showTrackOnMapButton, nightMode, PROFILE_DEPENDENT);
@@ -217,6 +228,14 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 
 	private void toggleInfoView() {
 		infoExpanded = !infoExpanded;
+		ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams) divider.getLayoutParams();
+		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();
 	}
@@ -226,6 +245,16 @@ public class TripRecordingBottomSheet extends MenuBottomSheetDialogFragment {
 		return true;
 	}
 
+	@Override
+	protected int getRightButtonHeight(){
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height);
+	}
+
+	@Override
+	protected int getDismissButtonHeight(){
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_cancel_button_height);
+	}
+
 	@Override
 	protected int getRightBottomButtonTextId() {
 		return R.string.start_recording;