owen/TVTime
1
0
Fork 0
mirror of https://github.com/owenlejeune/TVTime.git synced 2025-11-29 14:52:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

convert to m3

Browse Source
This commit is contained in:
Owen LeJeune
2022-02-09 11:58:56 -05:00
parent 82497157e0
commit a9e916abb9
10 changed files with 136 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt
View File

@@ -4,9 +4,7 @@ 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.material.Text
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
@@ -25,8 +23,7 @@ class MainActivity : ComponentActivity() {
fun MyApp() {
TVTimeTheme {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colors.background
modifier = Modifier.fillMaxSize()
) {
}

18
app/src/main/java/com/owenlejeune/tvtime/ui/theme/Shape.kt
View File

@@ -1,11 +1,11 @@
package com.owenlejeune.tvtime.ui.theme
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Shapes
import androidx.compose.ui.unit.dp
val Shapes = Shapes(
small = RoundedCornerShape(4.dp),
medium = RoundedCornerShape(4.dp),
large = RoundedCornerShape(0.dp)
)
//import androidx.compose.foundation.shape.RoundedCornerShape
//import androidx.compose.material.Shapes
//import androidx.compose.ui.unit.dp
//
//val Shapes = Shapes(
// small = RoundedCornerShape(4.dp),
// medium = RoundedCornerShape(4.dp),
// large = RoundedCornerShape(0.dp)
//)

21
app/src/main/java/com/owenlejeune/tvtime/ui/theme/Theme.kt
View File

@@ -1,21 +1,21 @@
package com.owenlejeune.tvtime.ui.theme
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.lightColorScheme
import androidx.compose.runtime.Composable
private val DarkColorPalette = darkColors(
private val DarkColorPalette = darkColorScheme(
primary = Purple200,
primaryVariant = Purple700,
secondary = Teal200
secondary = Purple700,
tertiary = Teal200
)
private val LightColorPalette = lightColors(
private val LightColorPalette = lightColorScheme(
primary = Purple500,
primaryVariant = Purple700,
secondary = Teal200
secondary = Purple700,
tertiary = Teal200
/* Other default colors to override
background = Color.White,
@@ -36,9 +36,8 @@ fun TVTimeTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable
}
MaterialTheme(
colors = colors,
colorScheme = colors,
typography = Typography,
shapes = Shapes,
content = content
)
}

4
app/src/main/java/com/owenlejeune/tvtime/ui/theme/Type.kt
View File

@@ -1,6 +1,6 @@
package com.owenlejeune.tvtime.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
@@ -8,7 +8,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