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

Fix compilation

Browse source
This commit is contained in:
Vitaliy 2020-08-10 19:09:44 +03:00
parent 9eb8dc66a7
commit 0afa59ee4e
4 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/plan_route_threshold_slider.xml
View file

@ -37,7 +37,6 @@
<com.google.android.material.slider.Slider <com.google.android.material.slider.Slider
android:id="@+id/slider" android:id="@+id/slider"
style="@style/Widget.Styled.Slider"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding" android:layout_marginRight="@dimen/content_padding"
android:layout_width="match_parent" android:layout_width="match_parent"

1
OsmAnd/res/layout/track_split_interval.xml
View file

@ -96,7 +96,6 @@
<com.google.android.material.slider.Slider <com.google.android.material.slider.Slider
android:id="@+id/split_slider" android:id="@+id/split_slider"
style="@style/Widget.Styled.Slider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"

1
OsmAnd/res/layout/track_width_card.xml
View file

@ -95,7 +95,6 @@
<com.google.android.material.slider.Slider <com.google.android.material.slider.Slider
android:id="@+id/width_slider" android:id="@+id/width_slider"
style="@style/Widget.Styled.Slider"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/content_padding" android:layout_marginLeft="@dimen/content_padding"

2
OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java
View file

@ -79,7 +79,7 @@ public class CustomColorBottomSheet extends MenuBottomSheetDialogFragment implem
} }
private View createPickerView() { private View createPickerView() {
LayoutInflater themedInflater = UiUtilities.getMaterialInflater(getActivity(), nightMode); LayoutInflater themedInflater = UiUtilities.getInflater(getActivity(), nightMode);
View colorView = themedInflater.inflate(R.layout.custom_color_picker, null); View colorView = themedInflater.inflate(R.layout.custom_color_picker, null);
colorPicker = colorView.findViewById(R.id.color_picker_view); colorPicker = colorView.findViewById(R.id.color_picker_view);
newColorPanel = colorView.findViewById(R.id.color_panel_new); newColorPanel = colorView.findViewById(R.id.color_panel_new);