Merge branch 'develop' into Skrilltrax/develop

* develop:
  github: switch gradle-cache-action back to tag qualifier
  github: update actions in pull request workflow
  github: update automerge action
  gradle: silence warnings from beta options
  app: replace deprecated contentColor extension
  build: update Compose and Room
This commit is contained in:
Harsh Shandilya 2020-10-18 22:37:29 +05:30
commit 9f32f3a025
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
5 changed files with 14 additions and 11 deletions

View file

@ -17,7 +17,7 @@ package dev.msfjarvis.lobsters.compose.utils
import androidx.annotation.DrawableRes
import androidx.compose.foundation.Icon
import androidx.compose.foundation.contentColor
import androidx.compose.foundation.AmbientContentColor
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@ -28,7 +28,7 @@ import androidx.compose.ui.res.loadVectorResource
fun IconResource(
@DrawableRes resourceId: Int,
modifier: Modifier = Modifier,
tint: Color = contentColor()
tint: Color = AmbientContentColor.current
) {
val deferredResource = loadVectorResource(resourceId)
deferredResource.onLoadRun { asset ->