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

Update material library

Browse source
This commit is contained in:
Vitaliy 2020-09-16 18:03:57 +03:00
parent 4553732b59
commit b94be6c344
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/build.gradle
View file

@ -524,7 +524,7 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.2.0-beta01' implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.preference:preference:1.1.0'
implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs') implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')

5
OsmAnd/src/net/osmand/plus/UiUtilities.java
View file

@ -42,6 +42,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.widget.TintableCompoundButton; import androidx.core.widget.TintableCompoundButton;
import com.google.android.material.slider.LabelFormatter;
import com.google.android.material.slider.RangeSlider; import com.google.android.material.slider.RangeSlider;
import com.google.android.material.slider.Slider; import com.google.android.material.slider.Slider;
import com.google.android.material.snackbar.BaseTransientBottomBar; import com.google.android.material.snackbar.BaseTransientBottomBar;
@ -610,7 +611,7 @@ public class UiUtilities {
slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height)); slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height));
// label behavior // label behavior
slider.setLabelBehavior(Slider.LABEL_GONE); slider.setLabelBehavior(LabelFormatter.LABEL_GONE);
} }
public static void setupSlider(RangeSlider slider, boolean nightMode, public static void setupSlider(RangeSlider slider, boolean nightMode,
@ -650,7 +651,7 @@ public class UiUtilities {
slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height)); slider.setTrackHeight(ctx.getResources().getDimensionPixelSize(R.dimen.slider_track_height));
// label behavior // label behavior
slider.setLabelBehavior(Slider.LABEL_GONE); slider.setLabelBehavior(LabelFormatter.LABEL_GONE);
} }
public static void setupDialogButton(boolean nightMode, View buttonView, DialogButtonType buttonType, @StringRes int buttonTextId) { public static void setupDialogButton(boolean nightMode, View buttonView, DialogButtonType buttonType, @StringRes int buttonTextId) {