Skip to content

Commit

Permalink
Merge pull request #297 from NUmeroAndDev/dependabot/gradle/com.googl…
Browse files Browse the repository at this point in the history
…e.android.material-material-1.3.0-beta01

Bump material from 1.3.0-alpha04 to 1.3.0-beta01
  • Loading branch information
NUmeroAndDev authored Dec 17, 2020
2 parents 82c56da + 439d531 commit c417cfd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ class ProgressIndicatorFragment : MaterialContainerTransformFragment(R.layout.fr

val progressIndicatorSpec = CircularProgressIndicatorSpec(
requireContext(),
null
).apply {
indicatorInset = resources.getDimensionPixelSize(R.dimen.circular_progress_in_chip_indicator_inset)
indicatorSize = resources.getDimensionPixelSize(R.dimen.circular_progress_in_chip_indicator_size)
trackThickness = resources.getDimensionPixelSize(R.dimen.circular_progress_in_chip_track_thickness)
}
null,
0,
R.style.Widget_MaterialComponents_CircularProgressIndicator_ExtraSmall
)

val indeterminateDrawable = IndeterminateDrawable.createCircularDrawable(
requireContext(),
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
<dimen name="fab_margin">16dp</dimen>

<dimen name="nav_header_height">176dp</dimen>
<dimen name="circular_progress_in_chip_indicator_inset">2dp</dimen>
<dimen name="circular_progress_in_chip_indicator_size">20dp</dimen>
<dimen name="circular_progress_in_chip_track_thickness">2.5dp</dimen>

<dimen name="elevation_0dp">0dp</dimen>
<dimen name="elevation_2dp">2dp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ buildscript {
ext {

kotlin_version = '1.4.21'
material_version = '1.3.0-alpha04'
material_version = '1.3.0-beta01'

kotlinAndroid = [
stdlib: "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
Expand Down

0 comments on commit c417cfd

Please sign in to comment.