Skip to content

Commit d873d8d

Browse files
committed
chore: Bump to material 1.13.0
1 parent d70b126 commit d873d8d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Compose/MaterialThemeFromXml/src/main/kotlin/com/infomaniak/core/compose/materialthemefromxml/MaterialThemeFromXml.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ import androidx.compose.ui.graphics.Color
2626
import androidx.compose.ui.platform.LocalContext
2727
import com.google.android.material.color.MaterialColors
2828
import com.google.android.material.R as RMaterial
29+
import androidx.appcompat.R as RAndroid
2930

3031
/**
3132
* Automatically defines the Jetpack Compose MaterialTheme based on the
3233
* values defined as an XML theme in the context where this is called.
3334
*/
3435
@Composable
3536
fun MaterialThemeFromXml(content: @Composable () -> Unit): Unit = with(LocalContext.current) {
36-
val primary = getMaterialColor(RMaterial.attr.colorPrimary)
37+
val primary = getMaterialColor(RAndroid.attr.colorPrimary)
3738

3839
MaterialTheme(
3940
colorScheme = ColorScheme(
@@ -50,7 +51,7 @@ fun MaterialThemeFromXml(content: @Composable () -> Unit): Unit = with(LocalCont
5051
onTertiary = getMaterialColor(RMaterial.attr.colorOnTertiary),
5152
tertiaryContainer = getMaterialColor(RMaterial.attr.colorTertiaryContainer),
5253
onTertiaryContainer = getMaterialColor(RMaterial.attr.colorOnTertiaryContainer),
53-
background = getMaterialColor(RMaterial.attr.background),
54+
background = getMaterialColor(RAndroid.attr.background),
5455
onBackground = getMaterialColor(RMaterial.attr.colorOnBackground),
5556
surface = getMaterialColor(RMaterial.attr.colorSurface),
5657
onSurface = getMaterialColor(RMaterial.attr.colorOnSurface),
@@ -61,7 +62,7 @@ fun MaterialThemeFromXml(content: @Composable () -> Unit): Unit = with(LocalCont
6162
surfaceTint = primary,
6263
inverseSurface = getMaterialColor(RMaterial.attr.colorSurfaceInverse),
6364
inverseOnSurface = getMaterialColor(RMaterial.attr.colorOnSurfaceInverse),
64-
error = getMaterialColor(RMaterial.attr.colorError),
65+
error = getMaterialColor(RAndroid.attr.colorError),
6566
onError = getMaterialColor(RMaterial.attr.colorOnError),
6667
errorContainer = getMaterialColor(RMaterial.attr.colorErrorContainer),
6768
onErrorContainer = getMaterialColor(RMaterial.attr.colorOnErrorContainer),

Legacy/Stores/src/main/java/com/infomaniak/core/legacy/stores/updaterequired/UpdateRequiredActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import android.view.ContextThemeWrapper
2424
import androidx.activity.addCallback
2525
import androidx.appcompat.app.AppCompatActivity
2626
import androidx.navigation.navArgs
27-
import com.google.android.material.R
2827
import com.google.android.material.button.MaterialButton
2928
import com.google.android.material.color.MaterialColors
3029
import com.infomaniak.core.legacy.stores.StoreUtils.goToAppStore
@@ -33,6 +32,7 @@ import com.infomaniak.core.legacy.stores.updatemanagers.InAppUpdateManager
3332
import com.infomaniak.core.legacy.utils.clearStack
3433
import com.infomaniak.core.legacy.utils.showToast
3534
import kotlin.system.exitProcess
35+
import androidx.appcompat.R as RAndroid
3636
import com.infomaniak.core.legacy.R as RCore
3737

3838
class UpdateRequiredActivity : AppCompatActivity() {
@@ -68,7 +68,7 @@ class UpdateRequiredActivity : AppCompatActivity() {
6868
}
6969

7070
private fun MaterialButton.getPrimaryColor(): Int {
71-
return MaterialColors.getColor(ContextThemeWrapper(context, theme), R.attr.colorPrimary, UNDEFINED_PRIMARY_COLOR)
71+
return MaterialColors.getColor(ContextThemeWrapper(context, theme), RAndroid.attr.colorPrimary, UNDEFINED_PRIMARY_COLOR)
7272
}
7373

7474
companion object {

gradle/core.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ktlintPlugin = "13.1.0"
2626
ktor = "3.2.3"
2727
lifecycleRuntimeKtx = "2.9.4"
2828
lottie = "6.6.10"
29-
material = "1.12.0"
29+
material = "1.13.0"
3030
matomo = "4.3.4"
3131
navigation = "2.9.5"
3232
okhttp = "4.12.0" # TODO: Update to 5.0.0 or later after we bump Kotlin to 2.2.0

0 commit comments

Comments
 (0)