diff --git a/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml b/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
index 681c03e560..6953783885 100644
--- a/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
+++ b/OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml
@@ -1,80 +1,83 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:baselineAligned="false"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/bottom_sheet_selected_item_title_height">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/OsmAnd/res/layout/trip_recording_fragment.xml b/OsmAnd/res/layout/trip_recording_fragment.xml
index 8c43e98d5f..f69e4eb4c7 100644
--- a/OsmAnd/res/layout/trip_recording_fragment.xml
+++ b/OsmAnd/res/layout/trip_recording_fragment.xml
@@ -1,114 +1,115 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index 94bd3c4bcb..8d3a6d35bf 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/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);
diff --git a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
index 2af2d9673b..9f97a07563 100644
--- a/OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
+++ b/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);
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java b/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
index 54b444ff30..789fc0aeb0 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomSheet.java
+++ b/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) {
- app.getSelectedGpxHelper().selectGpxFile(app.getSavingTrackHelper().getCurrentGpx(), isChecked, false);
+ public void onClick(View v) {
+ 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;