diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml index 7643783..4bec4ea 100644 --- a/DBTApp/.idea/codeStyles/Project.xml +++ b/DBTApp/.idea/codeStyles/Project.xml @@ -1,8 +1,5 @@ - - - - \ No newline at end of file diff --git a/DBTApp/app/build.gradle.kts b/DBTApp/app/build.gradle.kts index 6a7b1a4..a6ebec1 100644 --- a/DBTApp/app/build.gradle.kts +++ b/DBTApp/app/build.gradle.kts @@ -2,7 +2,6 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) - id("com.google.devtools.ksp") } android { @@ -71,12 +70,6 @@ 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/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt index 5f5b8ef..8e03061 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -1,16 +1,24 @@ 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 @@ -20,6 +28,7 @@ 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 2fd83d0..fd08295 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,7 +1,12 @@ 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 @@ -11,16 +16,21 @@ 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 @@ -28,10 +38,12 @@ 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 e47c583..82d3988 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,8 +6,10 @@ 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 a81c9c9..c09483a 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,5 +1,6 @@ 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 8257e61..2d3bf49 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,6 +8,7 @@ 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 diff --git a/DBTApp/build.gradle.kts b/DBTApp/build.gradle.kts index 8f68b77..b2c8728 100644 --- a/DBTApp/build.gradle.kts +++ b/DBTApp/build.gradle.kts @@ -3,5 +3,4 @@ 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 54353f1..b497618 100644 --- a/DBTApp/gradle/libs.versions.toml +++ b/DBTApp/gradle/libs.versions.toml @@ -8,10 +8,7 @@ junitVersion = "1.2.1" 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" +navigationCompose = "2.7.0-rc01" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } @@ -21,9 +18,6 @@ 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" } @@ -33,7 +27,6 @@ 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" }