mirror/android-developer-roadmap
1
0
Fork 0
mirror of https://github.com/skydoves/android-developer-roadmap.git synced 2024-12-27 00:00:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

updated from material to material3

Browse source
This commit is contained in:
jaguhdeveloper@gmail.com 2024-01-11 18:08:21 +03:00
parent 7caef7df71
commit d55ecf72d5
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -41,7 +41,7 @@ android {
dependencies { dependencies {
implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.material3:material3"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version" implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation "androidx.compose.runtime:runtime:$compose_version" implementation "androidx.compose.runtime:runtime:$compose_version"

10
app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt
View file

@ -20,8 +20,8 @@ import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material.Surface import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
@ -42,7 +42,7 @@ class MainActivity : ComponentActivity() {
setContent { setContent {
AndroidDeveloperRoadmapTheme { AndroidDeveloperRoadmapTheme {
Surface( Surface(
color = MaterialTheme.colors.background color = MaterialTheme.colorScheme.background
) { ) {
AndroidRoadmap() AndroidRoadmap()
} }
@ -53,7 +53,7 @@ class MainActivity : ComponentActivity() {
@Composable @Composable
private fun AndroidRoadmap() { private fun AndroidRoadmap() {
val background = MaterialTheme.colors.background val background = MaterialTheme.colorScheme.background
CoilImage( CoilImage(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
@ -70,7 +70,7 @@ private fun AndroidRoadmap() {
) )
} }
@Preview(showBackground = true) @Preview(showBackground = true, showSystemUi = true)
@Composable @Composable
private fun DefaultPreview() { private fun DefaultPreview() {
AndroidDeveloperRoadmapTheme { AndroidDeveloperRoadmapTheme {

2
app/src/main/kotlin/io/getstream/androiddeveloperroadmap/ui/theme/Shape.kt
View file

@ -17,7 +17,7 @@
package io.getstream.androiddeveloperroadmap.ui.theme package io.getstream.androiddeveloperroadmap.ui.theme
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes import androidx.compose.material3.Shapes
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
val Shapes = Shapes( val Shapes = Shapes(

4
app/src/main/kotlin/io/getstream/androiddeveloperroadmap/ui/theme/Type.kt
View file

@ -16,7 +16,7 @@
package io.getstream.androiddeveloperroadmap.ui.theme package io.getstream.androiddeveloperroadmap.ui.theme
import androidx.compose.material.Typography import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
@ -24,7 +24,7 @@ import androidx.compose.ui.unit.sp
// Set of Material typography styles to start with // Set of Material typography styles to start with
val Typography = Typography( val Typography = Typography(
body1 = TextStyle( bodyLarge = TextStyle(
fontFamily = FontFamily.Default, fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
fontSize = 16.sp fontSize = 16.sp

2
build.gradle
View file

@ -2,7 +2,7 @@ buildscript {
ext { ext {
compose_version = '1.5.2' compose_version = '1.5.2'
compose_compiler_version = '1.5.3' compose_compiler_version = '1.5.3'
compose_activity_version = '1.7.2' compose_activity_version = '1.8.2'
landscapist_version = '2.2.10' landscapist_version = '2.2.10'
zoomable_version = '1.5.1' zoomable_version = '1.5.1'
} }