diff --git a/.gitignore b/.gitignore
index 17b4156..9347128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ local.properties
 
 # Android Studio / IntelliJ IDEA
 *.iws
+/.idea
 /.idea/libraries
 /.idea/tasks.xml
 /.idea/caches
@@ -24,6 +25,7 @@ local.properties
 /.idea/modules.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/misc.xml
 /out/
 
 .DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..18b5da5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/4.1/libexec" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a9c58fb..4bc4fc6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="..\:/WORK/ANDROID/Projects/NoteX/app/src/main/res/drawable/ic_filled_note.xml" value="0.1135" />
-        <entry key="..\:/WORK/ANDROID/Projects/NoteX/app/src/main/res/drawable/ic_note_filled.xml" value="0.1135" />
-        <entry key="..\:/WORK/ANDROID/Projects/NoteX/app/src/main/res/drawable/ic_note_outlined.xml" value="0.1135" />
-        <entry key="..\:/WORK/ANDROID/Projects/NoteX/app/src/main/res/drawable/ic_outlined_note.xml" value="0.1135" />
-        <entry key="..\:/WORK/ANDROID/Projects/NoteX/app/src/main/res/drawable/ic_task_outlined.xml" value="0.1135" />
-      </map>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4cac126..d5531ad 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -98,6 +98,7 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:${LibVersion.navigationComposeVersion}")
     implementation("androidx.datastore:datastore-preferences:${LibVersion.dataStoreVersion}")
     implementation("androidx.paging:paging-compose:1.0.0-alpha16")
+    implementation("androidx.work:work-runtime-ktx:2.7.1")
     // DO NOT upgrade desugar_jdk_libs to 1.2.0
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6")
 
@@ -133,4 +134,7 @@ dependencies {
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:${LibVersion.composeVersion}")
     debugImplementation("androidx.compose.ui:ui-tooling:${LibVersion.composeVersion}")
     debugImplementation("androidx.compose.ui:ui-test-manifest:${LibVersion.composeVersion}")
+
+    implementation("androidx.hilt:hilt-work:1.0.0")
+    kapt("androidx.hilt:hilt-compiler:1.0.0")
 }
diff --git a/app/src/androidTest/java/com/hadiyarajesh/notex/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/hadiyarajesh/notex/ExampleInstrumentedTest.kt
index 4824663..38b26bc 100644
--- a/app/src/androidTest/java/com/hadiyarajesh/notex/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/hadiyarajesh/notex/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.hadiyarajesh.notex
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.hadiyarajesh.notex", appContext.packageName)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afb7c03..6daabbe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove">
+        </provider>
+
+        <receiver android:name=".reminder.notification.NotificationBroadCastReceiver"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/hadiyarajesh/notex/MainActivity.kt b/app/src/main/java/com/hadiyarajesh/notex/MainActivity.kt
index a2b3c22..490735a 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/MainActivity.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/MainActivity.kt
@@ -7,7 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import com.hadiyarajesh.notex.ui.NoteXApp
+import com.hadiyarajesh.notex.ui.reminders.myContent
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -15,7 +15,7 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            NoteXApp()
+            myContent()
         }
 
         createNotificationChannel()
diff --git a/app/src/main/java/com/hadiyarajesh/notex/MyApplication.kt b/app/src/main/java/com/hadiyarajesh/notex/MyApplication.kt
index e8ccd78..d3299a0 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/MyApplication.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/MyApplication.kt
@@ -1,7 +1,20 @@
 package com.hadiyarajesh.notex
 
 import android.app.Application
+import androidx.hilt.work.HiltWorkerFactory
+import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 
 @HiltAndroidApp
-class MyApplication: Application()
+class MyApplication : Application(), Configuration.Provider {
+
+    @Inject
+    lateinit var workerFactory: HiltWorkerFactory
+
+    override fun getWorkManagerConfiguration(): Configuration {
+        return Configuration.Builder()
+            .setWorkerFactory(workerFactory)
+            .build()
+    }
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/database/converter/InstantConverter.kt b/app/src/main/java/com/hadiyarajesh/notex/database/converter/InstantConverter.kt
index a2aa463..c430c79 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/database/converter/InstantConverter.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/database/converter/InstantConverter.kt
@@ -2,6 +2,10 @@ package com.hadiyarajesh.notex.database.converter
 
 import androidx.room.TypeConverter
 import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
 
 object InstantConverter {
     @JvmStatic
@@ -11,4 +15,13 @@ object InstantConverter {
     @JvmStatic
     @TypeConverter
     fun toInstant(value: String?): Instant? = value?.let { Instant.parse(value) }
+
+    @JvmStatic
+    @TypeConverter
+    fun getLocalDate(instant: Instant): LocalDate {
+        val localDateTime: LocalDateTime =
+            LocalDateTime.ofInstant(instant, ZoneOffset.systemDefault())
+        val formatter = DateTimeFormatter.ofPattern("yyyyMMdd")
+        return LocalDate.parse(localDateTime.format(formatter), formatter)
+    }
 }
diff --git a/app/src/main/java/com/hadiyarajesh/notex/database/dao/ReminderDao.kt b/app/src/main/java/com/hadiyarajesh/notex/database/dao/ReminderDao.kt
index 096aaa8..dd2f4be 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/database/dao/ReminderDao.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/database/dao/ReminderDao.kt
@@ -9,7 +9,7 @@ import java.time.Instant
 @Dao
 interface ReminderDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertOrUpdate(reminder: Reminder)
+    suspend fun insertOrUpdate(reminder: Reminder): Long
 
     /**
      * This method will add reminder to folder
diff --git a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Folder.kt b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Folder.kt
index bc46b8c..19c1bd9 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Folder.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Folder.kt
@@ -14,7 +14,7 @@ data class Folder(
     val title: String,
     val description: String?,
     val folderType: FolderType,
-    //HexCode of a color
+    // HexCode of a color
     val color: String? = null,
     val createdOn: Instant,
     val updatedOn: Instant
diff --git a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Note.kt b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Note.kt
index e829b80..582103f 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Note.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Note.kt
@@ -14,7 +14,7 @@ data class Note(
     val content: String?,
     val archived: Boolean,
     val archivedOn: Instant? = null,
-    //HexCode of a color
+    // HexCode of a color
     val color: String? = null,
     val createdOn: Instant,
     val updatedOn: Instant,
diff --git a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Reminder.kt b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Reminder.kt
index 25c6ed1..4fd8354 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/database/entity/Reminder.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/database/entity/Reminder.kt
@@ -18,7 +18,7 @@ data class Reminder(
     val cancelledOn: Instant? = null,
     val completed: Boolean,
     val completedOn: Instant?,
-    //HexCode of a color
+    // HexCode of a color
     val color: String? = null,
     val createdOn: Instant,
     val updatedOn: Instant,
diff --git a/app/src/main/java/com/hadiyarajesh/notex/di/NetworkModule.kt b/app/src/main/java/com/hadiyarajesh/notex/di/NetworkModule.kt
index 90a2639..ad9349e 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/di/NetworkModule.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/di/NetworkModule.kt
@@ -8,11 +8,11 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
diff --git a/app/src/main/java/com/hadiyarajesh/notex/di/ScopeModule.kt b/app/src/main/java/com/hadiyarajesh/notex/di/ScopeModule.kt
index e258925..544b04b 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/di/ScopeModule.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/di/ScopeModule.kt
@@ -1,13 +1,14 @@
 package com.hadiyarajesh.notex.di
 
+import com.hadiyarajesh.notex.reminder.notification.NotificationHelper
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
 @Module
@@ -18,4 +19,10 @@ class ScopeModule {
     fun provideCoroutineScope(): CoroutineScope {
         return CoroutineScope(SupervisorJob() + Dispatchers.IO)
     }
+
+    @Singleton
+    @Provides
+    fun provideNotificationHelper(): NotificationHelper {
+        return NotificationHelper()
+    }
 }
diff --git a/app/src/main/java/com/hadiyarajesh/notex/network/api/NoteApi.kt b/app/src/main/java/com/hadiyarajesh/notex/network/api/NoteApi.kt
index 7d7f3b7..27c7bce 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/network/api/NoteApi.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/network/api/NoteApi.kt
@@ -1,4 +1,3 @@
 package com.hadiyarajesh.notex.network.api
 
-interface NoteApi {
-}
+interface NoteApi
diff --git a/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationBroadCastReceiver.kt b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationBroadCastReceiver.kt
new file mode 100644
index 0000000..ef09e5a
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationBroadCastReceiver.kt
@@ -0,0 +1,64 @@
+package com.hadiyarajesh.notex.reminder.notification
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import androidx.annotation.CallSuper
+import androidx.core.app.NotificationManagerCompat
+import com.hadiyarajesh.notex.R
+import com.hadiyarajesh.notex.reminder.worker.ReminderWorkManager
+import dagger.hilt.android.AndroidEntryPoint
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NotificationBroadCastReceiver : HiltBroadcastReceiver() {
+
+    companion object {
+        const val TAG = "NotificationBroadCast"
+    }
+
+    @Inject
+    lateinit var reminderWorkManager: ReminderWorkManager
+
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        when (intent.action) {
+            context.resources.getString(R.string.done_action) ->
+                reminderWorkManager.cancelWorkRequest(
+                    context,
+                    intent.getStringExtra(context.resources.getString(R.string.worker_tag)) ?: ""
+                )
+            context.resources.getString(R.string.postpone_action) -> {
+                reminderWorkManager.cancelWorkRequest(
+                    context,
+                    intent.getStringExtra(context.resources.getString(R.string.worker_tag)) ?: ""
+                )
+
+                reminderWorkManager.createWorkRequestAndEnqueue(
+                    context,
+                    time = Instant.now().plus(1, ChronoUnit.HOURS),
+                    isFirstTime = false,
+                    reminderId = intent.getLongExtra(
+                        context.resources.getString(R.string.reminder_id),
+                        -1
+                    )
+                )
+            }
+            else -> Log.i(TAG, "Nothing to Perform this Action ${intent.action}")
+        }
+
+        with(NotificationManagerCompat.from(context)) {
+            cancel(intent.getIntExtra(context.resources.getString(R.string.notification_id), -1))
+        }
+    }
+}
+
+abstract class HiltBroadcastReceiver : BroadcastReceiver() {
+    @SuppressWarnings("EmptyFunctionBlock")
+    @CallSuper
+    override fun onReceive(context: Context, intent: Intent) {
+    }
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationDTO.kt b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationDTO.kt
new file mode 100644
index 0000000..f51b6fa
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationDTO.kt
@@ -0,0 +1,8 @@
+package com.hadiyarajesh.notex.reminder.notification
+
+data class NotificationDTO(
+    val title: String,
+    val subTitle: String,
+    val reminderId: Long,
+    val workerTag: String
+)
diff --git a/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationHelper.kt b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationHelper.kt
new file mode 100644
index 0000000..4e3f37a
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/reminder/notification/NotificationHelper.kt
@@ -0,0 +1,67 @@
+package com.hadiyarajesh.notex.reminder.notification
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.hadiyarajesh.notex.MainActivity
+import com.hadiyarajesh.notex.R
+import kotlin.random.Random
+
+class NotificationHelper {
+
+    fun createNotification(
+        context: Context,
+        notificationDTO: NotificationDTO
+    ) {
+        val actionIntent = Intent(context, MainActivity::class.java)
+        val actionPendingIntent = PendingIntent.getActivity(
+            context, 0,
+            actionIntent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        )
+
+        @SuppressWarnings("MagicNumber")
+        val notificationId = Random(121).nextInt(10000)
+
+        val postponeIntent = Intent(context, NotificationBroadCastReceiver::class.java).apply {
+            action = context.resources.getString(R.string.postpone_action)
+            putExtra(context.resources.getString(R.string.worker_tag), notificationDTO.workerTag)
+            putExtra(context.resources.getString(R.string.reminder_id), notificationDTO.reminderId)
+            putExtra(context.resources.getString(R.string.notification_id), notificationId)
+        }
+
+        val postponePendingIntent = PendingIntent.getBroadcast(
+            context, 0,
+            postponeIntent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        )
+
+        val cancelIntent = Intent(context, NotificationBroadCastReceiver::class.java).apply {
+            action = context.resources.getString(R.string.done_action)
+            putExtra(context.resources.getString(R.string.worker_tag), notificationDTO.workerTag)
+            putExtra(context.resources.getString(R.string.notification_id), notificationId)
+        }
+
+        val cancelPendingIntent = PendingIntent.getBroadcast(
+            context, 0,
+            cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
+        )
+
+        val builder =
+            NotificationCompat.Builder(context, context.getString(R.string.notification_channel_id))
+                .setSmallIcon(R.drawable.ic_note_filled)
+                .setContentTitle(notificationDTO.title)
+                .setContentText(notificationDTO.subTitle)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentIntent(actionPendingIntent)
+                .addAction(R.drawable.ic_note_filled, context.getString(R.string.one_hour), postponePendingIntent)
+                .addAction(R.drawable.ic_note_filled, context.getString(R.string.done), cancelPendingIntent)
+                .setAutoCancel(true)
+
+        with(NotificationManagerCompat.from(context)) {
+            // notificationId is a unique int for each notification that you must define
+            notify(notificationId, builder.build())
+        }
+    }
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorkManager.kt b/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorkManager.kt
new file mode 100644
index 0000000..1c9663b
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorkManager.kt
@@ -0,0 +1,77 @@
+package com.hadiyarajesh.notex.reminder.worker
+
+import android.content.Context
+import androidx.work.Data
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkRequest
+import com.hadiyarajesh.notex.R
+import com.hadiyarajesh.notex.database.dao.ReminderDao
+import com.hadiyarajesh.notex.database.model.RepetitionStrategy
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ReminderWorkManager @Inject constructor(var reminderDao: ReminderDao) {
+
+    fun createWorkRequestAndEnqueue(
+        context: Context,
+        reminderId: Long,
+        time: Instant,
+        isFirstTime: Boolean = true
+    ) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val data: Data.Builder = Data.Builder()
+            data.putLong(
+                context.resources.getString(R.string.reminder_instance_key),
+                reminderId
+            )
+
+            val workerTag =
+                "${context.resources.getString(R.string.reminder_worker_tag)}$reminderId"
+
+            data.putString(context.resources.getString(R.string.worker_tag), workerTag)
+
+            val reminder = reminderDao.getById(reminderId)
+
+            val initialDelay = if (isFirstTime) {
+                time.toEpochMilli() - Instant.now().toEpochMilli()
+            } else {
+                getDurationInMilli(reminderStrategy = reminder.repeat, reminderTime = time)
+            }
+
+            val dailyWorkRequest: WorkRequest = OneTimeWorkRequestBuilder<ReminderWorker>()
+                .setInitialDelay(
+                    initialDelay,
+                    TimeUnit.MILLISECONDS
+                )
+                .setInputData(data.build())
+                .addTag(workerTag)
+                .build()
+            WorkManager.getInstance(context)
+                .enqueue(dailyWorkRequest)
+        }
+    }
+
+    private fun getDurationInMilli(
+        reminderStrategy: RepetitionStrategy,
+        reminderTime: Instant
+    ): Long {
+        val duration: Long
+        when (reminderStrategy) {
+            RepetitionStrategy.Daily -> duration = Instant.now().plus(1, ChronoUnit.DAYS).toEpochMilli()
+            RepetitionStrategy.Monthly -> duration = Instant.now().plus(1, ChronoUnit.MONTHS).toEpochMilli()
+            RepetitionStrategy.Yearly -> duration = Instant.now().plus(1, ChronoUnit.YEARS).toEpochMilli()
+            RepetitionStrategy.Weekly -> duration = Instant.now().plus(1, ChronoUnit.WEEKS).toEpochMilli()
+            else -> duration = reminderTime.toEpochMilli()
+        }
+        return duration - Instant.now().toEpochMilli()
+    }
+
+    fun cancelWorkRequest(context: Context, tag: String) =
+        WorkManager.getInstance(context).cancelAllWorkByTag(tag)
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorker.kt b/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorker.kt
new file mode 100644
index 0000000..493fbb8
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/reminder/worker/ReminderWorker.kt
@@ -0,0 +1,60 @@
+package com.hadiyarajesh.notex.reminder.worker
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import com.hadiyarajesh.notex.R
+import com.hadiyarajesh.notex.database.dao.ReminderDao
+import com.hadiyarajesh.notex.database.entity.Reminder
+import com.hadiyarajesh.notex.database.model.RepetitionStrategy
+import com.hadiyarajesh.notex.reminder.notification.NotificationDTO
+import com.hadiyarajesh.notex.reminder.notification.NotificationHelper
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+
+@HiltWorker
+class ReminderWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted workerParams: WorkerParameters,
+    val reminderDao: ReminderDao,
+    private val notificationHelper: NotificationHelper
+) : CoroutineWorker(appContext, workerParams) {
+
+    private val reminderWorkManager = ReminderWorkManager(reminderDao)
+
+    override suspend fun doWork(): Result {
+        val reminderId =
+            inputData.getLong(applicationContext.getString(R.string.reminder_instance_key), -1)
+        if (reminderId == -1L) {
+            return Result.failure()
+        }
+        val reminder: Reminder = reminderDao.getById(reminderId)
+
+        val localDate: LocalDateTime =
+            LocalDateTime.ofInstant(reminder.reminderTime, ZoneOffset.UTC)
+
+        notificationHelper.createNotification(
+            applicationContext,
+            NotificationDTO(
+                title = reminder.content,
+                subTitle = "${localDate.hour}:${localDate.minute}",
+                reminderId = reminderId,
+                workerTag = inputData.getString(applicationContext.getString(R.string.worker_tag))
+                    ?: ""
+            )
+        )
+
+        if (reminder.repeat != RepetitionStrategy.None) {
+            reminderWorkManager.createWorkRequestAndEnqueue(
+                reminderId = reminderId,
+                context = applicationContext,
+                isFirstTime = false,
+                time = reminder.reminderTime
+            )
+        }
+        return Result.success()
+    }
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/repository/notes/NotesRepository.kt b/app/src/main/java/com/hadiyarajesh/notex/repository/notes/NotesRepository.kt
index 5b6a8d3..148301b 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/repository/notes/NotesRepository.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/repository/notes/NotesRepository.kt
@@ -5,10 +5,10 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.hadiyarajesh.notex.database.dao.NoteDao
 import com.hadiyarajesh.notex.database.entity.Note
-import kotlinx.coroutines.flow.Flow
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.Flow
 
 @Singleton
 class NotesRepository @Inject constructor(
diff --git a/app/src/main/java/com/hadiyarajesh/notex/repository/reminders/RemindersRepository.kt b/app/src/main/java/com/hadiyarajesh/notex/repository/reminders/RemindersRepository.kt
index 6e0c994..692a033 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/repository/reminders/RemindersRepository.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/repository/reminders/RemindersRepository.kt
@@ -1,15 +1,17 @@
 package com.hadiyarajesh.notex.repository.reminders
 
+import android.content.Context
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.hadiyarajesh.notex.database.dao.ReminderDao
 import com.hadiyarajesh.notex.database.entity.Reminder
 import com.hadiyarajesh.notex.database.model.RepetitionStrategy
-import kotlinx.coroutines.flow.Flow
+import com.hadiyarajesh.notex.reminder.worker.ReminderWorkManager
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlinx.coroutines.flow.Flow
 
 @Singleton
 class RemindersRepository @Inject constructor(
@@ -18,20 +20,33 @@ class RemindersRepository @Inject constructor(
     suspend fun createReminder(
         title: String,
         reminderTime: Instant,
-        repeat: RepetitionStrategy
+        repeat: RepetitionStrategy,
+        context: Context? = null
     ) {
-        reminderDao.insertOrUpdate(
-            Reminder(
-                content = title,
-                reminderTime = reminderTime,
-                repeat = repeat,
-                cancelled = false,
-                completed = false,
-                completedOn = null,
-                createdOn = Instant.now(),
-                updatedOn = Instant.now(),
-            )
+        val reminder = Reminder(
+            content = title,
+            reminderTime = reminderTime,
+            repeat = repeat,
+            cancelled = false,
+            completed = false,
+            completedOn = null,
+            createdOn = Instant.now(),
+            updatedOn = Instant.now(),
         )
+
+        val reminderId = reminderDao.insertOrUpdate(
+            reminder
+        )
+
+        val reminderWorkManager = ReminderWorkManager(reminderDao)
+        reminderWorkManager.reminderDao = reminderDao
+        if (context != null) {
+            reminderWorkManager.createWorkRequestAndEnqueue(
+                context,
+                reminderId = reminderId,
+                time = reminderTime
+            )
+        }
     }
 
     fun getAllReminders(): Flow<PagingData<Reminder>> = Pager(
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/NoteXApp.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/NoteXApp.kt
index 8788091..b0982c4 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/NoteXApp.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/NoteXApp.kt
@@ -23,7 +23,7 @@ fun NoteXApp() {
     NoteXTheme {
         val navController = rememberNavController()
         // A state that maintains visibility of a bottom bar
-        val bottomBarState = rememberSaveable { (mutableStateOf(true)) }
+        val bottomBarState = rememberSaveable { mutableStateOf(true) }
 
         Scaffold(
             bottomBar = {
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/component/AllNotesComponents.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/component/AllNotesComponents.kt
new file mode 100644
index 0000000..697e977
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/component/AllNotesComponents.kt
@@ -0,0 +1,88 @@
+package com.hadiyarajesh.notex.ui.component
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Divider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.hadiyarajesh.notex.database.converter.InstantConverter
+import com.hadiyarajesh.notex.database.entity.Note
+import java.time.Instant
+
+@Composable
+fun NoteCard(note: Note) {
+    Card(
+        elevation = CardDefaults.cardElevation(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 16.dp, end = 16.dp, top = 16.dp),
+        shape = RoundedCornerShape(16.dp)
+    ) {
+        Column(
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier.padding(16.dp)
+        ) {
+            note.title?.let {
+                TextSemiBold(
+                    content = it,
+                    null,
+                    MaterialTheme.typography.titleLarge, Color.Black
+                )
+            }
+            Row(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(top = 16.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(IntrinsicSize.Min)
+                        .weight(1f)
+                ) {
+                    TextSemiBold(
+                        content = "Succeed", Modifier.padding(end = 8.dp)
+                    )
+                    Divider(
+                        color = Color.Gray,
+                        modifier = Modifier
+                            .fillMaxHeight()
+                            .width(1.dp)
+                    )
+                    TextSemiBold(content = "Goal", Modifier.padding(start = 8.dp))
+                }
+                Row(
+                    Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                    horizontalArrangement = Arrangement.End
+                ) {
+                    TextSemiBold(
+                        content = InstantConverter.getLocalDate(note.createdOn).toString()
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun NoteCardPrev() {
+    NoteCard(
+        Note(
+            noteId = 12345,
+            title = "Note title",
+            content = "Note content",
+            archived = false,
+            createdOn = Instant.now(),
+            updatedOn = Instant.now()
+        )
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/component/Other.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/component/Other.kt
index c6ff11d..18dca7e 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/component/Other.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/component/Other.kt
@@ -84,7 +84,6 @@ fun LoadingProgressBar(
     color: Color = MaterialTheme.colorScheme.primary,
     strokeWidth: Dp = 4.dp
 ) {
-
     Box(modifier = modifier) {
         CircularProgressIndicator(
             modifier = Modifier
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/component/TextComposables.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/component/TextComposables.kt
new file mode 100644
index 0000000..df219b4
--- /dev/null
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/component/TextComposables.kt
@@ -0,0 +1,23 @@
+package com.hadiyarajesh.notex.ui.component
+
+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
+
+@Composable
+fun TextSemiBold(
+    content: String,
+    modifier: Modifier? = Modifier,
+    textStyle: TextStyle? = null,
+    color: Color? = null
+) {
+    Text(
+        text = content, fontWeight = FontWeight.SemiBold,
+        color = color ?: Color.Gray,
+        modifier = modifier ?: Modifier,
+        style = textStyle ?: TextStyle.Default
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesScreen.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesScreen.kt
index f85f375..285cdae 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesScreen.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesScreen.kt
@@ -24,6 +24,7 @@ import com.hadiyarajesh.notex.R
 import com.hadiyarajesh.notex.database.entity.Note
 import com.hadiyarajesh.notex.ui.component.EmptyView
 import com.hadiyarajesh.notex.ui.component.LoadingProgressBar
+import com.hadiyarajesh.notex.ui.component.NoteCard
 import com.hadiyarajesh.notex.ui.component.RetryItem
 import java.time.Instant
 
@@ -43,18 +44,22 @@ fun NotesScreen(
                 .fillMaxSize()
                 .padding(innerPadding),
             horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
+            verticalArrangement = if (notesViewModel.notes == null) {
+                Arrangement.Center
+            } else {
+                Arrangement.Top
+            }
         ) {
             AllNotesView(
                 notes = notes,
                 onClick = { note ->
-
                 }
             )
         }
     }
 }
 
+@SuppressWarnings("OptionalWhenBraces")
 @Composable
 private fun AllNotesView(
     modifier: Modifier = Modifier,
@@ -64,10 +69,7 @@ private fun AllNotesView(
     LazyColumn(modifier = modifier) {
         items(notes) { item ->
             item?.let { note ->
-                NoteItem(
-                    note = note,
-                    onClick = onClick
-                )
+                NoteCard(note = note)
             }
         }
 
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesViewModel.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesViewModel.kt
index 20cd515..f6cd554 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesViewModel.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/note/NotesViewModel.kt
@@ -7,9 +7,9 @@ import androidx.paging.cachedIn
 import com.hadiyarajesh.notex.database.entity.Note
 import com.hadiyarajesh.notex.repository.notes.NotesRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @HiltViewModel
 class NotesViewModel @Inject constructor(
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersScreen.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersScreen.kt
index 6456400..4e0b18d 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersScreen.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersScreen.kt
@@ -1,18 +1,28 @@
 package com.hadiyarajesh.notex.ui.reminders
 
+import android.annotation.SuppressLint
+import android.app.TimePickerDialog
+import android.os.Build
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
@@ -20,9 +30,13 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.items
 import com.hadiyarajesh.notex.R
 import com.hadiyarajesh.notex.database.entity.Reminder
+import com.hadiyarajesh.notex.database.model.RepetitionStrategy
 import com.hadiyarajesh.notex.ui.component.EmptyView
 import com.hadiyarajesh.notex.ui.component.LoadingProgressBar
 import com.hadiyarajesh.notex.ui.component.RetryItem
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.LocalTime
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -45,13 +59,13 @@ fun RemindersScreen(
             AllRemindersView(
                 reminders = reminders,
                 onClick = { reminder ->
-
                 }
             )
         }
     }
 }
 
+@SuppressWarnings("OptionalWhenBraces")
 @Composable
 private fun AllRemindersView(
     modifier: Modifier = Modifier,
@@ -125,3 +139,82 @@ private fun ReminderItem(
         Text(text = reminder.content ?: "")
     }
 }
+
+@Composable
+fun myContent(): LocalDateTime {
+    val reminderViewModel = hiltViewModel<RemindersViewModel>()
+
+    // Fetching local context
+    val mContext = LocalContext.current
+
+    // Declaring and initializing a calendar
+    val mCalendar = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        LocalDateTime.now()
+    } else {
+        // TODO("VERSION.SDK_INT < O")
+    }
+    val mHour = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        mCalendar.hour
+    } else {
+        // TODO("VERSION.SDK_INT < O")
+    }
+    val mMinute = mCalendar.minute
+    // Value for storing time as a string
+    val mTime = remember { mutableStateOf("") }
+    val mTimeStore = remember { mutableStateOf(mCalendar) }
+
+    // Creating a TimePicker dialog
+    val mTimePickerDialog = TimePickerDialog(
+        mContext,
+        { _, mHour: Int, mMinute: Int ->
+            run {
+                mTime.value = "$mHour:$mMinute"
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    mTimeStore.value =
+                        LocalDateTime.of(
+                            mCalendar.toLocalDate(), LocalTime.of(mHour, mMinute)
+                        )
+
+                    reminderViewModel.createReminder(
+                        "Hello",
+                        Instant.now(),
+                        repeat = RepetitionStrategy.Daily,
+                        context = mContext
+                    )
+                }
+            }
+        }, mHour, mMinute, false
+    )
+
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        // On button click, TimePicker is
+        // displayed, user can select a time
+        Button(
+            onClick = { mTimePickerDialog.show() },
+            colors = ButtonDefaults.buttonColors()
+        ) {
+            Text(text = "Open Time Picker", color = Color.White)
+        }
+
+        // Add a spacer of 100dp
+        Spacer(modifier = Modifier.size(100.dp))
+
+        // Display selected time
+        Text(text = "Selected Time: ${mTime.value}", fontSize = 30.sp)
+    }
+    return mTimeStore.value
+}
+
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
+@Preview(showBackground = true)
+@Composable
+fun DefaultPreview() {
+    Scaffold(
+        content = { myContent() }
+    )
+}
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersViewModel.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersViewModel.kt
index fd65e98..c3d466e 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersViewModel.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/reminders/RemindersViewModel.kt
@@ -1,5 +1,6 @@
 package com.hadiyarajesh.notex.ui.reminders
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
@@ -8,10 +9,10 @@ import com.hadiyarajesh.notex.database.entity.Reminder
 import com.hadiyarajesh.notex.database.model.RepetitionStrategy
 import com.hadiyarajesh.notex.repository.reminders.RemindersRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
 import java.time.Instant
 import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class RemindersViewModel @Inject constructor(
@@ -26,11 +27,11 @@ class RemindersViewModel @Inject constructor(
     fun createReminder(
         title: String,
         reminderTime: Instant,
-        repeat: RepetitionStrategy
+        repeat: RepetitionStrategy,
+        context: Context?
     ) = viewModelScope.launch {
         remindersRepository.createReminder(
-            title, reminderTime, repeat
+            title, reminderTime, repeat, context
         )
     }
-
 }
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Theme.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Theme.kt
index 8b7df94..b83f61c 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Theme.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Theme.kt
@@ -30,7 +30,7 @@ private val LightColorScheme = lightColorScheme(
     onTertiary = Color.White,
     onBackground = Color(0xFF1C1B1F),
     onSurface = Color(0xFF1C1B1F),
-    */
+     */
 )
 
 @Composable
diff --git a/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Type.kt b/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Type.kt
index 175abcd..451bdd6 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Type.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/ui/theme/Type.kt
@@ -30,5 +30,5 @@ val Typography = Typography(
         lineHeight = 16.sp,
         letterSpacing = 0.5.sp
     )
-    */
+     */
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/hadiyarajesh/notex/utility/Constants.kt b/app/src/main/java/com/hadiyarajesh/notex/utility/Constants.kt
index 3513199..501e093 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/utility/Constants.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/utility/Constants.kt
@@ -6,4 +6,4 @@ object Constants {
     }
 }
 
