From 93ba477c2a92bcf6d0986e9f5d2766ece3ea924c Mon Sep 17 00:00:00 2001
From: akanshamaheshwari <akansha.maheshwari@soprabanking.com>
Date: Sat, 1 Jun 2024 19:45:18 +0530
Subject: [PATCH 1/4] feat: Added compose

---
 app/build.gradle                              |  43 ++++++
 app/src/main/AndroidManifest.xml              |  11 +-
 .../com/example/ToDo/compose/HomeActivity.kt  | 129 ++++++++++++++++++
 .../example/ToDo/compose/ui/theme/Color.kt    |  11 ++
 .../example/ToDo/compose/ui/theme/Theme.kt    |  57 ++++++++
 .../com/example/ToDo/compose/ui/theme/Type.kt |  34 +++++
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/themes.xml            |   5 +
 8 files changed, 289 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/theme/Theme.kt
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/theme/Type.kt
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/build.gradle b/app/build.gradle
index e1a3b54..5493b7d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,9 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         namespace 'com.example.ToDo'
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
     buildTypes {
@@ -44,12 +47,36 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        kotlinCompilerExtensionVersion = "1.5.14"
+    }
+
+    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'
@@ -69,4 +96,20 @@ dependencies {
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1"
 
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.24"
+    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'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e6f1ef0..8429719 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,14 +9,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.example.ToDo.SplashActivity"
+        <activity
+            android:name=".compose.HomeActivity"
+            android:exported="false"
+            android:label="@string/title_activity_home"
+            android:theme="@style/Theme.ToDo" />
+        <activity
+            android:name=".SplashActivity"
             android:exported="true">
             <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=".MainActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
new file mode 100644
index 0000000..a8907e1
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
@@ -0,0 +1,129 @@
+package com.example.ToDo.compose
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+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.fillMaxWidth
+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.Checkbox
+import androidx.compose.material3.CheckboxColors
+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
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontFamily
+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.sp
+import com.example.ToDo.compose.ui.theme.Purple80
+import com.example.ToDo.compose.ui.theme.ToDoTheme
+
+class HomeActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            ToDoTheme {
+                LoadUI()
+            }
+        }
+    }
+
+}
+
+@Composable
+fun LoadUI() {
+    Column(modifier = Modifier.padding(5.dp)) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            Text(
+                text = "Hi, Akansha",
+                textAlign = TextAlign.Left,
+                modifier = Modifier
+                    .background(Color.Transparent),
+                fontSize = 30.sp,
+                fontFamily = FontFamily.SansSerif,
+                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 {
+                        // todo: to open a container for adding the tasks
+                    }
+            )
+        }
+
+        LazyColumn {
+            items(items = listOf("Item 1", "Item 2", "Item 3")) { item ->
+                ToDoListItem(item)
+            }
+        }
+    }
+}
+
+
+@Composable
+fun ToDoListItem(item : String) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Start
+    ) {
+        var checked by remember { mutableStateOf(false) }
+        Checkbox(
+            checked = checked,
+            onCheckedChange = {
+                checked = it
+            },
+            colors = CheckboxColors(
+                checkedBoxColor = Purple80,
+                checkedCheckmarkColor = Color.Black,
+                checkedBorderColor = Color.White,
+                disabledBorderColor = Color.Gray,
+                disabledCheckedBoxColor = Color.Gray,
+                disabledIndeterminateBorderColor = Color.Gray,
+                uncheckedBorderColor = Purple80,
+                uncheckedBoxColor = Color.White,
+                uncheckedCheckmarkColor = Color.White,
+                disabledUncheckedBoxColor = Color.Gray,
+                disabledUncheckedBorderColor = Color.Gray,
+                disabledIndeterminateBoxColor = Color.Gray
+            )
+        )
+        Text(text = item, fontFamily = FontFamily.SansSerif)
+    }
+
+}
+
+@Preview(showBackground = true)
+@Composable
+fun LoadUIPreview() {
+    ToDoTheme {
+        LoadUI()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt b/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
new file mode 100644
index 0000000..537094e
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.example.ToDo.compose.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/theme/Theme.kt b/app/src/main/java/com/example/ToDo/compose/ui/theme/Theme.kt
new file mode 100644
index 0000000..78441d3
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/theme/Theme.kt
@@ -0,0 +1,57 @@
+package com.example.ToDo.compose.ui.theme
+
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun ToDoTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/theme/Type.kt b/app/src/main/java/com/example/ToDo/compose/ui/theme/Type.kt
new file mode 100644
index 0000000..3648739
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.example.ToDo.compose.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42730b3..6813b00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,5 @@
     <string name="save">Save</string>
     <string name="new_task">New Task</string>
     <string name="tasks">Tasks</string>
+    <string name="title_activity_home">HomeActivity</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..4ac2d6f
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.ToDo" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
\ No newline at end of file

From a7f970d6a1b73c604676c5fd62f338583718bd35 Mon Sep 17 00:00:00 2001
From: akanshamaheshwari <akansha.maheshwari@soprabanking.com>
Date: Sat, 8 Jun 2024 14:34:31 +0530
Subject: [PATCH 2/4] feat: added the icons dependency and make changes in UI

---
 app/build.gradle                              |  3 +
 .../com/example/ToDo/compose/HomeActivity.kt  | 99 +------------------
 .../compose/ui/ToDoScreens/ToDoHomeScreen.kt  | 67 +++++++++++++
 .../compose/ui/ToDoScreens/ToDoListItem.kt    | 99 +++++++++++++++++++
 .../example/ToDo/compose/ui/theme/Color.kt    |  3 +-
 5 files changed, 172 insertions(+), 99 deletions(-)
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt

diff --git a/app/build.gradle b/app/build.gradle
index 5493b7d..6a07693 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -112,4 +112,7 @@ dependencies {
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
+    //icon
+    implementation "androidx.compose.material:material-icons-extended:1.6.7"
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
index a8907e1..5b56add 100644
--- a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
+++ b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
@@ -1,42 +1,12 @@
 package com.example.ToDo.compose
 
 import android.os.Bundle
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-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.fillMaxWidth
-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.Checkbox
-import androidx.compose.material3.CheckboxColors
-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
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontFamily
-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.sp
-import com.example.ToDo.compose.ui.theme.Purple80
+import com.example.ToDo.compose.ui.ToDoScreens.LoadUI
 import com.example.ToDo.compose.ui.theme.ToDoTheme
 
 class HomeActivity : ComponentActivity() {
@@ -53,73 +23,6 @@ class HomeActivity : ComponentActivity() {
 
 }
 
-@Composable
-fun LoadUI() {
-    Column(modifier = Modifier.padding(5.dp)) {
-        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-            Text(
-                text = "Hi, Akansha",
-                textAlign = TextAlign.Left,
-                modifier = Modifier
-                    .background(Color.Transparent),
-                fontSize = 30.sp,
-                fontFamily = FontFamily.SansSerif,
-                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 {
-                        // todo: to open a container for adding the tasks
-                    }
-            )
-        }
-
-        LazyColumn {
-            items(items = listOf("Item 1", "Item 2", "Item 3")) { item ->
-                ToDoListItem(item)
-            }
-        }
-    }
-}
-
-
-@Composable
-fun ToDoListItem(item : String) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth(),
-        horizontalArrangement = Arrangement.Start
-    ) {
-        var checked by remember { mutableStateOf(false) }
-        Checkbox(
-            checked = checked,
-            onCheckedChange = {
-                checked = it
-            },
-            colors = CheckboxColors(
-                checkedBoxColor = Purple80,
-                checkedCheckmarkColor = Color.Black,
-                checkedBorderColor = Color.White,
-                disabledBorderColor = Color.Gray,
-                disabledCheckedBoxColor = Color.Gray,
-                disabledIndeterminateBorderColor = Color.Gray,
-                uncheckedBorderColor = Purple80,
-                uncheckedBoxColor = Color.White,
-                uncheckedCheckmarkColor = Color.White,
-                disabledUncheckedBoxColor = Color.Gray,
-                disabledUncheckedBorderColor = Color.Gray,
-                disabledIndeterminateBoxColor = Color.Gray
-            )
-        )
-        Text(text = item, fontFamily = FontFamily.SansSerif)
-    }
-
-}
-
 @Preview(showBackground = true)
 @Composable
 fun LoadUIPreview() {
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
new file mode 100644
index 0000000..820296e
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
@@ -0,0 +1,67 @@
+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.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.unit.dp
+import com.example.ToDo.compose.ui.theme.Purple80
+
+@Composable
+fun LoadUI() {
+    Column(modifier = Modifier.padding(5.dp)) {
+        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 {
+
+                    }
+            )
+        }
+        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)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt
new file mode 100644
index 0000000..b1860d3
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt
@@ -0,0 +1,99 @@
+package com.example.ToDo.compose.ui.ToDoScreens
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+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.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.rounded.TaskAlt
+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.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.ToDo.compose.ui.theme.TodoSelectedColor
+
+@Composable
+fun ToDoListItem(item : String) {
+    Card (
+        elevation = CardDefaults.cardElevation(
+            defaultElevation = 2.dp
+        ),
+        border = BorderStroke(width = 0.1.dp, color = Color.Gray),
+        modifier = Modifier.padding(8.dp))
+    {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = Color.White)
+                .padding(8.dp),
+            horizontalArrangement = Arrangement.Start
+        ) {
+            var selected by remember { mutableStateOf(false) }
+            Icon(
+                imageVector = Icons.Rounded.TaskAlt,
+                contentDescription = "add task",
+                tint = if(selected) {
+                    Color.White
+                } else {
+                    Color.LightGray
+                },
+                modifier = Modifier
+                    .background(
+                        color = if (selected) {
+                            TodoSelectedColor
+                        } else {
+                            Color.White
+                        }, shape = CircleShape
+                    )
+                    .size(26.dp)
+                    .padding(2.dp)
+                    .clickable {
+                        selected = !selected
+                    }
+            )
+            Spacer(modifier = Modifier.padding(4.dp))
+            Text(
+                text = item,
+                fontFamily = FontFamily.SansSerif,
+                modifier = Modifier.weight(.8f),
+                style = MaterialTheme.typography.bodyLarge
+            )
+
+            Icon(
+                imageVector = Icons.Default.Delete,
+                tint = Color.Red,
+                contentDescription = "delete task",
+                modifier = Modifier
+                    .size(22.dp)
+
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun previewListItem() {
+    ToDoListItem(item = "Akansha")
+    
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt b/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
index 537094e..0917f15 100644
--- a/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
+++ b/app/src/main/java/com/example/ToDo/compose/ui/theme/Color.kt
@@ -8,4 +8,5 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
+val Pink40 = Color(0xFF7D5260)
+val TodoSelectedColor = Color(0xFF8ED74F)
\ No newline at end of file

From 7b8e981115908587eee3da96764466eeae5160c1 Mon Sep 17 00:00:00 2001
From: akanshamaheshwari <akansha.maheshwari@soprabanking.com>
Date: Sat, 8 Jun 2024 16:05:59 +0530
Subject: [PATCH 3/4] feat: Rebased and used the new compose

---
 app/build.gradle                              |  7 +-
 .../com/example/ToDo/compose/HomeActivity.kt  | 13 ++-
 .../ToDo/compose/ui/ToDoScreens/AddTaskUI.kt  | 93 +++++++++++++++++++
 .../compose/ui/ToDoScreens/ToDoHomeScreen.kt  | 14 ++-
 build.gradle                                  |  4 +
 gradle/libs.versions.toml                     |  6 ++
 6 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
 create mode 100644 gradle/libs.versions.toml

diff --git a/app/build.gradle b/app/build.gradle
index 6a07693..bff0a6d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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'
@@ -55,7 +56,6 @@ android {
     composeOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
-        kotlinCompilerExtensionVersion = "1.5.14"
     }
 
     kotlinOptions {
@@ -83,7 +83,11 @@ dependencies {
     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")
@@ -97,7 +101,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1"
 
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.24"
     androidTestImplementation platform('androidx.compose:compose-bom:2024.05.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
 
diff --git a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
index 5b56add..361f950 100644
--- a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
+++ b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
@@ -16,17 +16,26 @@ class HomeActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             ToDoTheme {
-                LoadUI()
+                App()
             }
         }
     }
 
 }
 
+@Composable
+private fun App() {
+    LoadUI {
+
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 fun LoadUIPreview() {
     ToDoTheme {
-        LoadUI()
+        LoadUI{
+
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
new file mode 100644
index 0000000..1818f57
--- /dev/null
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
@@ -0,0 +1,93 @@
+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.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.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun AddNewTask() {
+    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.spacedBy(100.dp), modifier = Modifier
+            ) {
+                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
+            ))
+
+            Spacer(modifier = Modifier.padding(5.dp))
+
+            Button(onClick = { /*TODO*/ }, modifier = Modifier
+                .width(200.dp)
+                .align(Alignment.CenterHorizontally)) {
+                Text(text = "Add task")
+            }
+
+        }
+
+    }
+
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewTaskUI() {
+    AddNewTask()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
index 820296e..dfa2bfe 100644
--- a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
@@ -15,6 +15,7 @@ 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.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -24,11 +25,12 @@ 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.compose.ui.theme.Purple80
 
 @Composable
-fun LoadUI() {
+fun LoadUI(onClick : () -> Unit) {
     Column(modifier = Modifier.padding(5.dp)) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier
             .fillMaxWidth()
@@ -50,7 +52,7 @@ fun LoadUI() {
                     .background(color = Purple80, shape = CircleShape)
                     .size(30.dp)
                     .clickable {
-
+                        onClick()
                     }
             )
         }
@@ -64,4 +66,12 @@ fun LoadUI() {
             }
         }
     }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun loadUiPreview() {
+    LoadUI({
+
+    })
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a709dba..9c8da90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,10 @@ buildscript {
     }
 }
 
+plugins {
+    alias(libs.plugins.compose.compiler) apply false
+}
+
 allprojects {
     repositories {
         google()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..2a4a543
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,6 @@
+[versions]
+kotlin = "2.0.0"
+
+[plugins]
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
\ No newline at end of file

From 2bdcb8ea4be2f1cf57a7dbf98140275ec692ea60 Mon Sep 17 00:00:00 2001
From: akanshamaheshwari <akansha.maheshwari@soprabanking.com>
Date: Fri, 14 Jun 2024 23:37:14 +0530
Subject: [PATCH 4/4] feat: add new task with a dialog and integrated with
 database.

---
 app/src/main/AndroidManifest.xml              |  11 +-
 .../com/example/ToDo/compose/HomeActivity.kt  |  47 +++++---
 .../ToDo/compose/ui/ToDoScreens/AddTaskUI.kt  | 102 +++++++++---------
 .../compose/ui/ToDoScreens/ToDoHomeScreen.kt  |  15 +--
 .../compose/ui/ToDoScreens/ToDoListItem.kt    |   2 -
 5 files changed, 95 insertions(+), 82 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8429719..4571bca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,18 +11,19 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".compose.HomeActivity"
-            android:exported="false"
+            android:exported="true"
             android:label="@string/title_activity_home"
-            android:theme="@style/Theme.ToDo" />
-        <activity
-            android:name=".SplashActivity"
-            android:exported="true">
+            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=".SplashActivity"
+            android:exported="true">
+        </activity>
         <activity android:name=".MainActivity" />
     </application>
 
diff --git a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
index 361f950..a5cc0bf 100644
--- a/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
+++ b/app/src/main/java/com/example/ToDo/compose/HomeActivity.kt
@@ -5,37 +5,54 @@ 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 {
-            ToDoTheme {
-                App()
-            }
+            App()
         }
     }
 
-}
-
-@Composable
-private fun App() {
-    LoadUI {
+    @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{
+    @Preview(showBackground = true)
+    @Composable
+    fun LoadUIPreview() {
+        ToDoTheme {
+            LoadUI({
 
+            }, todoViewmodel)
         }
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
index 1818f57..ce267f3 100644
--- a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/AddTaskUI.kt
@@ -6,6 +6,7 @@ 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
@@ -28,66 +29,69 @@ 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.tooling.preview.Preview
 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() {
-    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(
+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
-                .padding(5.dp)
-                .background(color = Color.White),
+                .clip(RectangleShape)
         ) {
-            Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(100.dp), modifier = Modifier
-            ) {
-                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)
-                )
+            val state = remember {
+                mutableStateOf("")
             }
-            TextField(value = state.value, onValueChange = {
-                state.value = it
-            }, colors = TextFieldDefaults.colors(
-                unfocusedContainerColor = Color.White,
-                focusedContainerColor = Color.White,
-                cursorColor = Color.Black
-            ))
+            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))
 
-            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")
+                }
 
-            Button(onClick = { /*TODO*/ }, modifier = Modifier
-                .width(200.dp)
-                .align(Alignment.CenterHorizontally)) {
-                Text(text = "Add task")
             }
 
         }
-
     }
 
-}
-
-@Preview(showBackground = true)
-@Composable
-fun PreviewTaskUI() {
-    AddNewTask()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
index dfa2bfe..89ba1ee 100644
--- a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoHomeScreen.kt
@@ -6,6 +6,7 @@ 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
@@ -15,7 +16,6 @@ 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.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -27,11 +27,12 @@ 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) {
-    Column(modifier = Modifier.padding(5.dp)) {
+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) {
@@ -66,12 +67,4 @@ fun LoadUI(onClick : () -> Unit) {
             }
         }
     }
-}
-
-@Preview(showBackground = true)
-@Composable
-private fun loadUiPreview() {
-    LoadUI({
-
-    })
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt
index b1860d3..0be9fa0 100644
--- a/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt
+++ b/app/src/main/java/com/example/ToDo/compose/ui/ToDoScreens/ToDoListItem.kt
@@ -85,7 +85,6 @@ fun ToDoListItem(item : String) {
                 contentDescription = "delete task",
                 modifier = Modifier
                     .size(22.dp)
-
             )
         }
     }
@@ -95,5 +94,4 @@ fun ToDoListItem(item : String) {
 @Composable
 private fun previewListItem() {
     ToDoListItem(item = "Akansha")
-    
 }
\ No newline at end of file