diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/MainActivity.kt b/app/src/main/java/com/ericampire/android/androidstudycase/MainActivity.kt index a1ba745..223a95e 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/MainActivity.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/MainActivity.kt @@ -11,28 +11,28 @@ import androidx.compose.ui.tooling.preview.Preview import com.ericampire.android.androidstudycase.ui.theme.AndroidStudyCaseTheme class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - AndroidStudyCaseTheme { - // A surface container using the 'background' color from the theme - Surface(color = MaterialTheme.colors.background) { - Greeting("Android") - } - } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + AndroidStudyCaseTheme { + // A surface container using the 'background' color from the theme + Surface(color = MaterialTheme.colors.background) { + Greeting("Android") } + } } + } } @Composable fun Greeting(name: String) { - Text(text = "Hello $name!") + Text(text = "Hello $name!") } @Preview(showBackground = true) @Composable fun DefaultPreview() { - AndroidStudyCaseTheme { - Greeting("Android") - } + AndroidStudyCaseTheme { + Greeting("Android") + } } \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/app/App.kt b/app/src/main/java/com/ericampire/android/androidstudycase/app/App.kt index 643ba3e..9c2095b 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/app/App.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/app/App.kt @@ -5,7 +5,7 @@ import dagger.hilt.android.HiltAndroidApp @HiltAndroidApp class App : Application() { - override fun onCreate() { - super.onCreate() - } + override fun onCreate() { + super.onCreate() + } } \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Shape.kt b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Shape.kt index 7fac446..e36e512 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Shape.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Shape.kt @@ -5,7 +5,7 @@ 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) + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) ) \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Theme.kt b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Theme.kt index 107dee1..a4b3d9d 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Theme.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Theme.kt @@ -7,41 +7,41 @@ import androidx.compose.material.lightColors import androidx.compose.runtime.Composable private val DarkColorPalette = darkColors( - primary = Purple200, - primaryVariant = Purple700, - secondary = Teal200 + primary = Purple200, + primaryVariant = Purple700, + secondary = Teal200 ) private val LightColorPalette = lightColors( - primary = Purple500, - primaryVariant = Purple700, - secondary = Teal200 + primary = Purple500, + primaryVariant = Purple700, + secondary = Teal200 - /* Other default colors to override - background = Color.White, - surface = Color.White, - onPrimary = Color.White, - onSecondary = Color.Black, - onBackground = Color.Black, - onSurface = Color.Black, - */ + /* Other default colors to override + background = Color.White, + surface = Color.White, + onPrimary = Color.White, + onSecondary = Color.Black, + onBackground = Color.Black, + onSurface = Color.Black, + */ ) @Composable fun AndroidStudyCaseTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - content: @Composable() () -> Unit + darkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable() () -> Unit ) { - val colors = if (darkTheme) { - DarkColorPalette - } else { - LightColorPalette - } + val colors = if (darkTheme) { + DarkColorPalette + } else { + LightColorPalette + } - MaterialTheme( - colors = colors, - typography = Typography, - shapes = Shapes, - content = content - ) + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) } \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Type.kt b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Type.kt index 4d0ba31..80a2370 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Type.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/ui/theme/Type.kt @@ -6,23 +6,22 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -// Set of Material typography styles to start with val Typography = Typography( - body1 = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp - ) - /* Other default text styles to override - button = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.W500, - fontSize = 14.sp - ), - caption = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 12.sp - ) - */ + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ) + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ ) \ No newline at end of file diff --git a/versions.properties b/versions.properties index d4abd22..5d15cb5 100644 --- a/versions.properties +++ b/versions.properties @@ -7,13 +7,7 @@ #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file -plugin.android=7.0.0 -## # available=7.1.0-alpha01 -## # available=7.1.0-alpha02 -## # available=7.1.0-alpha03 -## # available=7.1.0-alpha04 -## # available=7.1.0-alpha05 -## # available=7.1.0-alpha06 +plugin.android=7.0.1 version.androidx.activity=1.3.0-alpha08 version.androidx.preference=1.1.1 version.androidx.appcompat=1.3.0