From 2c7819f524c4215543be042d936365c0d80f11cb Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 14 May 2025 09:41:23 +0200 Subject: [PATCH 1/3] imports --- .../src/main/java/de/cdaut/dbtapp/MainActivity.kt | 9 --------- .../java/de/cdaut/dbtapp/components/SkillsList.kt | 12 ------------ .../main/java/de/cdaut/dbtapp/components/Texts.kt | 2 -- .../main/java/de/cdaut/dbtapp/model/SkillCategory.kt | 1 - .../cdaut/dbtapp/navigation/BottomNavigationItem.kt | 1 - 5 files changed, 25 deletions(-) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt index 8e03061..5f5b8ef 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -1,24 +1,16 @@ package de.cdaut.dbtapp -import android.graphics.drawable.shapes.Shape import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.compose.foundation.Image -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Emergency -import androidx.compose.material3.Button -import androidx.compose.material3.ButtonColors -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold -import androidx.compose.material3.Shapes import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -28,7 +20,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import com.google.android.material.floatingactionbutton.FloatingActionButton import de.cdaut.dbtapp.components.BottomNavigationBar import de.cdaut.dbtapp.components.SkillsScreen import de.cdaut.dbtapp.navigation.Screens diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt index fd08295..2fd83d0 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/SkillsList.kt @@ -1,12 +1,7 @@ package de.cdaut.dbtapp.components -import androidx.annotation.StringRes import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable -import androidx.compose.foundation.gestures.ScrollableState -import androidx.compose.foundation.gestures.scrollable -import androidx.compose.foundation.interaction.Interaction import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize @@ -16,21 +11,16 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowDropDown import androidx.compose.material.icons.filled.ArrowDropUp -import androidx.compose.material.icons.filled.Star import androidx.compose.material.icons.outlined.Star import androidx.compose.material.icons.outlined.StarOutline -import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.Icon -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -38,12 +28,10 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.em import de.cdaut.dbtapp.R import de.cdaut.dbtapp.model.Skill import de.cdaut.dbtapp.model.SkillCategory diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Texts.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Texts.kt index 82d3988..e47c583 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Texts.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Texts.kt @@ -6,10 +6,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.sp @Preview diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/SkillCategory.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/SkillCategory.kt index c09483a..a81c9c9 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/SkillCategory.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/SkillCategory.kt @@ -1,6 +1,5 @@ package de.cdaut.dbtapp.model -import androidx.compose.foundation.layout.Arrangement enum class SkillCategory(val title: String, val skills: List = Skill.mockSkills()) { Mindfulness("Achtsamkeitsübungen"), diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt index 2d3bf49..8257e61 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt @@ -8,7 +8,6 @@ import androidx.compose.material.icons.filled.Checklist import androidx.compose.material.icons.filled.Home import androidx.compose.material.icons.outlined.Star import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalContext import androidx.core.content.ContextCompat.getString import de.cdaut.dbtapp.R From d432adc142b010bf56a6f7e22f167e85e6174beb Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 14 May 2025 09:42:00 +0200 Subject: [PATCH 2/3] navigation compose -> 2.9.0 --- DBTApp/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DBTApp/gradle/libs.versions.toml b/DBTApp/gradle/libs.versions.toml index b497618..71eb669 100644 --- a/DBTApp/gradle/libs.versions.toml +++ b/DBTApp/gradle/libs.versions.toml @@ -8,7 +8,7 @@ junitVersion = "1.2.1" espressoCore = "3.6.1" appcompat = "1.7.0" material = "1.12.0" -navigationCompose = "2.7.0-rc01" +navigationCompose = "2.9.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } From 004824636dc6b065ecff684d3e33a770c0cd6f1a Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 14 May 2025 09:49:06 +0200 Subject: [PATCH 3/3] add room as dependency --- DBTApp/.idea/codeStyles/Project.xml | 6 ++++++ DBTApp/app/build.gradle.kts | 7 +++++++ DBTApp/build.gradle.kts | 1 + DBTApp/gradle/libs.versions.toml | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml index 4bec4ea..7643783 100644 --- a/DBTApp/.idea/codeStyles/Project.xml +++ b/DBTApp/.idea/codeStyles/Project.xml @@ -1,5 +1,8 @@ + + + + \ No newline at end of file diff --git a/DBTApp/app/build.gradle.kts b/DBTApp/app/build.gradle.kts index a6ebec1..6a7b1a4 100644 --- a/DBTApp/app/build.gradle.kts +++ b/DBTApp/app/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) + id("com.google.devtools.ksp") } android { @@ -70,6 +71,12 @@ dependencies { //Compose navigation implementation(libs.androidx.navigation.compose) + //room (for AppDatabase) + implementation(libs.room.runtime) + ksp(libs.androidx.room.compiler) + implementation(libs.androidx.room.ktx) + + implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) implementation(libs.material) diff --git a/DBTApp/build.gradle.kts b/DBTApp/build.gradle.kts index b2c8728..8f68b77 100644 --- a/DBTApp/build.gradle.kts +++ b/DBTApp/build.gradle.kts @@ -3,4 +3,5 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.compose.compiler) apply false + id("com.google.devtools.ksp") version "2.0.21-1.0.27" apply false } \ No newline at end of file diff --git a/DBTApp/gradle/libs.versions.toml b/DBTApp/gradle/libs.versions.toml index 71eb669..54353f1 100644 --- a/DBTApp/gradle/libs.versions.toml +++ b/DBTApp/gradle/libs.versions.toml @@ -9,6 +9,9 @@ espressoCore = "3.6.1" appcompat = "1.7.0" material = "1.12.0" navigationCompose = "2.9.0" +roomCompiler = "2.7.1" +roomKtx = "2.7.1" +roomRuntime = "2.7.1" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } @@ -18,6 +21,9 @@ androidx-material-icons-core = { module = "androidx.compose.material:material-ic androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } androidx-material3 = { module = "androidx.compose.material3:material3" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } +androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomCompiler" } +androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomKtx" } +androidx-room-runtime = { module = "androidx.room:room-runtime" } androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" } androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } @@ -27,6 +33,7 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } +room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" }