Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id "org.sonarqube" version "4.4.1.3373"
id 'com.google.devtools.ksp' version '2.0.0-1.0.21'
alias(libs.plugins.compose.compiler)
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
Expand All @@ -25,6 +26,9 @@ android {

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
namespace 'com.example.ToDo'
vectorDrawables {
useSupportLibrary true
}
}

buildTypes {
Expand All @@ -44,19 +48,46 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
compose true
}

composeOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '17'
}

packaging {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1'
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.compose.ui:ui-graphics'
implementation 'androidx.compose.material3:material3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'

// kotlin dependency
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.0"

// room dependency
def room_version = "2.6.1"
implementation "androidx.room:room-runtime:$room_version"
implementation("androidx.room:room-ktx:$room_version")
Expand All @@ -69,4 +100,22 @@ dependencies {
// ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1"


androidTestImplementation platform('androidx.compose:compose-bom:2024.05.00')
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'


def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
implementation composeBom

implementation 'androidx.compose.ui:ui'

// Android Studio Preview support
implementation 'androidx.compose.ui:ui-tooling-preview'
debugImplementation 'androidx.compose.ui:ui-tooling'
debugImplementation 'androidx.compose.ui:ui-test-manifest'

//icon
implementation "androidx.compose.material:material-icons-extended:1.6.7"

}
14 changes: 11 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="com.example.ToDo.SplashActivity"
android:exported="true">
<activity
android:name=".compose.HomeActivity"
android:exported="true"
android:label="@string/title_activity_home"
android:theme="@style/Theme.ToDo" >
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />

<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
<activity android:name="com.example.ToDo.MainActivity" />
<activity
android:name=".SplashActivity"
android:exported="true">
</activity>
<activity android:name=".MainActivity" />
</application>

</manifest>
58 changes: 58 additions & 0 deletions app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package com.example.ToDo.compose

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
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.tooling.preview.Preview
import com.example.ToDo.TodoViewmodel
import com.example.ToDo.compose.ui.ToDoScreens.AddNewTask
import com.example.ToDo.compose.ui.ToDoScreens.LoadUI
import com.example.ToDo.compose.ui.theme.ToDoTheme
import com.example.ToDo.data.source.TodoRepository
import com.example.ToDo.data.source.local.db.TodoDatabase.Companion.getDataBase

class HomeActivity : ComponentActivity() {

private lateinit var todoViewmodel : TodoViewmodel

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
todoViewmodel = TodoViewmodel(TodoRepository(getDataBase(this.applicationContext).UserTodoDao()))
setContent {
App()
}
}

@Composable
private fun App() {
var selected by remember { mutableStateOf(false) }
if (selected) {
AddNewTask(onDismiss = {
selected = !selected
}, todoViewmodel)
} else {
LoadUI(onClick = {
selected = !selected
}, todoViewmodel)
}

}

@Preview(showBackground = true)
@Composable
fun LoadUIPreview() {
ToDoTheme {
LoadUI({

}, todoViewmodel)
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package com.example.ToDo.compose.ui.ToDoScreens

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.sharp.Clear
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.runtime.Composable
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.graphics.RectangleShape
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import com.example.ToDo.TodoViewmodel
import com.example.ToDo.data.source.local.db.UserTodo

@Composable
fun AddNewTask(onDismiss: () -> Unit, todoViewmodel: TodoViewmodel) {
Dialog(onDismissRequest = { onDismiss()}) {
Card(
elevation = CardDefaults.cardElevation(defaultElevation = 3.dp),
colors = CardDefaults.cardColors(
containerColor = Color.White
),
border = BorderStroke(width = 2.dp, color = Color.LightGray),
modifier = Modifier
.clip(RectangleShape)
) {
val state = remember {
mutableStateOf("")
}
Column(
modifier = Modifier
.padding(5.dp)
.background(color = Color.White),
) {
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier
.fillMaxWidth()
.padding(10.dp)) {
Text(
text = "Add a new task",
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.SemiBold
)
Icon(
imageVector = Icons.Sharp.Clear,
contentDescription = "dismiss UI",
tint = Color.Black,
modifier = Modifier.background(color = Color.LightGray, shape = CircleShape)
)
}
TextField(value = state.value, onValueChange = {
state.value = it
}, colors = TextFieldDefaults.colors(
unfocusedContainerColor = Color.White,
focusedContainerColor = Color.White,
cursorColor = Color.Black
), modifier = Modifier
.fillMaxWidth())

Spacer(modifier = Modifier.padding(5.dp))

Button(onClick = {
todoViewmodel.createTodo(UserTodo(0, state.value, 0))
onDismiss()
}, modifier = Modifier
.width(200.dp)
.align(Alignment.CenterHorizontally)) {
Text(text = "Add task")
}

}

}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package com.example.ToDo.compose.ui.ToDoScreens

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.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
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.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
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.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.example.ToDo.TodoViewmodel
import com.example.ToDo.compose.ui.theme.Purple80

@Composable
fun LoadUI(onClick: () -> Unit, todoViewmodel: TodoViewmodel) {
Column(modifier = Modifier.padding(5.dp).fillMaxSize(1f)) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier
.fillMaxWidth()
.padding(top = 5.dp), horizontalArrangement = Arrangement.SpaceBetween) {
Text(
text = "Tasks",
textAlign = TextAlign.Center,
modifier = Modifier
.background(Color.Transparent)
.weight(.8f),
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.SemiBold
)
//val context = LocalContext.current
Icon(
imageVector = Icons.Filled.Add,
contentDescription = "create a new task",
modifier = Modifier
.background(color = Purple80, shape = CircleShape)
.size(30.dp)
.clickable {
onClick()
}
)
}
Spacer(modifier = Modifier
.fillMaxWidth()
.height(20.dp))

LazyColumn {
items(items = listOf("Item 1 hjghj fvhjrvfhjj hfhsjfvh vfhjvhjfhj vhfvjfvhjfh vhjvhjdvfjh bjvfhjdvfhjd vjd fhgvfhdvhjf vghfvhjvf", "Item 2", "Item 3")) { item ->
ToDoListItem(item)
}
}
}
}
Loading