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

Merge d6dbeb82ed into 6563acc5d1

Browse source
This commit is contained in:
jaguh geraldoh 2024-01-17 09:32:10 -07:00 committed by GitHub
parent 6563acc5d1 d6dbeb82ed
commit 88a23aebac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 46 additions and 24 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 {
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:$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.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
@ -42,7 +42,7 @@ class MainActivity : ComponentActivity() {
setContent {
AndroidDeveloperRoadmapTheme {
Surface(
color = MaterialTheme.colors.background
color = MaterialTheme.colorScheme.background
) {
AndroidRoadmap()
}
@ -53,7 +53,7 @@ class MainActivity : ComponentActivity() {
@Composable
private fun AndroidRoadmap() {
val background = MaterialTheme.colors.background
val background = MaterialTheme.colorScheme.background
CoilImage(
modifier = Modifier
.fillMaxSize()
@ -70,7 +70,7 @@ private fun AndroidRoadmap() {
)
}
@Preview(showBackground = true)
@Preview(showBackground = true, showSystemUi = true)
@Composable
private fun DefaultPreview() {
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
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes
import androidx.compose.material3.Shapes
import androidx.compose.ui.unit.dp
val Shapes = Shapes(

50
app/src/main/kotlin/io/getstream/androiddeveloperroadmap/ui/theme/Theme.kt
View file

@ -16,37 +16,59 @@
package io.getstream.androiddeveloperroadmap.ui.theme
import android.app.Activity
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
import androidx.compose.material.darkColors
import androidx.compose.material.lightColors
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat
private val DarkColorPalette = darkColors(
private val DarkColorScheme = darkColorScheme(
primary = Purple200,
primaryVariant = Purple700,
secondary = Teal200
secondary = Purple700,
tertiary = Teal200
)
private val LightColorPalette = lightColors(
private val LightColorScheme = lightColorScheme(
primary = Purple500,
primaryVariant = Purple700,
secondary = Teal200
secondary = Purple700,
tertiary = Teal200
)
@Composable
fun AndroidDeveloperRoadmapTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
dynamicColor: Boolean = true,
content: @Composable () -> Unit
) {
val colors = if (darkTheme) {
DarkColorPalette
} else {
LightColorPalette
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}
darkTheme -> DarkColorScheme
else -> LightColorScheme
}
val view = LocalView.current
if (!view.isInEditMode) {
SideEffect {
val window = (view.context as Activity).window
window.statusBarColor = colorScheme.primary.toArgb()
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
}
}
MaterialTheme(
colors = colors,
colorScheme = colorScheme,
typography = Typography,
shapes = Shapes,
content = content

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

@ -16,7 +16,7 @@
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.font.FontFamily
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
val Typography = Typography(
body1 = TextStyle(
bodyLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp

2
build.gradle
View file

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