AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Made chip ids unique in toolbar to avoid crash during orientation change since there is another 'rooms' id in the view hiearachy

Browse source
This commit is contained in:
alexzatsepin 2020-08-27 15:44:08 +03:00 • committed by Maksim Andrianov
parent 7209f3686c
commit f1b4e49705
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/layout/toolbar_filter_controls.xml
View file

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
app:chipSpacing="@dimen/margin_base">
<com.google.android.material.chip.Chip
android:id="@+id/choose_dates"
android:id="@+id/chip_choose_dates"
style="@style/MwmWidget.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -24,7 +24,7 @@
app:chipIcon="@drawable/ic_datepicker"
app:closeIcon="@drawable/ic_dropdown" />
<com.google.android.material.chip.Chip
android:id="@+id/rooms"
android:id="@+id/chip_rooms"
style="@style/MwmWidget.Chip.Action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
android/src/com/mapswithme/maps/widget/SearchToolbarController.java
View file

@ -177,8 +177,8 @@ public class SearchToolbarController extends ToolbarController
mFilterContainer = getToolbar().findViewById(R.id.filter_container);
if (mFilterContainer != null)
{
mChooseDatesChip = mFilterContainer.findViewById(R.id.choose_dates);
mRoomsChip = mFilterContainer.findViewById(R.id.rooms);
mChooseDatesChip = mFilterContainer.findViewById(R.id.chip_choose_dates);
mRoomsChip = mFilterContainer.findViewById(R.id.chip_rooms);
//noinspection ConstantConditions
mChooseDatesChip.setOnClickListener(mChooseDatesClickListener);
mChooseDatesChip.setOnCloseIconClickListener(mChooseDatesClickListener);