diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index e27fd75..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1fe83f5..252b4f2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") - implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation(platform("androidx.compose:compose-bom:2024.02.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-tooling-preview") @@ -62,7 +62,7 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") - androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.01")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/app/src/main/java/it/edu/cassandroferminervi/flowschool/MainActivity.kt b/app/src/main/java/it/edu/cassandroferminervi/flowschool/MainActivity.kt index dcca7af..d728f86 100644 --- a/app/src/main/java/it/edu/cassandroferminervi/flowschool/MainActivity.kt +++ b/app/src/main/java/it/edu/cassandroferminervi/flowschool/MainActivity.kt @@ -3,6 +3,9 @@ package it.edu.cassandroferminervi.flowschool import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.Surface +import androidx.compose.ui.Modifier import com.ramcosta.composedestinations.DestinationsNavHost import com.ramcosta.composedestinations.NavGraphs import it.edu.cassandroferminervi.flowschool.ui.theme.FlowSchoolTheme @@ -12,7 +15,11 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { FlowSchoolTheme { - DestinationsNavHost(navGraph = NavGraphs.root) + Surface( + modifier = Modifier.fillMaxSize() + ) { + DestinationsNavHost(navGraph = NavGraphs.root) + } } } } diff --git a/build.gradle.kts b/build.gradle.kts index 4645626..0db614e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.2" apply false + id("com.android.application") version "8.3.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a82b120..7764e5e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 21 15:30:24 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists