From 5b9d2b756b56e99666784ff08b93384986d7364e Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Tue, 13 May 2025 23:11:36 +0200 Subject: [PATCH 01/22] make skills cards expandable --- DBTApp/.idea/codeStyles/Project.xml | 117 ++++++++++++++++++ DBTApp/.idea/codeStyles/codeStyleConfig.xml | 5 + .../de/cdaut/dbtapp/components/SkillsList.kt | 34 ++++- DBTApp/app/src/main/res/values-de/strings.xml | 1 + DBTApp/app/src/main/res/values/strings.xml | 1 + 5 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 DBTApp/.idea/codeStyles/Project.xml create mode 100644 DBTApp/.idea/codeStyles/codeStyleConfig.xml diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..4bec4ea --- /dev/null +++ b/DBTApp/.idea/codeStyles/Project.xml @@ -0,0 +1,117 @@ + + + + + + \ No newline at end of file diff --git a/DBTApp/.idea/codeStyles/codeStyleConfig.xml b/DBTApp/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/DBTApp/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file 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 3f93d07..38a51de 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,5 +1,6 @@ package de.cdaut.dbtapp.components +import androidx.annotation.StringRes import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable @@ -21,6 +22,8 @@ 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 @@ -66,17 +69,36 @@ private fun SkillsCategoryCardPrev() { @Composable fun SkillsCategoryCard(skills: List, title: String) { + var enabled by remember { + mutableStateOf(false) + } + Card( Modifier .fillMaxWidth() .padding(10.dp) ) { - TitleText( - modifier = Modifier.padding(10.dp), - content = title - ) - skills.forEach { skill -> - SingleSkillCard(skill.title, skill.description) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxWidth() + ) { + TitleText( + modifier = Modifier.padding(10.dp), + content = title + ) + Icon( + modifier = Modifier + .padding(5.dp) + .clickable(onClick = { enabled = !enabled }), + imageVector = if (enabled) Icons.Filled.ArrowDropUp else Icons.Filled.ArrowDropDown, + contentDescription = stringResource(R.string.desc_btn_expand) + ) + } + if (enabled) { + skills.forEach { skill -> + SingleSkillCard(skill.title, skill.description) + } } } } diff --git a/DBTApp/app/src/main/res/values-de/strings.xml b/DBTApp/app/src/main/res/values-de/strings.xml index e45a695..bcd3ea3 100644 --- a/DBTApp/app/src/main/res/values-de/strings.xml +++ b/DBTApp/app/src/main/res/values-de/strings.xml @@ -8,4 +8,5 @@ Skillsketten Notfallknopf Favorisieren Button + Ausklappen \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values/strings.xml b/DBTApp/app/src/main/res/values/strings.xml index 51849cb..8a63e78 100644 --- a/DBTApp/app/src/main/res/values/strings.xml +++ b/DBTApp/app/src/main/res/values/strings.xml @@ -7,4 +7,5 @@ Skills Chains Emergency Button Favourte Button + Expand \ No newline at end of file From 1203b5735a08d8869ead73d5cb302ca183323219 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Tue, 13 May 2025 23:14:36 +0200 Subject: [PATCH 02/22] smol UX fix --- .../main/java/de/cdaut/dbtapp/components/SkillsList.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 38a51de..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 @@ -81,16 +81,17 @@ fun SkillsCategoryCard(skills: List, title: String) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, - modifier = Modifier.fillMaxWidth() - ) { + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = { enabled = !enabled }), + ) { TitleText( modifier = Modifier.padding(10.dp), content = title ) Icon( modifier = Modifier - .padding(5.dp) - .clickable(onClick = { enabled = !enabled }), + .padding(5.dp), imageVector = if (enabled) Icons.Filled.ArrowDropUp else Icons.Filled.ArrowDropDown, contentDescription = stringResource(R.string.desc_btn_expand) ) From 2c7819f524c4215543be042d936365c0d80f11cb Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 14 May 2025 09:41:23 +0200 Subject: [PATCH 03/22] 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 04/22] 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 05/22] 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" } From f45f1cc77bfccb29ecdb1170a18a957c83db2a2c Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 14 May 2025 12:55:07 +0200 Subject: [PATCH 06/22] database setup --- DBTApp/app/build.gradle.kts | 3 ++ .../de.cdaut.dbtapp.model.AppDatabase/1.json | 43 +++++++++++++++++++ .../java/de/cdaut/dbtapp/model/AppDatabase.kt | 9 ++++ .../main/java/de/cdaut/dbtapp/model/Skill.kt | 34 ++++++++++++++- 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 DBTApp/app/schemas/de.cdaut.dbtapp.model.AppDatabase/1.json create mode 100644 DBTApp/app/src/main/java/de/cdaut/dbtapp/model/AppDatabase.kt diff --git a/DBTApp/app/build.gradle.kts b/DBTApp/app/build.gradle.kts index 6a7b1a4..067653a 100644 --- a/DBTApp/app/build.gradle.kts +++ b/DBTApp/app/build.gradle.kts @@ -38,6 +38,9 @@ android { buildFeatures { compose = true } + ksp { + arg("room.schemaLocation", "$projectDir/schemas") + } } dependencies { diff --git a/DBTApp/app/schemas/de.cdaut.dbtapp.model.AppDatabase/1.json b/DBTApp/app/schemas/de.cdaut.dbtapp.model.AppDatabase/1.json new file mode 100644 index 0000000..41d6ad0 --- /dev/null +++ b/DBTApp/app/schemas/de.cdaut.dbtapp.model.AppDatabase/1.json @@ -0,0 +1,43 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "9293dc46eca03d297eae6183174db499", + "entities": [ + { + "tableName": "Skill", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`identifier` BLOB NOT NULL, `title` TEXT NOT NULL, `description` TEXT NOT NULL, PRIMARY KEY(`identifier`))", + "fields": [ + { + "fieldPath": "identifier", + "columnName": "identifier", + "affinity": "BLOB", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "identifier" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9293dc46eca03d297eae6183174db499')" + ] + } +} \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/AppDatabase.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/AppDatabase.kt new file mode 100644 index 0000000..241064d --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/AppDatabase.kt @@ -0,0 +1,9 @@ +package de.cdaut.dbtapp.model + +import androidx.room.Database +import androidx.room.RoomDatabase + +@Database(entities = [Skill::class], version = 1) +abstract class AppDatabase : RoomDatabase() { + abstract fun skillDao() : SkillDao +} \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt index 612c86a..0528f62 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt @@ -1,24 +1,56 @@ package de.cdaut.dbtapp.model -class Skill(val title: String, val description: String) { +import androidx.room.ColumnInfo +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Entity +import androidx.room.Insert +import androidx.room.PrimaryKey +import androidx.room.Query +import java.util.UUID + +@Entity +class Skill( + @PrimaryKey val identifier: UUID, + @ColumnInfo(name = "title") val title: String, + @ColumnInfo(name = "description") val description: String +) { companion object { fun mockSkills(): List { return listOf( Skill( + identifier = UUID.randomUUID(), title = "Test Hallo :3", description = "lorem ipsum dolor sid amnet consequetur blabla yada yada" ), Skill( + identifier = UUID.randomUUID(), title = "5-4-3-2-1", description = "Hier kurz beschreiben wie die Übung funktioniert. Ggf. mehrere Zeilen aber nicht super lang" ), Skill( + identifier = UUID.randomUUID(), title = "UwU UwU awawawa", description = "Just arf a little like the good fopsgirl you are :3" ) ) } } +} + +@Dao +interface SkillDao { + @Query("SELECT * FROM Skill") + fun getAll(): List + + @Query("SELECT * FROM Skill WHERE title LIKE :title LIMIT 1") + fun findByName(title: String): Skill + + @Insert + fun insertAll(vararg skills: Skill) + + @Delete + fun delete(skill: Skill) } \ No newline at end of file From 5c653f5dceba5ca053d7ade41027a6ebbfe0e91d Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Mon, 26 May 2025 14:10:18 +0200 Subject: [PATCH 07/22] agp update --- 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 54353f1..a8aaf7f 100644 --- a/DBTApp/gradle/libs.versions.toml +++ b/DBTApp/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] activityCompose = "1.10.1" -agp = "8.9.2" +agp = "8.10.0" kotlin = "2.0.21" coreKtx = "1.16.0" junit = "4.13.2" From a1d0e46bfed6c16eb8a19342d79345361f7200f3 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Thu, 29 May 2025 15:04:11 +0200 Subject: [PATCH 08/22] began implementing calendar --- DBTApp/.idea/codeStyles/Project.xml | 35 ++++++++ .../main/java/de/cdaut/dbtapp/MainActivity.kt | 4 +- .../de/cdaut/dbtapp/components/Tracking.kt | 79 +++++++++++++++++++ .../java/de/cdaut/dbtapp/util/DateHelpers.kt | 16 ++++ 4 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt create mode 100644 DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml index 7643783..7f70f7e 100644 --- a/DBTApp/.idea/codeStyles/Project.xml +++ b/DBTApp/.idea/codeStyles/Project.xml @@ -1,5 +1,40 @@ + + + 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..b78a40d 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -22,6 +22,7 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import de.cdaut.dbtapp.components.BottomNavigationBar import de.cdaut.dbtapp.components.SkillsScreen +import de.cdaut.dbtapp.components.TrackingScreen import de.cdaut.dbtapp.navigation.Screens class MainActivity : ComponentActivity() { @@ -49,7 +50,7 @@ private fun MainContent() { modifier = Modifier.padding(paddingValues = paddingValues) ) { composable(Screens.Tracking.route) { - Text("Tracking") + TrackingScreen() } composable(Screens.Skillslist.route) { SkillsScreen() @@ -70,7 +71,6 @@ private fun MainContent() { } } -@Preview @Composable private fun EmergencyButton() { FloatingActionButton( diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt new file mode 100644 index 0000000..5b81a30 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -0,0 +1,79 @@ +package de.cdaut.dbtapp.components + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ChevronLeft +import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material3.DatePicker +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDatePickerState +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.tooling.preview.Preview +import de.cdaut.dbtapp.util.WeekdayListByLocale + +@Composable +fun TrackingScreen() { + TopCalendar() +} + +@OptIn(ExperimentalMaterial3Api::class) +@Preview +@Composable +private fun DatePickerPreview() { + val datePickerState = rememberDatePickerState() + DatePicker(datePickerState) +} + +@Preview +@Composable +private fun TopCalendarPrev() { + Box(Modifier.background(Color.White)) { + TopCalendar() + } +} + +@Composable +private fun TopCalendar() { + Column { + //Top Navigation and display items + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text(text = "currentDate") + Row { + Icon( + modifier = Modifier.clickable(onClick = {}), + imageVector = Icons.Filled.ChevronLeft, + contentDescription = "TODO: Provide" + ) + + Icon( + modifier = Modifier.clickable(onClick = {}), + imageVector = Icons.Filled.ChevronRight, + contentDescription = "TODO: Provide" + ) + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + for (label in WeekdayListByLocale()) { + Text(text = label) + } + } + } +} diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt new file mode 100644 index 0000000..528d4fd --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt @@ -0,0 +1,16 @@ +package de.cdaut.dbtapp.util + +import java.time.DayOfWeek +import java.time.format.TextStyle +import java.time.temporal.WeekFields +import java.util.Locale + +fun WeekdayListByLocale(): List { + val locale = Locale.getDefault() + val listOfDayNames = DayOfWeek.entries.map { it.getDisplayName(TextStyle.NARROW, locale).substring(0, 1) } + val firstDayOfWeek = WeekFields.of(locale).firstDayOfWeek.ordinal + val orderedListOfDayNames = + listOfDayNames.subList(firstDayOfWeek, 7) + listOfDayNames.subList(0, firstDayOfWeek) + + return orderedListOfDayNames +} From 8350ef65b5df7f37101a5eeb75b54e13f49bc484 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Thu, 29 May 2025 18:58:58 +0200 Subject: [PATCH 09/22] working calendar!!! --- .../de/cdaut/dbtapp/components/Tracking.kt | 126 +++++++++++++++--- .../java/de/cdaut/dbtapp/util/DateHelpers.kt | 3 +- 2 files changed, 105 insertions(+), 24 deletions(-) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 5b81a30..971fdbd 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -6,36 +6,44 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight -import androidx.compose.material3.DatePicker -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.Text -import androidx.compose.material3.rememberDatePickerState import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview -import de.cdaut.dbtapp.util.WeekdayListByLocale +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.em +import de.cdaut.dbtapp.util.weekdayListByLocale +import java.time.LocalDate +import java.time.format.DateTimeFormatter +import java.time.format.FormatStyle +import java.time.temporal.WeekFields @Composable fun TrackingScreen() { TopCalendar() } -@OptIn(ExperimentalMaterial3Api::class) -@Preview -@Composable -private fun DatePickerPreview() { - val datePickerState = rememberDatePickerState() - DatePicker(datePickerState) -} -@Preview +@Preview(device = "id:pixel_5", locale = "de") @Composable private fun TopCalendarPrev() { Box(Modifier.background(Color.White)) { @@ -45,35 +53,109 @@ private fun TopCalendarPrev() { @Composable private fun TopCalendar() { - Column { + + var currentDate: LocalDate by remember { + mutableStateOf(LocalDate.now()) + } + + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { //Top Navigation and display items Row( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .padding(10.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween ) { - Text(text = "currentDate") + //Header stating the currently selected date + Text( + fontSize = 4.5.em, + text = currentDate.format( + DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG) + .withLocale(LocalConfiguration.current.locales[0]) + ) + ) + // arrows to switch month Row { Icon( - modifier = Modifier.clickable(onClick = {}), + modifier = Modifier + .clickable(onClick = { + currentDate = currentDate.minusMonths(1) + }) + .size(30.dp), imageVector = Icons.Filled.ChevronLeft, contentDescription = "TODO: Provide" ) Icon( - modifier = Modifier.clickable(onClick = {}), + modifier = Modifier + .clickable(onClick = { + currentDate = currentDate.plusMonths(1) + }) + .size(30.dp), imageVector = Icons.Filled.ChevronRight, contentDescription = "TODO: Provide" ) } } + + // labels for current day Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween + modifier = Modifier + .fillMaxWidth() + .padding(10.dp), + horizontalArrangement = Arrangement.SpaceBetween, ) { - for (label in WeekdayListByLocale()) { - Text(text = label) + weekdayListByLocale(LocalConfiguration.current.locales[0]).map { label -> + Text( + text = label, + modifier = Modifier.padding(10.dp), + textAlign = TextAlign.Center, + fontWeight = FontWeight.Bold + ) + } + } + + CalendarDaysGrid(currentDate) + } +} + +@Composable +fun CalendarDaysGrid(date: LocalDate, modifier: Modifier = Modifier) { + val locale = LocalConfiguration.current.locales[0] + + val firstDayOfMonth = LocalDate.of(date.year, date.month, 1) + val totalDaysInMonth = firstDayOfMonth.lengthOfMonth() + val firstDayOfWeek = WeekFields.of(locale).firstDayOfWeek + + //calculate shift required in the beginning + val shift = (firstDayOfMonth.dayOfWeek.value - firstDayOfWeek.value + 7) % 7 + val totalCells = ((shift + totalDaysInMonth + 6) / 7) * 7 + + val days = List(totalCells) { index -> + val dayNumber = index - shift + 1 + if (dayNumber in 1..totalDaysInMonth) dayNumber else null + } + + // Calendar Grid + LazyVerticalGrid( + columns = GridCells.Fixed(7), + userScrollEnabled = false, + modifier = Modifier.fillMaxWidth() + ) { + items(days.size) { index -> + Box( + modifier = Modifier + .aspectRatio(1f) + .padding(4.dp), + contentAlignment = Alignment.Center + ) { + days[index]?.let { + Text(text = it.toString()) + } } } } -} +} \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt index 528d4fd..03d52b9 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt @@ -5,8 +5,7 @@ import java.time.format.TextStyle import java.time.temporal.WeekFields import java.util.Locale -fun WeekdayListByLocale(): List { - val locale = Locale.getDefault() +fun weekdayListByLocale(locale: Locale): List { val listOfDayNames = DayOfWeek.entries.map { it.getDisplayName(TextStyle.NARROW, locale).substring(0, 1) } val firstDayOfWeek = WeekFields.of(locale).firstDayOfWeek.ordinal val orderedListOfDayNames = From b22c82de0062e824fb98177aec45634382f39d36 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Fri, 30 May 2025 13:04:26 +0200 Subject: [PATCH 10/22] worked on calendar --- .../main/java/de/cdaut/dbtapp/MainActivity.kt | 53 +++++++++--------- .../de/cdaut/dbtapp/components/Tracking.kt | 55 +++++++++++++------ 2 files changed, 67 insertions(+), 41 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 b78a40d..60d09ec 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -10,6 +10,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Emergency import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -38,33 +39,35 @@ class MainActivity : ComponentActivity() { @Composable private fun MainContent() { val navController = rememberNavController() - Box { - Scaffold( - modifier = Modifier.fillMaxSize(), - bottomBar = { BottomNavigationBar(navController) }, - floatingActionButton = { EmergencyButton() } - ) { paddingValues -> - NavHost( - navController = navController, - startDestination = Screens.Home.route, - modifier = Modifier.padding(paddingValues = paddingValues) - ) { - composable(Screens.Tracking.route) { - TrackingScreen() - } - composable(Screens.Skillslist.route) { - SkillsScreen() - } - composable(Screens.Home.route) { - Text("Home") - } - composable(Screens.Favourites.route) { - Text("Favourites") + MaterialTheme { + Box { + Scaffold( + modifier = Modifier.fillMaxSize(), + bottomBar = { BottomNavigationBar(navController) }, + floatingActionButton = { EmergencyButton() } + ) { paddingValues -> + NavHost( + navController = navController, + startDestination = Screens.Home.route, + modifier = Modifier.padding(paddingValues = paddingValues) + ) { + composable(Screens.Tracking.route) { + TrackingScreen() + } + composable(Screens.Skillslist.route) { + SkillsScreen() + } + composable(Screens.Home.route) { + Text("Home") + } + composable(Screens.Favourites.route) { + Text("Favourites") - } - composable(Screens.Skillschains.route) { - Text("Skillschains") + } + composable(Screens.Skillschains.route) { + Text("Skillschains") + } } } } diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 971fdbd..f3d8a96 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -1,6 +1,7 @@ package de.cdaut.dbtapp.components import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -12,16 +13,17 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue +import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -54,10 +56,11 @@ private fun TopCalendarPrev() { @Composable private fun TopCalendar() { - var currentDate: LocalDate by remember { + var currentDateMut: MutableState = remember { mutableStateOf(LocalDate.now()) } + Column( horizontalAlignment = Alignment.CenterHorizontally ) { @@ -72,7 +75,7 @@ private fun TopCalendar() { //Header stating the currently selected date Text( fontSize = 4.5.em, - text = currentDate.format( + text = currentDateMut.value.format( DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG) .withLocale(LocalConfiguration.current.locales[0]) ) @@ -82,7 +85,7 @@ private fun TopCalendar() { Icon( modifier = Modifier .clickable(onClick = { - currentDate = currentDate.minusMonths(1) + currentDateMut.value = currentDateMut.value.minusMonths(1) }) .size(30.dp), imageVector = Icons.Filled.ChevronLeft, @@ -92,7 +95,7 @@ private fun TopCalendar() { Icon( modifier = Modifier .clickable(onClick = { - currentDate = currentDate.plusMonths(1) + currentDateMut.value = currentDateMut.value.plusMonths(1) }) .size(30.dp), imageVector = Icons.Filled.ChevronRight, @@ -118,15 +121,16 @@ private fun TopCalendar() { } } - CalendarDaysGrid(currentDate) + CalendarDaysGrid(currentDateMut) } } @Composable -fun CalendarDaysGrid(date: LocalDate, modifier: Modifier = Modifier) { +fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifier = Modifier) { val locale = LocalConfiguration.current.locales[0] + val selectedDate = selectedDateMut.value - val firstDayOfMonth = LocalDate.of(date.year, date.month, 1) + val firstDayOfMonth = LocalDate.of(selectedDate.year, selectedDate.month, 1) val totalDaysInMonth = firstDayOfMonth.lengthOfMonth() val firstDayOfWeek = WeekFields.of(locale).firstDayOfWeek @@ -146,14 +150,33 @@ fun CalendarDaysGrid(date: LocalDate, modifier: Modifier = Modifier) { modifier = Modifier.fillMaxWidth() ) { items(days.size) { index -> - Box( - modifier = Modifier + days[index]?.let { day -> + + var dayBoxModifier = Modifier .aspectRatio(1f) - .padding(4.dp), - contentAlignment = Alignment.Center - ) { - days[index]?.let { - Text(text = it.toString()) + .padding(4.dp) + .clickable(onClick = { + selectedDateMut.value = LocalDate.of( + selectedDate.year, + selectedDate.month, + day + ) + }) + + //add a mark to the currently selected day + if (day == selectedDate.dayOfMonth) { + dayBoxModifier = dayBoxModifier.border( + 2.dp, + MaterialTheme.colorScheme.primaryContainer, + CircleShape + ) + } + + Box( + modifier = dayBoxModifier, + contentAlignment = Alignment.Center + ) { + Text(text = day.toString()) } } } From c6dd2c633bc60f94086d92d61621a0d61c5f3f0a Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Fri, 30 May 2025 17:44:06 +0200 Subject: [PATCH 11/22] some colors and correct clipping --- DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt | 3 +-- .../src/main/java/de/cdaut/dbtapp/components/Tracking.kt | 7 ++++++- 2 files changed, 7 insertions(+), 3 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 60d09ec..b1d66d8 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -15,7 +15,6 @@ import androidx.compose.material3.Scaffold 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.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.navigation.compose.NavHost @@ -78,7 +77,7 @@ private fun MainContent() { private fun EmergencyButton() { FloatingActionButton( onClick = {}, - containerColor = Color.Red + containerColor = MaterialTheme.colorScheme.error ) { Icon( imageVector = Icons.Filled.Emergency, diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index f3d8a96..4074c2c 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -26,6 +26,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember 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.platform.LocalConfiguration import androidx.compose.ui.text.font.FontWeight @@ -84,6 +85,7 @@ private fun TopCalendar() { Row { Icon( modifier = Modifier + .clip(CircleShape) .clickable(onClick = { currentDateMut.value = currentDateMut.value.minusMonths(1) }) @@ -94,6 +96,7 @@ private fun TopCalendar() { Icon( modifier = Modifier + .clip(CircleShape) .clickable(onClick = { currentDateMut.value = currentDateMut.value.plusMonths(1) }) @@ -153,8 +156,9 @@ fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifie days[index]?.let { day -> var dayBoxModifier = Modifier - .aspectRatio(1f) .padding(4.dp) + .clip(CircleShape) + .aspectRatio(1f) .clickable(onClick = { selectedDateMut.value = LocalDate.of( selectedDate.year, @@ -162,6 +166,7 @@ fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifie day ) }) + .clip(CircleShape) //add a mark to the currently selected day if (day == selectedDate.dayOfMonth) { From 45085cdba4fb93f2100d5474b81debac8a9071f8 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Fri, 30 May 2025 18:46:22 +0200 Subject: [PATCH 12/22] worked on tracking screen --- .../de/cdaut/dbtapp/components/Tracking.kt | 88 ++++++++++++++++--- DBTApp/app/src/main/res/values-de/strings.xml | 2 + DBTApp/app/src/main/res/values/strings.xml | 2 + 3 files changed, 80 insertions(+), 12 deletions(-) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 4074c2c..d10917f 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -7,16 +7,23 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio +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.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -27,31 +34,55 @@ import androidx.compose.runtime.remember 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.platform.LocalConfiguration +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign 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.util.weekdayListByLocale import java.time.LocalDate import java.time.format.DateTimeFormatter import java.time.format.FormatStyle import java.time.temporal.WeekFields +@Preview @Composable fun TrackingScreen() { - TopCalendar() -} - - -@Preview(device = "id:pixel_5", locale = "de") -@Composable -private fun TopCalendarPrev() { - Box(Modifier.background(Color.White)) { - TopCalendar() + Column( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight() + .background(MaterialTheme.colorScheme.background), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Column( + modifier = Modifier + .fillMaxWidth(0.9f), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Spacer(modifier = Modifier.height(20.dp)) + Card( + ) { + TopCalendar() + } + Spacer(modifier = Modifier.height(10.dp)) + Button( + onClick = { + //TODO: Add diary card here + }, + modifier = Modifier.fillMaxWidth(), + ) { + Icon(Icons.Filled.Add, stringResource(R.string.btn_add_diarycard)) + Text(stringResource(R.string.btn_add_diarycard)) + } + Spacer(modifier = Modifier.height(10.dp)) + TitledListCard(stringResource(R.string.card_therapy_hw_heading)) + } } + } @Composable @@ -129,7 +160,7 @@ private fun TopCalendar() { } @Composable -fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifier = Modifier) { +fun CalendarDaysGrid(selectedDateMut: MutableState) { val locale = LocalConfiguration.current.locales[0] val selectedDate = selectedDateMut.value @@ -172,7 +203,7 @@ fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifie if (day == selectedDate.dayOfMonth) { dayBoxModifier = dayBoxModifier.border( 2.dp, - MaterialTheme.colorScheme.primaryContainer, + MaterialTheme.colorScheme.onPrimaryContainer, CircleShape ) } @@ -186,4 +217,37 @@ fun CalendarDaysGrid(selectedDateMut: MutableState, modifier: Modifie } } } +} + +@Composable +fun TitledListCard(title: String) { + Card( + modifier = Modifier.fillMaxWidth() + ) { + Column { + Row( + modifier = Modifier + .padding(10.dp) + .fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium + ) + Icon( + modifier = Modifier + .size(30.dp) + .clip(CircleShape) + .clickable(onClick = { + //TODO: Add Therapiehausaufgabe + }), + imageVector = Icons.Filled.Add, + contentDescription = "TODO: Provide" + ) + } + HorizontalDivider() + } + } } \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values-de/strings.xml b/DBTApp/app/src/main/res/values-de/strings.xml index bcd3ea3..e110037 100644 --- a/DBTApp/app/src/main/res/values-de/strings.xml +++ b/DBTApp/app/src/main/res/values-de/strings.xml @@ -9,4 +9,6 @@ Notfallknopf Favorisieren Button Ausklappen + Diary Card Hinzufügen + Therapiehausaufgaben \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values/strings.xml b/DBTApp/app/src/main/res/values/strings.xml index 8a63e78..76afc25 100644 --- a/DBTApp/app/src/main/res/values/strings.xml +++ b/DBTApp/app/src/main/res/values/strings.xml @@ -8,4 +8,6 @@ Emergency Button Favourte Button Expand + Add Diary Card + Therapy Assignments \ No newline at end of file From 869d6881b4032bf5b54fb0301102906631641f3f Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Fri, 30 May 2025 20:11:35 +0200 Subject: [PATCH 13/22] Added button to jump to todays date --- .../java/de/cdaut/dbtapp/components/Tracking.kt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index d10917f..7ea7a0a 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -14,11 +14,13 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.CalendarMonth import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight import androidx.compose.material3.Button @@ -113,7 +115,19 @@ private fun TopCalendar() { ) ) // arrows to switch month - Row { + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + modifier = Modifier + .clip(CircleShape) + .clickable(onClick = { + currentDateMut.value = LocalDate.now() + }), + imageVector = Icons.Filled.CalendarMonth, + contentDescription = "//TODO: Provide" + ) + Spacer(modifier = Modifier.width(10.dp)) Icon( modifier = Modifier .clip(CircleShape) From f76ec4189123437a3cdb1228c8dcfbdd8882ed7f Mon Sep 17 00:00:00 2001 From: Milo Date: Mon, 2 Jun 2025 16:34:24 +0200 Subject: [PATCH 14/22] AGP update --- DBTApp/.idea/deploymentTargetSelector.xml | 15 --------------- DBTApp/.idea/misc.xml | 1 + DBTApp/gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/DBTApp/.idea/deploymentTargetSelector.xml b/DBTApp/.idea/deploymentTargetSelector.xml index 2a7a811..b268ef3 100644 --- a/DBTApp/.idea/deploymentTargetSelector.xml +++ b/DBTApp/.idea/deploymentTargetSelector.xml @@ -5,21 +5,6 @@ - - - - - - - - - - \ No newline at end of file diff --git a/DBTApp/.idea/misc.xml b/DBTApp/.idea/misc.xml index b2c751a..74dd639 100644 --- a/DBTApp/.idea/misc.xml +++ b/DBTApp/.idea/misc.xml @@ -1,3 +1,4 @@ + diff --git a/DBTApp/gradle/libs.versions.toml b/DBTApp/gradle/libs.versions.toml index a8aaf7f..86e7f11 100644 --- a/DBTApp/gradle/libs.versions.toml +++ b/DBTApp/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] activityCompose = "1.10.1" -agp = "8.10.0" +agp = "8.10.1" kotlin = "2.0.21" coreKtx = "1.16.0" junit = "4.13.2" From 70acdc756a66b8e035381fcd3487efcaae82c640 Mon Sep 17 00:00:00 2001 From: Milo Date: Mon, 2 Jun 2025 21:53:59 +0200 Subject: [PATCH 15/22] worked on tracking screen --- DBTApp/.idea/misc.xml | 1 - .../de/cdaut/dbtapp/components/Tracking.kt | 93 ++++++++++++++++++- .../cdaut/dbtapp/model/TherapyAssignment.kt | 35 +++++++ DBTApp/app/src/main/res/values-de/strings.xml | 2 + DBTApp/app/src/main/res/values/strings.xml | 2 + 5 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt diff --git a/DBTApp/.idea/misc.xml b/DBTApp/.idea/misc.xml index 74dd639..b2c751a 100644 --- a/DBTApp/.idea/misc.xml +++ b/DBTApp/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 7ea7a0a..5bd9d04 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -23,12 +23,16 @@ import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.CalendarMonth import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight +import androidx.compose.material.icons.filled.DataExploration +import androidx.compose.material.icons.filled.RemoveRedEye import androidx.compose.material3.Button import androidx.compose.material3.Card +import androidx.compose.material3.Checkbox import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.VerticalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -44,6 +48,7 @@ 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.TherapyAssignment.Companion.mockTherapyAssignments import de.cdaut.dbtapp.util.weekdayListByLocale import java.time.LocalDate import java.time.format.DateTimeFormatter @@ -66,11 +71,69 @@ fun TrackingScreen() { horizontalAlignment = Alignment.CenterHorizontally ) { Spacer(modifier = Modifier.height(20.dp)) - Card( - ) { + Card { TopCalendar() } Spacer(modifier = Modifier.height(10.dp)) + Row( + modifier = Modifier + .fillMaxWidth() + .background( + color = MaterialTheme.colorScheme.primary, + shape = CircleShape + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Row( + modifier = Modifier + .padding(10.dp) + .padding(horizontal = 10.dp, vertical = 0.dp) + .clickable(onClick = { + //TODO: Add tracker + }), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Start + ) { + Icon( + Icons.Filled.Add, + contentDescription = "//TODO: Provide", + tint = MaterialTheme.colorScheme.onPrimary + ) + Text( + text = stringResource(R.string.add_trackter), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onPrimary + ) + } + VerticalDivider( + modifier = Modifier + .fillMaxHeight(0.1f) + .padding(5.dp) + ) + Row( + modifier = Modifier + .padding(10.dp) + .padding(horizontal = 10.dp, vertical = 0.dp) + .clickable(onClick = { + //TODO: Add tracker + }), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Start + ) { + Text( + modifier = Modifier.padding(horizontal = 5.dp), + text = stringResource(R.string.view_stats), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onPrimary + ) + Icon( + Icons.Filled.RemoveRedEye, + contentDescription = "//TODO: Provide", + tint = MaterialTheme.colorScheme.onPrimary + ) + } + } Button( onClick = { //TODO: Add diary card here @@ -262,6 +325,32 @@ fun TitledListCard(title: String) { ) } HorizontalDivider() + for (assignment in mockTherapyAssignments()) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = assignment.title, + style = MaterialTheme.typography.bodyMedium + ) + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = assignment.description, + style = MaterialTheme.typography.bodySmall + ) + } + Checkbox( + onCheckedChange = { + assignment.done = !assignment.done + }, + checked = assignment.done + ) + } + } } } } \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt new file mode 100644 index 0000000..4c54dfb --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt @@ -0,0 +1,35 @@ +package de.cdaut.dbtapp.model + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import java.util.UUID + +@Entity +class TherapyAssignment( + @PrimaryKey val identifier: UUID, + @ColumnInfo(name = "title") val title: String, + @ColumnInfo(name = "description") val description: String, + @ColumnInfo(name = "done") var done: Boolean +) { + + companion object { + fun mockTherapyAssignments(): List { + return listOf( + TherapyAssignment( + identifier = UUID.randomUUID(), + title = "Selbstfürsorge", + description = "Mir selbst eine gute Sache tun", + done = false + ), + TherapyAssignment( + identifier = UUID.randomUUID(), + title = "Bedürfnis durchsetzen", + description = "Eine Sache durchsetzen, die mir schwer fällt", + done = false + ) + ) + } + } + +} \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values-de/strings.xml b/DBTApp/app/src/main/res/values-de/strings.xml index e110037..315bb4d 100644 --- a/DBTApp/app/src/main/res/values-de/strings.xml +++ b/DBTApp/app/src/main/res/values-de/strings.xml @@ -11,4 +11,6 @@ Ausklappen Diary Card Hinzufügen Therapiehausaufgaben + Tracker hinzufügen + Statistiken \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values/strings.xml b/DBTApp/app/src/main/res/values/strings.xml index 76afc25..2daf59e 100644 --- a/DBTApp/app/src/main/res/values/strings.xml +++ b/DBTApp/app/src/main/res/values/strings.xml @@ -10,4 +10,6 @@ Expand Add Diary Card Therapy Assignments + Add Tracker + View Statistics \ No newline at end of file From 50fba5f6978b8774be03b51b937dafc7fbe5dc04 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 4 Jun 2025 00:07:08 +0200 Subject: [PATCH 16/22] worked on trackers screen --- .../de/cdaut/dbtapp/components/Tracking.kt | 167 +++++++++++------- .../main/java/de/cdaut/dbtapp/model/Skill.kt | 5 +- .../cdaut/dbtapp/model/TherapyAssignment.kt | 6 +- .../java/de/cdaut/dbtapp/model/Tracker.kt | 26 +++ DBTApp/app/src/main/res/values-de/strings.xml | 1 + DBTApp/app/src/main/res/values/strings.xml | 1 + 6 files changed, 135 insertions(+), 71 deletions(-) create mode 100644 DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Tracker.kt diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 5bd9d04..36e4916 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -23,7 +23,6 @@ import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.CalendarMonth import androidx.compose.material.icons.filled.ChevronLeft import androidx.compose.material.icons.filled.ChevronRight -import androidx.compose.material.icons.filled.DataExploration import androidx.compose.material.icons.filled.RemoveRedEye import androidx.compose.material3.Button import androidx.compose.material3.Card @@ -32,7 +31,6 @@ import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.VerticalDivider import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -48,14 +46,17 @@ 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.TherapyAssignment import de.cdaut.dbtapp.model.TherapyAssignment.Companion.mockTherapyAssignments +import de.cdaut.dbtapp.model.Tracker +import de.cdaut.dbtapp.model.Tracker.Companion.mockTrackers import de.cdaut.dbtapp.util.weekdayListByLocale import java.time.LocalDate import java.time.format.DateTimeFormatter import java.time.format.FormatStyle import java.time.temporal.WeekFields -@Preview +@Preview(device = "id:pixel_6") @Composable fun TrackingScreen() { Column( @@ -63,6 +64,8 @@ fun TrackingScreen() { .fillMaxWidth() .fillMaxHeight() .background(MaterialTheme.colorScheme.background), + //TODO: Scrolling is fucked up + //.verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally ) { Column( @@ -77,23 +80,14 @@ fun TrackingScreen() { Spacer(modifier = Modifier.height(10.dp)) Row( modifier = Modifier - .fillMaxWidth() - .background( - color = MaterialTheme.colorScheme.primary, - shape = CircleShape - ), + .fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween + horizontalArrangement = Arrangement.SpaceEvenly ) { - Row( - modifier = Modifier - .padding(10.dp) - .padding(horizontal = 10.dp, vertical = 0.dp) - .clickable(onClick = { - //TODO: Add tracker - }), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Start + Button( + onClick = { + //TODO: Add tracker + } ) { Icon( Icons.Filled.Add, @@ -106,20 +100,11 @@ fun TrackingScreen() { color = MaterialTheme.colorScheme.onPrimary ) } - VerticalDivider( - modifier = Modifier - .fillMaxHeight(0.1f) - .padding(5.dp) - ) - Row( - modifier = Modifier - .padding(10.dp) - .padding(horizontal = 10.dp, vertical = 0.dp) - .clickable(onClick = { - //TODO: Add tracker - }), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Start + + Button( + onClick = { + //TODO: View statistics + } ) { Text( modifier = Modifier.padding(horizontal = 5.dp), @@ -144,7 +129,29 @@ fun TrackingScreen() { Text(stringResource(R.string.btn_add_diarycard)) } Spacer(modifier = Modifier.height(10.dp)) - TitledListCard(stringResource(R.string.card_therapy_hw_heading)) + TitledListCard( + stringResource(R.string.card_therapy_hw_heading), + rows = { + //TODO: This can probably be typed better… + assignments -> + TherapyAssignmentCardContent(assignments) + }, + addAction = { + //TODO: Add Therapy assignment + }, + items = mockTherapyAssignments() + ) + + Spacer(modifier = Modifier.height(10.dp)) + + TitledListCard( + stringResource(R.string.tracker_card_title), + rows = { trackers -> OtherTrackersCardContent(trackers = trackers) }, + addAction = { + //TODO: Add new tracker + }, + items = mockTrackers() + ) } } @@ -237,7 +244,7 @@ private fun TopCalendar() { } @Composable -fun CalendarDaysGrid(selectedDateMut: MutableState) { +private fun CalendarDaysGrid(selectedDateMut: MutableState) { val locale = LocalConfiguration.current.locales[0] val selectedDate = selectedDateMut.value @@ -297,7 +304,12 @@ fun CalendarDaysGrid(selectedDateMut: MutableState) { } @Composable -fun TitledListCard(title: String) { +private fun TitledListCard( + title: String, + rows: @Composable Function1, Unit>, + addAction: () -> Unit, + items: List +) { Card( modifier = Modifier.fillMaxWidth() ) { @@ -317,39 +329,68 @@ fun TitledListCard(title: String) { modifier = Modifier .size(30.dp) .clip(CircleShape) - .clickable(onClick = { - //TODO: Add Therapiehausaufgabe - }), + .clickable(onClick = addAction), imageVector = Icons.Filled.Add, contentDescription = "TODO: Provide" ) } HorizontalDivider() - for (assignment in mockTherapyAssignments()) { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween, - ) { - Column { - Text( - modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), - text = assignment.title, - style = MaterialTheme.typography.bodyMedium - ) - Text( - modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), - text = assignment.description, - style = MaterialTheme.typography.bodySmall - ) - } - Checkbox( - onCheckedChange = { - assignment.done = !assignment.done - }, - checked = assignment.done - ) - } + rows(items) + } + } +} + +@Composable +private fun TherapyAssignmentCardContent(assignments: List) { + for (assignment in assignments) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = assignment.title, + style = MaterialTheme.typography.bodyMedium + ) + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = assignment.description, + style = MaterialTheme.typography.bodySmall + ) + } + Checkbox( + onCheckedChange = { + assignment.done = !assignment.done + }, + checked = assignment.done + ) + } + } +} + +@Composable +private fun OtherTrackersCardContent(trackers: List) { + for (tracker in trackers) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(5.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Column { + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = tracker.title, + style = MaterialTheme.typography.bodyMedium + ) + Text( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 0.dp), + text = tracker.description, + style = MaterialTheme.typography.bodySmall + ) } } } diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt index 0528f62..7dbdeed 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt @@ -11,7 +11,7 @@ import java.util.UUID @Entity class Skill( - @PrimaryKey val identifier: UUID, + @PrimaryKey val identifier: UUID = UUID.randomUUID(), @ColumnInfo(name = "title") val title: String, @ColumnInfo(name = "description") val description: String ) { @@ -21,17 +21,14 @@ class Skill( fun mockSkills(): List { return listOf( Skill( - identifier = UUID.randomUUID(), title = "Test Hallo :3", description = "lorem ipsum dolor sid amnet consequetur blabla yada yada" ), Skill( - identifier = UUID.randomUUID(), title = "5-4-3-2-1", description = "Hier kurz beschreiben wie die Übung funktioniert. Ggf. mehrere Zeilen aber nicht super lang" ), Skill( - identifier = UUID.randomUUID(), title = "UwU UwU awawawa", description = "Just arf a little like the good fopsgirl you are :3" ) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt index 4c54dfb..f336f48 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt @@ -7,7 +7,7 @@ import java.util.UUID @Entity class TherapyAssignment( - @PrimaryKey val identifier: UUID, + @PrimaryKey val identifier: UUID = UUID.randomUUID(), @ColumnInfo(name = "title") val title: String, @ColumnInfo(name = "description") val description: String, @ColumnInfo(name = "done") var done: Boolean @@ -17,13 +17,11 @@ class TherapyAssignment( fun mockTherapyAssignments(): List { return listOf( TherapyAssignment( - identifier = UUID.randomUUID(), title = "Selbstfürsorge", description = "Mir selbst eine gute Sache tun", - done = false + done = true ), TherapyAssignment( - identifier = UUID.randomUUID(), title = "Bedürfnis durchsetzen", description = "Eine Sache durchsetzen, die mir schwer fällt", done = false diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Tracker.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Tracker.kt new file mode 100644 index 0000000..4cb59d1 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Tracker.kt @@ -0,0 +1,26 @@ +package de.cdaut.dbtapp.model + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import java.util.UUID + +@Entity +class Tracker( + @PrimaryKey val identifier: UUID = UUID.randomUUID(), + @ColumnInfo(name = "title") val title: String, + @ColumnInfo(name = "description") val description: String +) { + + companion object { + fun mockTrackers(): List { + return listOf( + Tracker( + title = "Stimmung", + description = "Deine aktuelle Stimmung" + ) + ) + } + } + +} \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values-de/strings.xml b/DBTApp/app/src/main/res/values-de/strings.xml index 315bb4d..c9fb175 100644 --- a/DBTApp/app/src/main/res/values-de/strings.xml +++ b/DBTApp/app/src/main/res/values-de/strings.xml @@ -13,4 +13,5 @@ Therapiehausaufgaben Tracker hinzufügen Statistiken + Tracker \ No newline at end of file diff --git a/DBTApp/app/src/main/res/values/strings.xml b/DBTApp/app/src/main/res/values/strings.xml index 2daf59e..2833231 100644 --- a/DBTApp/app/src/main/res/values/strings.xml +++ b/DBTApp/app/src/main/res/values/strings.xml @@ -12,4 +12,5 @@ Therapy Assignments Add Tracker View Statistics + Trackers \ No newline at end of file From c23650704576af130ffdef9e2e54755319785651 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 4 Jun 2025 01:02:01 +0200 Subject: [PATCH 17/22] comments --- .../src/main/java/de/cdaut/dbtapp/components/Tracking.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index 36e4916..cdd11e5 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -131,10 +131,9 @@ fun TrackingScreen() { Spacer(modifier = Modifier.height(10.dp)) TitledListCard( stringResource(R.string.card_therapy_hw_heading), - rows = { - //TODO: This can probably be typed better… - assignments -> - TherapyAssignmentCardContent(assignments) + //cannot eta reduce because + //Function References of @Composable functions are not currently supported + rows = { assignments -> TherapyAssignmentCardContent(assignments) }, addAction = { //TODO: Add Therapy assignment @@ -146,6 +145,8 @@ fun TrackingScreen() { TitledListCard( stringResource(R.string.tracker_card_title), + //cannot eta reduce because + //Function References of @Composable functions are not currently supported rows = { trackers -> OtherTrackersCardContent(trackers = trackers) }, addAction = { //TODO: Add new tracker From 6092c8f5e3c659e9c6c22bfb0a0c7a5702bef316 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Wed, 4 Jun 2025 22:29:54 +0200 Subject: [PATCH 18/22] * fixed scrolling issue * fixed preview of main screen --- DBTApp/.idea/deploymentTargetSelector.xml | 11 +++++++++++ .../main/java/de/cdaut/dbtapp/MainActivity.kt | 6 ++++-- .../dbtapp/components/BottomNavigationBar.kt | 10 ++++++---- .../de/cdaut/dbtapp/components/Tracking.kt | 18 ++++++++++-------- .../dbtapp/navigation/BottomNavigationItem.kt | 17 +++++++++-------- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/DBTApp/.idea/deploymentTargetSelector.xml b/DBTApp/.idea/deploymentTargetSelector.xml index b268ef3..98d27f1 100644 --- a/DBTApp/.idea/deploymentTargetSelector.xml +++ b/DBTApp/.idea/deploymentTargetSelector.xml @@ -4,6 +4,17 @@ + + 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 b1d66d8..ac2261b 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -34,7 +34,7 @@ class MainActivity : ComponentActivity() { } } -@Preview(locale = "en-US") +@Preview(locale = "en-US", device = "id:pixel_6") @Composable private fun MainContent() { val navController = rememberNavController() @@ -76,7 +76,9 @@ private fun MainContent() { @Composable private fun EmergencyButton() { FloatingActionButton( - onClick = {}, + onClick = { + //TODO: Implement function for emergency Button + }, containerColor = MaterialTheme.colorScheme.error ) { Icon( diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/BottomNavigationBar.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/BottomNavigationBar.kt index 5513015..c1e92e2 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/BottomNavigationBar.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/BottomNavigationBar.kt @@ -19,17 +19,19 @@ import de.cdaut.dbtapp.navigation.BottomNavigationItem fun BottomNavigationBar(navController: NavController) { var context = LocalContext.current //remember the currently selected view + //default view is home + val homeView = BottomNavigationItem() + .bottomNavigationItems() + .find { item -> item.label == "Home" }!!.idx var navigationSelectedItem by remember { mutableIntStateOf( - //default view is home - BottomNavigationItem().bottomNavigationItems(ctx = context) - .find { item -> item.label == "Home" }!!.idx + homeView ) } NavigationBar { //Create an entry in the bottom bar for each view - BottomNavigationItem().bottomNavigationItems(ctx = context).sortedBy { item -> item.idx } + BottomNavigationItem().bottomNavigationItems().sortedBy { item -> item.idx } .forEachIndexed { index, item -> NavigationBarItem( selected = index == navigationSelectedItem, diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt index cdd11e5..2f7c12d 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -17,7 +16,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.CalendarMonth @@ -61,11 +62,9 @@ import java.time.temporal.WeekFields fun TrackingScreen() { Column( modifier = Modifier + .verticalScroll(rememberScrollState()) .fillMaxWidth() - .fillMaxHeight() .background(MaterialTheme.colorScheme.background), - //TODO: Scrolling is fucked up - //.verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally ) { Column( @@ -133,7 +132,8 @@ fun TrackingScreen() { stringResource(R.string.card_therapy_hw_heading), //cannot eta reduce because //Function References of @Composable functions are not currently supported - rows = { assignments -> TherapyAssignmentCardContent(assignments) + rows = { assignments -> + TherapyAssignmentCardContent(assignments) }, addAction = { //TODO: Add Therapy assignment @@ -147,7 +147,7 @@ fun TrackingScreen() { stringResource(R.string.tracker_card_title), //cannot eta reduce because //Function References of @Composable functions are not currently supported - rows = { trackers -> OtherTrackersCardContent(trackers = trackers) }, + rows = { trackers -> OtherTrackersCardContent(trackers = List(4) { _ -> trackers[0] }) }, addAction = { //TODO: Add new tracker }, @@ -155,7 +155,6 @@ fun TrackingScreen() { ) } } - } @Composable @@ -263,10 +262,13 @@ private fun CalendarDaysGrid(selectedDateMut: MutableState) { } // Calendar Grid + // FIXME: Something better than a lazy grid would be good because scrolling LazyVerticalGrid( columns = GridCells.Fixed(7), userScrollEnabled = false, - modifier = Modifier.fillMaxWidth() + modifier = Modifier + .fillMaxWidth() + .height(320.dp) ) { items(days.size) { index -> days[index]?.let { day -> 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..cc69155 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 @@ -1,14 +1,14 @@ package de.cdaut.dbtapp.navigation -import android.content.Context import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.MenuBook import androidx.compose.material.icons.filled.CalendarToday import androidx.compose.material.icons.filled.Checklist import androidx.compose.material.icons.filled.Home import androidx.compose.material.icons.outlined.Star +import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector -import androidx.core.content.ContextCompat.getString +import androidx.compose.ui.res.stringResource import de.cdaut.dbtapp.R data class BottomNavigationItem( @@ -17,34 +17,35 @@ data class BottomNavigationItem( val route: String = "", val idx: Int = 0 ) { - fun bottomNavigationItems(ctx: Context): List { + @Composable + fun bottomNavigationItems(): List { return listOf( BottomNavigationItem( - label = getString(ctx, R.string.label_tracking), + label = stringResource(R.string.label_tracking), icon = Icons.Filled.CalendarToday, route = Screens.Tracking.route, idx = 0 ), BottomNavigationItem( - label = getString(ctx, R.string.label_skillslist), + label = stringResource(R.string.label_skillslist), icon = Icons.AutoMirrored.Filled.MenuBook, route = Screens.Skillslist.route, idx = 1 ), BottomNavigationItem( - label = getString(ctx, R.string.label_home), + label = stringResource(R.string.label_home), icon = Icons.Filled.Home, route = Screens.Home.route, idx = 2 ), BottomNavigationItem( - label = getString(ctx, R.string.label_favourites), + label = stringResource(R.string.label_favourites), icon = Icons.Outlined.Star, route = Screens.Favourites.route, idx = 3 ), BottomNavigationItem( - label = getString(ctx, R.string.label_skillschains), + label = stringResource(R.string.label_skillschains), icon = Icons.Filled.Checklist, route = Screens.Skillschains.route, idx = 4 From bdc3a50a533ed63004fbee384d786cbbcd67d7a0 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Thu, 5 Jun 2025 16:41:58 +0200 Subject: [PATCH 19/22] fixed favouriting problem --- .../de/cdaut/dbtapp/components/SkillsList.kt | 40 +++++++++++++------ .../main/java/de/cdaut/dbtapp/model/Skill.kt | 14 +++---- 2 files changed, 35 insertions(+), 19 deletions(-) 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..0c2d722 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 @@ -3,6 +3,7 @@ package de.cdaut.dbtapp.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -12,12 +13,13 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding 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.outlined.Star +import androidx.compose.material.icons.filled.Star import androidx.compose.material.icons.outlined.StarOutline import androidx.compose.material3.Card import androidx.compose.material3.Icon @@ -28,6 +30,7 @@ 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 @@ -72,7 +75,7 @@ fun SkillsCategoryCard(skills: List, title: String) { modifier = Modifier .fillMaxWidth() .clickable(onClick = { enabled = !enabled }), - ) { + ) { TitleText( modifier = Modifier.padding(10.dp), content = title @@ -129,16 +132,29 @@ private fun SingleSkillCard(title: String, description: String) { DescriptionText(description) } - Icon( - modifier = Modifier - .padding(10.dp) - .clickable(onClick = { - selected = !selected - }), - imageVector = if (selected) Icons.Outlined.Star else Icons.Outlined.StarOutline, - contentDescription = stringResource(R.string.desc_btn_fav), - tint = if (selected) Color.Yellow else Color.Black - ) + Box( + modifier = Modifier.clip(CircleShape), + contentAlignment = Alignment.Center + ) { + if (selected) { + Icon( + modifier = Modifier.clip(CircleShape), + imageVector = Icons.Filled.Star, + contentDescription = "Filled Star", + tint = Color.Yellow + ) + } + Icon( + modifier = Modifier + .clip(CircleShape) + .padding(10.dp) + .clickable(onClick = { + selected = !selected + }), + imageVector = Icons.Outlined.StarOutline, + contentDescription = stringResource(R.string.desc_btn_fav) + ) + } } } \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt index 7dbdeed..23dad64 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skill.kt @@ -21,17 +21,17 @@ class Skill( fun mockSkills(): List { return listOf( Skill( - title = "Test Hallo :3", - description = "lorem ipsum dolor sid amnet consequetur blabla yada yada" + title = "5-4-3-2-1", + description = "5 sehen, 5 hören, 5 fühlen, 4 sehen, 4 hören…" ), Skill( - title = "5-4-3-2-1", + title = "Skilltitel", description = "Hier kurz beschreiben wie die Übung funktioniert. Ggf. mehrere Zeilen aber nicht super lang" ), - Skill( - title = "UwU UwU awawawa", - description = "Just arf a little like the good fopsgirl you are :3" - ) +// Skill( +// title = "UwU UwU awawawa", +// description = "Just arf a little like the good fopsgirl you are :3" +// ) ) } } From 972823c5b8c64c82a7f59b3e5c824fdf24135849 Mon Sep 17 00:00:00 2001 From: Clara Dautermann Date: Thu, 5 Jun 2025 17:44:44 +0200 Subject: [PATCH 20/22] search bar in skillslist --- DBTApp/.idea/deploymentTargetSelector.xml | 2 +- .../de/cdaut/dbtapp/components/SkillsList.kt | 48 +++++++++++++++++-- DBTApp/app/src/main/res/values-de/strings.xml | 2 + DBTApp/app/src/main/res/values/strings.xml | 2 + 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/DBTApp/.idea/deploymentTargetSelector.xml b/DBTApp/.idea/deploymentTargetSelector.xml index 98d27f1..3f4061e 100644 --- a/DBTApp/.idea/deploymentTargetSelector.xml +++ b/DBTApp/.idea/deploymentTargetSelector.xml @@ -4,7 +4,7 @@