-const val TAG = Constants.App.APP_NAME
\ No newline at end of file
+const val TAG = Constants.App.APP_NAME
diff --git a/app/src/main/java/com/hadiyarajesh/notex/utility/PreferenceManager.kt b/app/src/main/java/com/hadiyarajesh/notex/utility/PreferenceManager.kt
index b1c5da2..f9e321b 100644
--- a/app/src/main/java/com/hadiyarajesh/notex/utility/PreferenceManager.kt
+++ b/app/src/main/java/com/hadiyarajesh/notex/utility/PreferenceManager.kt
@@ -8,11 +8,11 @@ import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.IOException
+import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
-import java.io.IOException
-import javax.inject.Inject
 
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(
     name = "${Constants.App.APP_NAME.lowercase()}_prefs"
@@ -35,7 +35,6 @@ class PreferenceManager @Inject constructor(@ApplicationContext val context: Con
             preferences[APP_LANGUAGE_KEY]
         }
 
-
     suspend fun saveAppLanguage(language: String) {
         context.dataStore.edit { preferences ->
             preferences[APP_LANGUAGE_KEY] = language
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2edc9a4..4162479 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,4 +8,13 @@
     <string name="welcome_message">Welcome to NoteX</string>
     <string name="retry">Retry</string>
     <string name="empty_message">It\'s all empty here</string>
+    <string name="reminder_instance_key" translatable="false">Reminder Instance</string>
+    <string name="reminder_worker_tag" translatable="false">ReminderTag</string>
+    <string name="reminder_id" translatable="false">Reminder_ID</string>
+    <string name="worker_tag" translatable="false">WORKER_TAG</string>
+    <string name="postpone_action" translatable="false">POSTPONE</string>
+    <string name="done_action" translatable="false">DONE</string>
+    <string name="notification_id" translatable="false">NOTIFICATION_ID</string>
+    <string name="one_hour" translatable="false">1 hour</string>
+    <string name="done" translatable="false">Done</string>
 </resources>
diff --git a/app/src/test/java/com/hadiyarajesh/notex/ExampleUnitTest.kt b/app/src/test/java/com/hadiyarajesh/notex/ExampleUnitTest.kt
index e0f2f08..f4f091a 100644
--- a/app/src/test/java/com/hadiyarajesh/notex/ExampleUnitTest.kt
+++ b/app/src/test/java/com/hadiyarajesh/notex/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package com.hadiyarajesh.notex
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/build.gradle.kts b/build.gradle.kts
index 1c1e440..e39ff20 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,15 +1,100 @@
+import io.gitlab.arturbosch.detekt.Detekt
+import org.jlleitschuh.gradle.ktlint.KtlintExtension
+import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
+import org.jlleitschuh.gradle.ktlint.tasks.GenerateReportsTask
+
 buildscript {
     val hiltVersion by extra("2.42")
 
     dependencies {
         classpath("com.google.dagger:hilt-android-gradle-plugin:$hiltVersion")
+        classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0-RC1")
     }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
+}
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "7.2.2" apply false
     id("com.android.library") version "7.2.2" apply false
     id("org.jetbrains.kotlin.android") version "1.7.0" apply false
+    id("io.gitlab.arturbosch.detekt") version "1.22.0-RC1"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
+}
+
+allprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+    apply(plugin = "io.gitlab.arturbosch.detekt")
+    configureDetekt()
+    configureKtLint()
+}
+
+configureDetekt()
+fun Project.configureDetekt() {
+    tasks.withType<Detekt> {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        setSource(files(projectDir))
+        exclude("**/build/**")
+        parallel = true
+        baseline.set(file(path = "${rootProject.projectDir}/config/detekt/detekt-baseline.xml"))
+        autoCorrect = true
+        reports {
+            xml.required.set(true)
+            html.required.set(false)
+            txt.required.set(false)
+            sarif.required.set(false)
+        }
+    }
+}
+
+fun Project.configureKtLint() {
+    this.configure<KtlintExtension> {
+        version.set("0.45.2")
+        android.set(true)
+        outputToConsole.set(true)
+        ignoreFailures.set(true)
+        enableExperimentalRules.set(true)
+        disabledRules.set(
+            setOf(
+                "unused-imports",
+                "final-newline",
+                "max-line-length",
+                "experimental:argument-list-wrapping",
+                "no-wildcard-imports",
+                "experimental:trailing-comma",
+                "experimental:comment-wrapping"
+            )
+        )
+        reporters {
+            reporter(ReporterType.CHECKSTYLE)
+        }
+        filter {
+            exclude("**/generated/**")
+            include("**/build/**")
+        }
+    }
+}
+
+// Tasks for providing dir for generated reports from detekt and ktlint
+tasks.withType<GenerateReportsTask> {
+    reportsOutputDirectory.set(
+        File(project.buildDir, "reports/ktlint/merged-ktlint-results.xml")
+    )
+}
+
+// Tasks for automatically installing git-hooks and making it executable also.
+tasks.register("installGitHook", Copy::class) {
+    from(file("$rootDir/scripts/pre-push"))
+    into(file("$rootDir/.git/hooks"))
+    fileMode = 0b0111101101 // -rwxr-xr-x
+}
+
+tasks.create(name = "gitExecutableHooks") {
+    doLast {
+        Runtime.getRuntime().exec("chmod -R +x .git/hooks/")
+    }
 }
+tasks.getByPath("gitExecutableHooks").dependsOn(tasks.named("installGitHook"))
+tasks.getByPath(":app:clean").dependsOn(tasks.named("gitExecutableHooks"))
 
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
diff --git a/config/detekt/detekt-baseline.xml b/config/detekt/detekt-baseline.xml
new file mode 100644
index 0000000..3dfaf4a
--- /dev/null
+++ b/config/detekt/detekt-baseline.xml
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<SmellBaseline>
+  <ManuallySuppressedIssues/>
+  <CurrentIssues>
+    <ID>EmptyClassBlock:NoteApi.kt$NoteApi${ }</ID>
+    <ID>FunctionNaming:AddNoteScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AddNoteScreen( navController: NavController )</ID>
+    <ID>FunctionNaming:AllNotesComponents.kt$@Composable fun NoteCard(note: Note)</ID>
+    <ID>FunctionNaming:AllNotesComponents.kt$@Preview @Composable fun NoteCardPrev()</ID>
+    <ID>FunctionNaming:NoteXApp.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun NoteXApp()</ID>
+    <ID>FunctionNaming:NoteXNavigation.kt$@Composable fun MainBottomBar( navController: NavController, items: List&lt;Screens>, onFABClick: () -> Unit )</ID>
+    <ID>FunctionNaming:NoteXNavigation.kt$@Composable fun NoteXNavigation( modifier: Modifier = Modifier, navController: NavHostController, bottomBarState: MutableState&lt;Boolean> )</ID>
+    <ID>FunctionNaming:NotesScreen.kt$@Composable private fun AllNotesView( modifier: Modifier = Modifier, notes: LazyPagingItems&lt;Note>, onClick: (Note) -> Unit, )</ID>
+    <ID>FunctionNaming:NotesScreen.kt$@Composable private fun NoteItem( modifier: Modifier = Modifier, note: Note, onClick: (Note) -> Unit, )</ID>
+    <ID>FunctionNaming:NotesScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun NotesScreen( navController: NavController, notesViewModel: NotesViewModel )</ID>
+    <ID>FunctionNaming:NotesScreen.kt$@Preview @Composable fun NoteItemPreview()</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun EmptyView( modifier: Modifier = Modifier, text: String )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun ErrorText( modifier: Modifier = Modifier, text: String, color: Color = MaterialTheme.colorScheme.error, style: TextStyle = MaterialTheme.typography.labelMedium )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun HorizontalSpacer(size: Int)</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun ImageItem( modifier: Modifier = Modifier, data: Any?, crossfadeValue: Int = 300, contentDescription: String? = null, contentScale: ContentScale = ContentScale.Crop, transformation: Transformation? = null, )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun LoadingProgressBar( modifier: Modifier = Modifier, size: Dp = 40.dp, color: Color = MaterialTheme.colorScheme.primary, strokeWidth: Dp = 4.dp )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun RetryItem( modifier: Modifier = Modifier, onRetryClick: () -> Unit )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun SubComposeImageItem( modifier: Modifier = Modifier, data: Any?, crossfadeValue: Int = 300, contentDescription: String? = null, contentScale: ContentScale = ContentScale.Crop, transformation: Transformation? = null, )</ID>
+    <ID>FunctionNaming:Other.kt$@Composable fun VerticalSpacer(size: Int)</ID>
+    <ID>FunctionNaming:RemindersScreen.kt$@Composable private fun AllRemindersView( modifier: Modifier = Modifier, reminders: LazyPagingItems&lt;Reminder>, onClick: (Reminder) -> Unit, )</ID>
+    <ID>FunctionNaming:RemindersScreen.kt$@Composable private fun ReminderItem( modifier: Modifier = Modifier, reminder: Reminder, onClick: (Reminder) -> Unit, )</ID>
+    <ID>FunctionNaming:RemindersScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun RemindersScreen( navController: NavController, remindersViewModel: RemindersViewModel )</ID>
+    <ID>FunctionNaming:TextComposables.kt$@Composable fun TextSemiBold( content: String, modifier: Modifier? = Modifier, textStyle: TextStyle? = null, color: Color? = null )</ID>
+    <ID>FunctionNaming:Theme.kt$@Composable fun NoteXTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, content: @Composable () -> Unit )</ID>
+    <ID>LongParameterList:Other.kt$( modifier: Modifier = Modifier, data: Any?, crossfadeValue: Int = 300, contentDescription: String? = null, contentScale: ContentScale = ContentScale.Crop, transformation: Transformation? = null, )</ID>
+    <ID>MagicNumber:Color.kt$0xFF625b71</ID>
+    <ID>MagicNumber:Color.kt$0xFF6650a4</ID>
+    <ID>MagicNumber:Color.kt$0xFF7D5260</ID>
+    <ID>MagicNumber:Color.kt$0xFFCCC2DC</ID>
+    <ID>MagicNumber:Color.kt$0xFFD0BCFF</ID>
+    <ID>MagicNumber:Color.kt$0xFFEFB8C8</ID>
+    <ID>MatchingDeclarationName:Scope.kt$ApplicationScope</ID>
+    <ID>MaxLineLength:FolderDao.kt$FolderDao$* This method requires Room to run two queries, so add the @Transaction annotation to this method to ensure that the whole operation is performed atomically.</ID>
+    <ID>MaxLineLength:NotesScreen.kt$loadState.refresh is LoadState.NotLoading &amp;&amp; loadState.append.endOfPaginationReached &amp;&amp; notes.itemCount &lt; 1</ID>
+    <ID>MaxLineLength:RemindersScreen.kt$loadState.refresh is LoadState.NotLoading &amp;&amp; loadState.append.endOfPaginationReached &amp;&amp; reminders.itemCount &lt; 1</ID>
+    <ID>NewLineAtEndOfFile:AllNotesComponents.kt$com.hadiyarajesh.notex.ui.component.AllNotesComponents.kt</ID>
+    <ID>NewLineAtEndOfFile:Color.kt$com.hadiyarajesh.notex.ui.theme.Color.kt</ID>
+    <ID>NewLineAtEndOfFile:ExampleUnitTest.kt$com.hadiyarajesh.notex.ExampleUnitTest.kt</ID>
+    <ID>NewLineAtEndOfFile:Screens.kt$com.hadiyarajesh.notex.ui.navigation.Screens.kt</ID>
+    <ID>NewLineAtEndOfFile:TextComposables.kt$com.hadiyarajesh.notex.ui.component.TextComposables.kt</ID>
+    <ID>NewLineAtEndOfFile:Type.kt$com.hadiyarajesh.notex.ui.theme.Type.kt</ID>
+    <ID>TooManyFunctions:NoteDao.kt$NoteDao</ID>
+    <ID>UnusedPrivateMember:AddNoteScreen.kt$navController: NavController</ID>
+    <ID>UnusedPrivateMember:NotesScreen.kt$navController: NavController</ID>
+    <ID>UnusedPrivateMember:NotesScreen.kt$onClick: (Note) -> Unit</ID>
+    <ID>UnusedPrivateMember:NotesScreen.kt$val context = LocalContext.current</ID>
+    <ID>UnusedPrivateMember:NotesScreen.kt$val scope = rememberCoroutineScope()</ID>
+    <ID>UnusedPrivateMember:RemindersScreen.kt$navController: NavController</ID>
+    <ID>UnusedPrivateMember:RemindersScreen.kt$onClick: (Reminder) -> Unit</ID>
+    <ID>UnusedPrivateMember:RemindersScreen.kt$val context = LocalContext.current</ID>
+    <ID>UnusedPrivateMember:RemindersScreen.kt$val scope = rememberCoroutineScope()</ID>
+    <ID>WildcardImport:AllNotesComponents.kt$import androidx.compose.foundation.layout.*</ID>
+    <ID>WildcardImport:ExampleUnitTest.kt$import org.junit.Assert.*</ID>
+    <ID>WildcardImport:FolderDao.kt$import androidx.room.*</ID>
+    <ID>WildcardImport:InstantAdapter.kt$import com.squareup.moshi.*</ID>
+    <ID>WildcardImport:NoteDao.kt$import androidx.room.*</ID>
+    <ID>WildcardImport:NotesScreen.kt$import androidx.compose.foundation.layout.*</ID>
+    <ID>WildcardImport:Other.kt$import androidx.compose.foundation.layout.*</ID>
+    <ID>WildcardImport:ReminderDao.kt$import androidx.room.*</ID>
+    <ID>WildcardImport:RemindersScreen.kt$import androidx.compose.foundation.layout.*</ID>
+    <ID>WildcardImport:Theme.kt$import androidx.compose.material3.*</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
new file mode 100644
index 0000000..b4e0bb1
--- /dev/null
+++ b/config/detekt/detekt.yml
@@ -0,0 +1,734 @@
+build:
+  maxIssues: 0
+  excludeCorrectable: false
+  weights:
+    # complexity: 2
+    # LongParameterList: 1
+    # style: 1
+    # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: true
+  checkExhaustiveness: false
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'KtFileCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ProjectComplexityProcessor'
+  # - 'ProjectCognitiveComplexityProcessor'
+  # - 'ProjectLLOCProcessor'
+  # - 'ProjectCLOCProcessor'
+  # - 'ProjectLOCProcessor'
+  # - 'ProjectSLOCProcessor'
+  # - 'LicenseHeaderLoaderExtension'
+
+console-reports:
+  active: true
+  exclude:
+     - 'ProjectStatisticsReport'
+     - 'ComplexityReport'
+     - 'NotificationReport'
+     - 'FindingsReport'
+     - 'FileBasedFindingsReport'
+  #  - 'LiteFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+  # - 'MdOutputReport'
+
+comments:
+  active: true
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+    licenseTemplateIsRegex: false
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  DeprecatedBlockTag:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  KDocReferencesNonPublicProperty:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  OutdatedDocumentation:
+    active: false
+    matchTypeParameters: true
+    matchDeclarationsOrder: true
+    allowParamOnConstructorProperties: false
+  UndocumentedPublicClass:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+    searchInProtectedClass: false
+  UndocumentedPublicFunction:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    searchProtectedFunction: false
+  UndocumentedPublicProperty:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    searchProtectedProperty: false
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: true
+    threshold: 20
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+    ignoreOverloaded: false
+  ComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions:
+      - 'also'
+      - 'apply'
+      - 'forEach'
+      - 'isNotNull'
+      - 'ifNull'
+      - 'let'
+      - 'run'
+      - 'use'
+      - 'with'
+  LabeledExpression:
+    active: false
+    ignoredLabels: []
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 10
+    constructorThreshold: 10
+    ignoreDefaultParameters: true
+    ignoreDataClasses: true
+    ignoreAnnotatedParameter: [ 'Composable' ]
+  MethodOverloading:
+    active: true
+    threshold: 6
+  NamedArguments:
+    active: true
+    threshold: 3
+    ignoreArgumentsMatchingNames: false
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  NestedScopeFunctions:
+    active: false
+    threshold: 1
+    functions:
+      - 'kotlin.apply'
+      - 'kotlin.run'
+      - 'kotlin.with'
+      - 'kotlin.let'
+      - 'kotlin.also'
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: true
+  InjectDispatcher:
+    active: true
+    dispatcherNames:
+      - 'IO'
+      - 'Default'
+      - 'Unconfined'
+  RedundantSuspendModifier:
+    active: true
+  SleepInsteadOfDelay:
+    active: true
+  SuspendFunWithCoroutineScopeReceiver:
+    active: true
+  SuspendFunWithFlowReturnType:
+    active: true
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: true
+    methodNames:
+      - 'equals'
+      - 'finalize'
+      - 'hashCode'
+      - 'toString'
+  InstanceOfCheckForException:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  NotImplementedDeclaration:
+    active: true
+  ObjectExtendsThrowable:
+    active: true
+  PrintStackTrace:
+    active: true
+  RethrowCaughtException:
+    active: true
+  ReturnFromFinally:
+    active: true
+    ignoreLabeled: false
+  SwallowedException:
+    active: true
+    ignoredExceptionTypes:
+      - 'InterruptedException'
+      - 'MalformedURLException'
+      - 'NumberFormatException'
+      - 'ParseException'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: true
+  ThrowingExceptionInMain:
+    active: true
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptions:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Exception'
+      - 'IllegalArgumentException'
+      - 'IllegalMonitorStateException'
+      - 'IllegalStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+  ThrowingNewInstanceOfSameException:
+    active: true
+  TooGenericExceptionCaught:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptionNames:
+      - 'ArrayIndexOutOfBoundsException'
+      - 'Error'
+      - 'Exception'
+      - 'IllegalMonitorStateException'
+      - 'IndexOutOfBoundsException'
+      - 'NullPointerException'
+      - 'RuntimeException'
+      - 'Throwable'
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - 'Error'
+      - 'Exception'
+      - 'RuntimeException'
+      - 'Throwable'
+
+naming:
+  active: true
+  BooleanPropertyNaming:
+    active: true
+    allowedPattern: '^(is|has|are)'
+    ignoreOverridden: true
+  ClassNaming:
+    active: true
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  EnumNaming:
+    active: true
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: true
+    forbiddenName: []
+  FunctionMaxLength:
+    active: true
+    maximumFunctionNameLength: 50
+  FunctionMinLength:
+    active: true
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    functionPattern: '[a-z][a-zA-Z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+    ignoreAnnotated: [ 'Composable' ]
+  FunctionParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  InvalidPackageDeclaration:
+    active: true
+    rootPackage: ''
+    requireRootInDeclaration: false
+  LambdaParameterNaming:
+    active: true
+    parameterPattern: '[a-z][A-Za-z0-9]*|_'
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NoNameShadowing:
+    active: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: true
+  ObjectPropertyNaming:
+    active: true
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: true
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: true
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  CouldBeSequence:
+    active: false
+    threshold: 3
+  ForEachOnRange:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  SpreadOperator:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  UnnecessaryPartOfBinaryExpression:
+    active: false
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  AvoidReferentialEquality:
+    active: true
+    forbiddenTypePatterns:
+      - 'kotlin.String'
+  CastToNullableType:
+    active: true
+  Deprecation:
+    active: true
+  DontDowncastCollectionTypes:
+    active: true
+  DoubleMutabilityForCollection:
+    active: true
+    mutableTypes:
+      - 'kotlin.collections.MutableList'
+      - 'kotlin.collections.MutableMap'
+      - 'kotlin.collections.MutableSet'
+      - 'java.util.ArrayList'
+      - 'java.util.LinkedHashSet'
+      - 'java.util.HashSet'
+      - 'java.util.LinkedHashMap'
+      - 'java.util.HashMap'
+  DuplicateCaseInWhenExpression:
+    active: true
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: true
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExitOutsideMain:
+    active: true
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: true
+  IgnoredReturnValue:
+    active: true
+    restrictToConfig: true
+    returnValueAnnotations:
+      - '*.CheckResult'
+      - '*.CheckReturnValue'
+    ignoreReturnValueAnnotations:
+      - '*.CanIgnoreReturnValue'
+    returnValueTypes:
+      - 'kotlin.sequences.Sequence'
+      - 'kotlinx.coroutines.flow.*Flow'
+      - 'java.util.stream.*Stream'
+    ignoreFunctionCall: []
+  ImplicitDefaultLocale:
+    active: true
+  ImplicitUnitReturnType:
+    active: true
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: true
+  MissingPackageDeclaration:
+    active: false
+    excludes: ['**/*.kts']
+  MissingWhenCase:
+    active: true
+    allowElseExpression: true
+  NullCheckOnMutableProperty:
+    active: true
+  NullableToStringCall:
+    active: true
+  RedundantElseInWhen:
+    active: true
+  UnconditionalJumpStatementInLoop:
+    active: true
+  UnnecessaryNotNullOperator:
+    active: true
+  UnnecessarySafeCall:
+    active: true
+  UnreachableCatchBlock:
+    active: true
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  UnsafeCast:
+    active: true
+  UnusedUnaryOperator:
+    active: true
+  UselessPostfixExpression:
+    active: true
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  CanBeNonNullable:
+    active: false
+  CascadingCallWrapping:
+    active: false
+    includeElvis: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: true
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix:
+      - 'to'
+  DataClassShouldBeImmutable:
+    active: true
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 3
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: true
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenComment:
+    active: true
+    values:
+      - 'FIXME:'
+      - 'STOPSHIP:'
+      - 'TODO:'
+    allowedPatterns: ''
+    customMessage: ''
+  ForbiddenImport:
+    active: true
+    imports: []
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: true
+    methods:
+      - reason: 'print does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.print'
+      - reason: 'println does not allow you to configure the output stream. Use a logger instead.'
+        value: 'kotlin.io.println'
+  ForbiddenPublicDataClass:
+    active: true
+    excludes: ['**']
+    ignorePackages:
+      - '*.internal'
+      - '*.internal.*'
+  ForbiddenSuppress:
+    active: true
+    rules: []
+  ForbiddenVoid:
+    active: true
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    ignoreActualFunction: true
+    excludedFunctions: []
+  LibraryCodeMustSpecifyReturnType:
+    active: true
+    excludes: ['**']
+  LibraryEntitiesShouldNotBePublic:
+    active: false
+    excludes: ['**']
+  LoopWithTooManyJumpStatements:
+    active: false
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts']
+    ignoreNumbers:
+      - '-1'
+      - '0'
+      - '1'
+      - '2'
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: true
+    ignoreRanges: false
+    ignoreExtensionFunctions: true
+  MandatoryBracesIfStatements:
+    active: true
+  MandatoryBracesLoops:
+    active: true
+  MaxChainedCallsOnSameLine:
+    active: false
+    maxChainedCalls: 5
+  MaxLineLength:
+    active: true
+    maxLineLength: 160
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+    excludeRawStrings: true
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  MultilineLambdaItParameter:
+    active: false
+  MultilineRawStringIndentation:
+    active: false
+    indentSize: 4
+  NestedClassesVisibility:
+    active: true
+  NewLineAtEndOfFile:
+    active: true
+  NoTabs:
+    active: false
+  NullableBooleanCheck:
+    active: false
+  ObjectLiteralToLambda:
+    active: false
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  OptionalWhenBraces:
+    active: true
+  PreferToOverPairSyntax:
+    active: true
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: true
+  RedundantHigherOrderMapUsage:
+    active: true
+  RedundantVisibilityModifierRule:
+    active: true
+  ReturnCount:
+    active: true
+    max: 5
+    excludedFunctions:
+      - 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: true
+  SpacingBetweenPackageAndImports:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 2
+    excludeGuardClauses: false
+  TrailingWhitespace:
+    active: true
+  TrimMultilineRawString:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableLength: 5
+    allowNonStandardGrouping: false
+  UnnecessaryAbstractClass:
+    active: true
+  UnnecessaryAnnotationUseSiteTarget:
+    active: true
+  UnnecessaryApply:
+    active: true
+  UnnecessaryBackticks:
+    active: false
+  UnnecessaryFilter:
+    active: true
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryInnerClass:
+    active: true
+  UnnecessaryLet:
+    active: true
+  UnnecessaryParentheses:
+    active: true
+    allowForUnclearPrecedence: false
+  UntilInsteadOfRangeTo:
+    active: true
+  UnusedImports:
+    active: true
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: true
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+  UseAnyOrNoneInsteadOfFind:
+    active: true
+  UseArrayLiteralsInAnnotations:
+    active: true
+  UseCheckNotNull:
+    active: true
+  UseCheckOrError:
+    active: true
+  UseDataClass:
+    active: true
+    allowVars: false
+  UseEmptyCounterpart:
+    active: true
+  UseIfEmptyOrIfBlank:
+    active: true
+  UseIfInsteadOfWhen:
+    active: false
+  UseIsNullOrEmpty:
+    active: true
+  UseOrEmpty:
+    active: true
+  UseRequire:
+    active: true
+  UseRequireNotNull:
+    active: true
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: true
+    ignoreLateinitVar: false
+  WildcardImport:
+    active: true
+    excludeImports:
+      - 'java.util.*'
diff --git a/git-hooks/pre-push b/git-hooks/pre-push
new file mode 100644
index 0000000..17df2dd
--- /dev/null
+++ b/git-hooks/pre-push
@@ -0,0 +1,39 @@
+#!/bin/sh
+echo "*********************************************************"
+echo "Running git pre-push hook. Running Static analysis... "
+echo "*********************************************************"
+
+./gradlew detekt ktlintCheck --daemon
+
+status=$?
+
+if [ "$status" = 0 ] ; then
+    echo "Static analysis found no problems."
+    exit 0
+else
+    echo "*********************************************************"
+    echo "       ********************************************      "
+    echo 1>&2 "Static analysis found violations it could not fix."
+    echo "Run ./gradlew ktlintFormat to fix formatting related issues."
+    echo "       ********************************************      "
+    echo "*********************************************************"
+    exit 1
+fi
+
+
+
+#echo "Running static code analysis..."
+#
+## Run Detekt, KtLint and Checkstyle static analysis
+#./gradlew detekt ktlintCheck --daemon
+#
+#status=$?
+#
+#if [ "$status" = 0 ] ; then
+#    echo "Static analysis found no problems."
+#    exit 0
+#else
+#    echo 1>&2 "Static analysis found violations! Fix then before pushing your code!"
+#    echo "See generated reports above or in /app/build/reports folder"
+#    exit 1
+#fi
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/scripts/pre-push b/scripts/pre-push
new file mode 100644
index 0000000..02aff6f
--- /dev/null
+++ b/scripts/pre-push
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+echo "*********************************************************"
+echo "Running git pre-push hook. Running Static analysis... "
+echo "*********************************************************"
+
+git stash -q --keep-index
+
+./gradlew detekt ktlintCheck --daemon
+
+status=$?
+
+git stash pop -q
+
+if [ "$status" = 0 ] ; then
+    echo "Static analysis found no problems."
+    exit 0
+else
+    echo "*********************************************************"
+    echo "       ********************************************      "
+    echo 1>&2 "Static analysis found violations it could not fix."
+    echo "Run ./gradlew ktlintFormat to fix formatting related issues."
+    echo "       ********************************************      "
+    echo "*********************************************************"
+    exit 1
+fi