diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7f70f7e --- /dev/null +++ b/DBTApp/.idea/codeStyles/Project.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + \ 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/.idea/deploymentTargetSelector.xml b/DBTApp/.idea/deploymentTargetSelector.xml index 2a7a811..2b60ed8 100644 --- a/DBTApp/.idea/deploymentTargetSelector.xml +++ b/DBTApp/.idea/deploymentTargetSelector.xml @@ -4,22 +4,18 @@ - - - - - - - - \ No newline at end of file diff --git a/DBTApp/app/build.gradle.kts b/DBTApp/app/build.gradle.kts index a6ebec1..067653a 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 { @@ -37,6 +38,9 @@ android { buildFeatures { compose = true } + ksp { + arg("room.schemaLocation", "$projectDir/schemas") + } } dependencies { @@ -70,6 +74,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/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/MainActivity.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt index 8e03061..36c2b54 100644 --- a/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/MainActivity.kt @@ -1,36 +1,30 @@ 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.MaterialTheme 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 -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource 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.FavouritesScreen +import de.cdaut.dbtapp.components.SkillsChainsScreen import de.cdaut.dbtapp.components.SkillsScreen +import de.cdaut.dbtapp.components.TrackingScreen import de.cdaut.dbtapp.navigation.Screens class MainActivity : ComponentActivity() { @@ -42,49 +36,52 @@ class MainActivity : ComponentActivity() { } } -@Preview(locale = "en-US") +@Preview(locale = "en-US", device = "id:pixel_6") @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) { - Text("Tracking") - } - 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) { + FavouritesScreen() - } - composable(Screens.Skillschains.route) { - Text("Skillschains") + } + composable(Screens.Skillschains.route) { + SkillsChainsScreen() + } } } } } } -@Preview @Composable private fun EmergencyButton() { FloatingActionButton( - onClick = {}, - containerColor = Color.Red + onClick = { + //TODO: Implement function for emergency Button + }, + containerColor = MaterialTheme.colorScheme.error ) { Icon( imageVector = Icons.Filled.Emergency, 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/Favourites.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Favourites.kt new file mode 100644 index 0000000..15bcf04 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Favourites.kt @@ -0,0 +1,136 @@ +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.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +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.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.PlayArrow +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.Icon +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.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 de.cdaut.dbtapp.R +import de.cdaut.dbtapp.model.Skill +import de.cdaut.dbtapp.model.SkillCategory + +@Preview +@Composable +fun FavouritesScreen() { + Column( + Modifier.verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally + ) { + RoundedSearchBar(onSearch = {}, stringResource(R.string.label_skills_search_bar)) + SkillCategory.entries.forEach { skillCategory -> + FavouritesCategoryCard(skillCategory) + } + } +} + +@Composable +private fun FavouritesCategoryCard(category: SkillCategory) { + var enabled by remember { + mutableStateOf(false) + } + + Card( + Modifier + .fillMaxWidth() + .padding(10.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = { enabled = !enabled }), + ) { + TitleText( + modifier = Modifier.padding(10.dp), + content = category.title + ) + Icon( + modifier = Modifier + .padding(5.dp), + imageVector = if (enabled) Icons.Filled.ArrowDropUp else Icons.Filled.ArrowDropDown, + contentDescription = stringResource(R.string.desc_btn_expand) + ) + } + if (enabled) { + category.skills.forEach { skill -> + SingleSkillCard(skill = skill) + } + } + } +} + +@Composable +private fun SingleSkillCard(skill: Skill) { + Row( + modifier = Modifier + .fillMaxWidth() + .height(IntrinsicSize.Min) + .background(Color.Transparent) + .padding(10.dp) + .background(Color.White, shape = RoundedCornerShape(5.dp)) + .padding(10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column( + modifier = Modifier + .fillMaxHeight() + .fillMaxWidth(fraction = 0.8f), + verticalArrangement = Arrangement.SpaceBetween, + + ) { + TitleText(skill.title) + Spacer(modifier = Modifier.height(10.dp)) + DescriptionText(skill.description) + } + + Button( + modifier = Modifier + .clip(CircleShape) + .size(50.dp), + contentPadding = PaddingValues(0.dp), + shape = CircleShape, + onClick = { + //TODO: Start Skill + } + ) { + Icon( + imageVector = Icons.Filled.PlayArrow, + contentDescription = "TODO: PROVIDE" + ) + } + + } +} \ No newline at end of file diff --git a/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Searchbar.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Searchbar.kt new file mode 100644 index 0000000..12e53d5 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Searchbar.kt @@ -0,0 +1,58 @@ +package de.cdaut.dbtapp.components + +import androidx.compose.foundation.text.input.rememberTextFieldState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Search +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.SearchBar +import androidx.compose.material3.SearchBarDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import de.cdaut.dbtapp.R + +@Preview +@Composable +private fun RoundedSearchBarPrev() { + RoundedSearchBar(onSearch = {}, stringResource(R.string.label_skills_search_bar)) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RoundedSearchBar(onSearch: (String) -> Unit = {}, placeholder: String) { + // Controls expansion state of the search bar + var expanded by rememberSaveable { mutableStateOf(false) } + var textFieldState = rememberTextFieldState() + + SearchBar( + inputField = { + SearchBarDefaults.InputField( + query = textFieldState.text.toString(), + onQueryChange = { textFieldState.edit { replace(0, length, it) } }, + onSearch = { + onSearch(textFieldState.text.toString()) + expanded = false + }, + expanded = expanded, + onExpandedChange = { expanded = it }, + leadingIcon = { + Icon( + Icons.Filled.Search, + contentDescription = stringResource(R.string.content_desc_search_bar) + ) + }, + placeholder = { Text(placeholder) } + ) + }, + expanded = expanded, + onExpandedChange = { expanded = it } + ) { + Text("Placeholder") + } +} \ 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..deb0593 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,9 @@ package de.cdaut.dbtapp.components 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.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -15,19 +12,17 @@ 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 @@ -40,7 +35,6 @@ 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 @@ -49,8 +43,10 @@ import de.cdaut.dbtapp.model.SkillCategory @Composable fun SkillsScreen() { Column( - Modifier.verticalScroll(rememberScrollState()) + Modifier.verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally ) { + RoundedSearchBar(onSearch = {}, stringResource(R.string.label_skills_search_bar)) SkillCategory.entries.forEach { skillCategory -> SkillsCategoryCard(skillCategory.skills, skillCategory.title) Spacer(Modifier.height(5.dp)) @@ -58,7 +54,6 @@ fun SkillsScreen() { } } -@Preview @Composable private fun SkillsCategoryCardPrev() { SkillsCategoryCard(Skill.mockSkills(), "Skill") @@ -66,22 +61,41 @@ 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() + .clickable(onClick = { enabled = !enabled }), + ) { + TitleText( + modifier = Modifier.padding(10.dp), + content = title + ) + Icon( + modifier = Modifier + .padding(5.dp), + 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) + } } } } -@Preview @Composable private fun SingleSkillsCardPreview() { SingleSkillCard( @@ -118,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/components/Skillschains.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Skillschains.kt new file mode 100644 index 0000000..a4762c2 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Skillschains.kt @@ -0,0 +1,167 @@ +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.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +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.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.Add +import androidx.compose.material.icons.filled.ArrowDropDown +import androidx.compose.material.icons.filled.ArrowDropUp +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material3.Button +import androidx.compose.material3.Card +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.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.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 de.cdaut.dbtapp.R +import de.cdaut.dbtapp.model.Skill +import de.cdaut.dbtapp.model.Skillschain +import de.cdaut.dbtapp.model.Skillschain.Companion.mockSkillschains + +@Preview +@Composable +fun SkillsChainsScreen() { + Column( + Modifier.verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally + ) { + RoundedSearchBar(onSearch = {}, stringResource(R.string.label_skillschains_search_bar)) + + Spacer(Modifier.height(10.dp)) + + AddSkillschainBtn() + + mockSkillschains().forEach { + SkillschainCard(skillschain = it) + } + } +} + +@Composable +private fun AddSkillschainBtn(modifier: Modifier = Modifier) { + Button( + onClick = { + //TODO: Add Skillschain + }, + modifier = Modifier.fillMaxWidth(0.9f) + ) { + Icon( + imageVector = Icons.Filled.Add, + contentDescription = "//TODO: Provide" + ) + Text(stringResource(R.string.btn_add_skillschain)) + } +} + +@Composable +fun SkillschainCard(modifier: Modifier = Modifier, skillschain: Skillschain) { + + var open by remember { + mutableStateOf(false) + } + + Card( + Modifier + .fillMaxWidth() + .padding(10.dp) + .background(MaterialTheme.colorScheme.primaryContainer, CircleShape) + ) { + Column { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + TitleText( + modifier = Modifier.padding(10.dp), + content = skillschain.title + ) + Row( + modifier = Modifier + .padding(10.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Button( + modifier = Modifier + .clip(CircleShape) + .size(50.dp), + contentPadding = PaddingValues(0.dp), + shape = CircleShape, + onClick = { + //TODO: Start Skills Chain + } + ) { + Icon( + imageVector = Icons.Filled.PlayArrow, + contentDescription = "TODO: PROVIDE" + ) + } + + Icon( + modifier = Modifier + .padding(5.dp) + .clickable(onClick = { open = !open }), + imageVector = if (open) Icons.Filled.ArrowDropUp else Icons.Filled.ArrowDropDown, + contentDescription = stringResource(R.string.desc_btn_expand) + ) + } + } + if (open) { + skillschain.skills.forEach { + SkillCard(skill = it) + } + } + } + } +} + +@Composable +fun SkillCard(modifier: Modifier = Modifier, skill: Skill) { + Row( + modifier = Modifier + .fillMaxWidth() + .background(Color.Transparent) + .padding(10.dp) + .background(Color.White, shape = RoundedCornerShape(5.dp)) + .padding(10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column( + modifier = Modifier + .fillMaxHeight() + .fillMaxWidth(), + verticalArrangement = Arrangement.SpaceBetween, + + ) { + TitleText(skill.title) + Spacer(modifier = Modifier.height(10.dp)) + DescriptionText(skill.description) + } + } +} \ No newline at end of file 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/components/Tracking.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt new file mode 100644 index 0000000..2f7c12d --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/components/Tracking.kt @@ -0,0 +1,400 @@ +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 +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.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.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 +import androidx.compose.material.icons.filled.ChevronLeft +import androidx.compose.material.icons.filled.ChevronRight +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.runtime.Composable +import androidx.compose.runtime.MutableState +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.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.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(device = "id:pixel_6") +@Composable +fun TrackingScreen() { + Column( + modifier = Modifier + .verticalScroll(rememberScrollState()) + .fillMaxWidth() + .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)) + Row( + modifier = Modifier + .fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceEvenly + ) { + Button( + onClick = { + //TODO: Add tracker + } + ) { + 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 + ) + } + + Button( + onClick = { + //TODO: View statistics + } + ) { + 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 + }, + 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), + //cannot eta reduce because + //Function References of @Composable functions are not currently supported + rows = { assignments -> + TherapyAssignmentCardContent(assignments) + }, + addAction = { + //TODO: Add Therapy assignment + }, + items = mockTherapyAssignments() + ) + + Spacer(modifier = Modifier.height(10.dp)) + + TitledListCard( + stringResource(R.string.tracker_card_title), + //cannot eta reduce because + //Function References of @Composable functions are not currently supported + rows = { trackers -> OtherTrackersCardContent(trackers = List(4) { _ -> trackers[0] }) }, + addAction = { + //TODO: Add new tracker + }, + items = mockTrackers() + ) + } + } +} + +@Composable +private fun TopCalendar() { + + var currentDateMut: MutableState = remember { + mutableStateOf(LocalDate.now()) + } + + + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { + //Top Navigation and display items + Row( + modifier = Modifier + .fillMaxWidth() + .padding(10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + //Header stating the currently selected date + Text( + fontSize = 4.5.em, + text = currentDateMut.value.format( + DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG) + .withLocale(LocalConfiguration.current.locales[0]) + ) + ) + // arrows to switch month + 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) + .clickable(onClick = { + currentDateMut.value = currentDateMut.value.minusMonths(1) + }) + .size(30.dp), + imageVector = Icons.Filled.ChevronLeft, + contentDescription = "TODO: Provide" + ) + + Icon( + modifier = Modifier + .clip(CircleShape) + .clickable(onClick = { + currentDateMut.value = currentDateMut.value.plusMonths(1) + }) + .size(30.dp), + imageVector = Icons.Filled.ChevronRight, + contentDescription = "TODO: Provide" + ) + } + } + + // labels for current day + Row( + modifier = Modifier + .fillMaxWidth() + .padding(10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + ) { + weekdayListByLocale(LocalConfiguration.current.locales[0]).map { label -> + Text( + text = label, + modifier = Modifier.padding(10.dp), + textAlign = TextAlign.Center, + fontWeight = FontWeight.Bold + ) + } + } + + CalendarDaysGrid(currentDateMut) + } +} + +@Composable +private fun CalendarDaysGrid(selectedDateMut: MutableState) { + val locale = LocalConfiguration.current.locales[0] + val selectedDate = selectedDateMut.value + + val firstDayOfMonth = LocalDate.of(selectedDate.year, selectedDate.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 + // FIXME: Something better than a lazy grid would be good because scrolling + LazyVerticalGrid( + columns = GridCells.Fixed(7), + userScrollEnabled = false, + modifier = Modifier + .fillMaxWidth() + .height(320.dp) + ) { + items(days.size) { index -> + days[index]?.let { day -> + + var dayBoxModifier = Modifier + .padding(4.dp) + .clip(CircleShape) + .aspectRatio(1f) + .clickable(onClick = { + selectedDateMut.value = LocalDate.of( + selectedDate.year, + selectedDate.month, + day + ) + }) + .clip(CircleShape) + + //add a mark to the currently selected day + if (day == selectedDate.dayOfMonth) { + dayBoxModifier = dayBoxModifier.border( + 2.dp, + MaterialTheme.colorScheme.onPrimaryContainer, + CircleShape + ) + } + + Box( + modifier = dayBoxModifier, + contentAlignment = Alignment.Center + ) { + Text(text = day.toString()) + } + } + } + } +} + +@Composable +private fun TitledListCard( + title: String, + rows: @Composable Function1, Unit>, + addAction: () -> Unit, + items: List +) { + 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 = addAction), + imageVector = Icons.Filled.Add, + contentDescription = "TODO: Provide" + ) + } + HorizontalDivider() + 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 + ) + } + } + } +} \ 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..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 @@ -1,24 +1,53 @@ 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 = UUID.randomUUID(), + @ColumnInfo(name = "title") val title: String, + @ColumnInfo(name = "description") val description: String +) { companion object { 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" +// ) ) } } +} + +@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 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/model/Skillschain.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skillschain.kt new file mode 100644 index 0000000..2b9000f --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/Skillschain.kt @@ -0,0 +1,28 @@ +package de.cdaut.dbtapp.model + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey +import java.util.UUID + +@Entity +class Skillschain( + @PrimaryKey val identifier: UUID = UUID.randomUUID(), + @ColumnInfo(name = "name") val title: String, + @ColumnInfo(name = "skills") val skills: List +) { + companion object { + fun mockSkillschains(): List { + return listOf( + Skillschain( + title = "Skillskette 1", + skills = Skill.mockSkills() + ), + Skillschain( + title = "Skillskette 2", + skills = Skill.mockSkills() + ) + ) + } + } +} \ 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..f336f48 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/model/TherapyAssignment.kt @@ -0,0 +1,33 @@ +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 = UUID.randomUUID(), + @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( + title = "Selbstfürsorge", + description = "Mir selbst eine gute Sache tun", + done = true + ), + TherapyAssignment( + 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/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/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt b/DBTApp/app/src/main/java/de/cdaut/dbtapp/navigation/BottomNavigationItem.kt index 2d3bf49..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,15 +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.compose.ui.platform.LocalContext -import androidx.core.content.ContextCompat.getString +import androidx.compose.ui.res.stringResource import de.cdaut.dbtapp.R data class BottomNavigationItem( @@ -18,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 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..03d52b9 --- /dev/null +++ b/DBTApp/app/src/main/java/de/cdaut/dbtapp/util/DateHelpers.kt @@ -0,0 +1,15 @@ +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(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 = + listOfDayNames.subList(firstDayOfWeek, 7) + listOfDayNames.subList(0, firstDayOfWeek) + + return orderedListOfDayNames +} diff --git a/DBTApp/app/src/main/res/values-de/strings.xml b/DBTApp/app/src/main/res/values-de/strings.xml index e45a695..2f78508 100644 --- a/DBTApp/app/src/main/res/values-de/strings.xml +++ b/DBTApp/app/src/main/res/values-de/strings.xml @@ -8,4 +8,14 @@ Skillsketten Notfallknopf Favorisieren Button + Ausklappen + Diary Card Hinzufügen + Therapiehausaufgaben + Tracker hinzufügen + Statistiken + Tracker + Skill Suchen + Suche Icon + Skillskette Suchen + Skillskette hinzufügen \ 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..f9a13dd 100644 --- a/DBTApp/app/src/main/res/values/strings.xml +++ b/DBTApp/app/src/main/res/values/strings.xml @@ -7,4 +7,14 @@ Skills Chains Emergency Button Favourte Button + Expand + Add Diary Card + Therapy Assignments + Add Tracker + View Statistics + Trackers + Search Skill + Search Icon + Search Skills Chain + Add Skillschain \ No newline at end of file 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 b497618..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.9.2" +agp = "8.10.1" kotlin = "2.0.21" coreKtx = "1.16.0" junit = "4.13.2" @@ -8,7 +8,10 @@ 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" +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" } diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 53d1f3d..0000000 --- a/LICENSE +++ /dev/null @@ -1,675 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/planning/screenshots/favourites_screen.png b/planning/screenshots/favourites_screen.png new file mode 100644 index 0000000..32d871f Binary files /dev/null and b/planning/screenshots/favourites_screen.png differ diff --git a/planning/screenshots/skillschains_screen.png b/planning/screenshots/skillschains_screen.png new file mode 100644 index 0000000..6f343c3 Binary files /dev/null and b/planning/screenshots/skillschains_screen.png differ diff --git a/planning/screenshots/skillslist.png b/planning/screenshots/skillslist.png new file mode 100644 index 0000000..5f2cf82 Binary files /dev/null and b/planning/screenshots/skillslist.png differ diff --git a/planning/screenshots/tracking_screen.png b/planning/screenshots/tracking_screen.png new file mode 100644 index 0000000..68eb4f1 Binary files /dev/null and b/planning/screenshots/tracking_screen.png differ