diff --git a/app/build.gradle b/app/build.gradle index c73dc1f..989d012 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,13 +47,18 @@ android { } dependencies { + constraints { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") + } + } implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.activity:activity-compose:1.6.1' implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" - implementation 'androidx.compose.material3:material3:1.0.0-alpha11' + implementation 'androidx.compose.material3:material3:1.1.0-alpha07' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' @@ -62,4 +67,6 @@ dependencies { debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0" + + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' } \ No newline at end of file diff --git a/app/src/main/java/com/jumrukovski/quotescompose/MainActivity.kt b/app/src/main/java/com/jumrukovski/quotescompose/MainActivity.kt index 55eaf21..e2060dc 100644 --- a/app/src/main/java/com/jumrukovski/quotescompose/MainActivity.kt +++ b/app/src/main/java/com/jumrukovski/quotescompose/MainActivity.kt @@ -19,12 +19,13 @@ import com.jumrukovski.quotescompose.ui.theme.* class MainActivity : ComponentActivity() { + @OptIn(ExperimentalMaterial3Api::class) @Composable private fun Toolbar() { - SmallTopAppBar( + TopAppBar( modifier = Modifier.background(MaterialTheme.colorScheme.PrimaryBackgroundColor), title = { Text(stringResource(R.string.app_name)) }, - colors = TopAppBarDefaults.smallTopAppBarColors( + colors = TopAppBarDefaults.topAppBarColors( containerColor = MaterialTheme.colorScheme.PrimaryBackgroundColor, scrolledContainerColor = MaterialTheme.colorScheme.PrimaryBackgroundColor, navigationIconContentColor = MaterialTheme.colorScheme.PrimaryTextColor, @@ -81,7 +82,6 @@ class MainActivity : ComponentActivity() { ) } - @OptIn(ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { diff --git a/build.gradle b/build.gradle index 73a52db..0bcc9cb 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.1' apply false - id 'com.android.library' version '7.4.1' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.0' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c8017d..896c3f7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 03 00:42:28 CET 2023 +#Mon Mar 06 03:02:57 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME