Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Redo elevation fix

Browse source
This commit is contained in:
androiddevkkotlin 2020-12-07 18:05:57 +02:00
parent 22816fb5fe
commit 5431fe4f74
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/layout/bottom_sheet_item_with_switch_and_dialog.xml
View file

@ -65,12 +65,12 @@
android:background="?attr/divider_color_basic" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/switchWidget"
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:clickable="true"
android:focusable="true"
android:clickable="false"
android:focusable="false"
android:paddingStart="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"

15
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
View file

@ -298,10 +298,8 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
final boolean active = !useHeightPref.getModeValue(applicationMode);
final View itemView = UiUtilities.getInflater(app, nightMode).inflate(
R.layout.bottom_sheet_item_with_switch_and_dialog, null, false);
final SwitchCompat switchButton = itemView.findViewById(R.id.switchWidget);
final SwitchCompat switchButton = itemView.findViewById(R.id.compound_button);
View itemsContainer = itemView.findViewById(R.id.selectable_list_item);
switchButton.setChecked(!active);
switchButton.setFocusable(false);
itemsContainer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -314,14 +312,17 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
}
});
switchButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
switchButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
applyParameter(item[0], parameter);
item[0].setDescription(getElevationDescription(parameter));
switchButton.setChecked(parameter.isSelected(settings));
}
});
item[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
.setChecked(!active)
.setCompoundButtonColorId(selectedModeColorId)
.setDescription(getElevationDescription(parameter))
.setIcon(getContentIcon(active ? parameter.getActiveIconId() : parameter.getDisabledIconId()))
@ -562,8 +563,8 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
builder.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
applyParameter(item[0], parameter);
}
applyParameter(item[0], parameter);
}
});
}
if (iconId != -1) {